diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-09 19:03:31 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-09 19:03:31 +0300 |
| commit | 58f587cb0b603de3d8869e021d4fa704e065afa8 (patch) | |
| tree | a95c09d1a00737f2cb86466a1a1770b09d60b71e /include/uapi/linux | |
| parent | e28e9e3ec016a4850f3169ae3e7ec02f90a259fe (diff) | |
| parent | c250b7dd8e73b5f7d88d231fbaac92e3360a7234 (diff) | |
| download | linux-58f587cb0b603de3d8869e021d4fa704e065afa8.tar.xz | |
Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt
Pull fscrypt updates from Ted Ts'o:
"Add support for 128-bit AES and some cleanups to fscrypt"
* tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
fscrypt: make ->dummy_context() return bool
fscrypt: add support for AES-128-CBC
fscrypt: inline fscrypt_free_filename()
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/fs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index 27d8c36c04af..b7495d05e8de 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -272,6 +272,8 @@ struct fsxattr { #define FS_ENCRYPTION_MODE_AES_256_GCM 2 #define FS_ENCRYPTION_MODE_AES_256_CBC 3 #define FS_ENCRYPTION_MODE_AES_256_CTS 4 +#define FS_ENCRYPTION_MODE_AES_128_CBC 5 +#define FS_ENCRYPTION_MODE_AES_128_CTS 6 struct fscrypt_policy { __u8 version; |