History

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()

Linus Torvalds committed 9 years ago

Commit 58f587c2 parents e28e9e3 c250b7d10 files · +182 −70Browse files

Showing the changes to include/uapi/linux (1 of 10 files). Show all

Unified · Split

include/uapi/linux/fs.h+2−0
@@ -272,6 +272,8 @@ struct fsxattr { · 271 unmodified lines
272272 #define FS_ENCRYPTION_MODE_AES_256_GCM 2
273273 #define FS_ENCRYPTION_MODE_AES_256_CBC 3
274274 #define FS_ENCRYPTION_MODE_AES_256_CTS 4
275+#define FS_ENCRYPTION_MODE_AES_128_CBC 5
276+#define FS_ENCRYPTION_MODE_AES_128_CTS 6
275277
276278 struct fscrypt_policy {
277279 __u8 version;