Pull fscrypt updates from Eric Biggers: - Add the IV_INO_LBLK_64 encryption policy flag which modifies the encryption to be optimized for UFS inline encryption hardware. - For AES-128-CBC, use the crypto API's implementation of ESSIV (which was added in 5.4) rather than doing ESSIV manually. - A few other cleanups. * tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt: f2fs: add support for IV_INO_LBLK_64 encryption policies ext4: add support for IV_INO_LBLK_64 encryption policies fscrypt: add support for IV_INO_LBLK_64 policies fscrypt: avoid data race on fscrypt_mode::logged_impl_name docs: ioctl-number: document fscrypt ioctl numbers fscrypt: zeroize fscrypt_info before freeing fscrypt: remove struct fscrypt_ctx fscrypt: invoke crypto API for ESSIV handling
Showing the changes to include/uapi/linux (1 of 14 files). Show all
Unified · Split
| @@ -17,7 +17,8 @@ · 16 unmodified lines | |||
| 17 | #define FSCRYPT_POLICY_FLAGS_PAD_32 0x03 | 17 | #define FSCRYPT_POLICY_FLAGS_PAD_32 0x03 |
| 18 | #define FSCRYPT_POLICY_FLAGS_PAD_MASK 0x03 | 18 | #define FSCRYPT_POLICY_FLAGS_PAD_MASK 0x03 |
| 19 | #define FSCRYPT_POLICY_FLAG_DIRECT_KEY 0x04 | 19 | #define FSCRYPT_POLICY_FLAG_DIRECT_KEY 0x04 |
| 20 | #define FSCRYPT_POLICY_FLAGS_VALID 0x07 | 20 | #define FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64 0x08 |
| 21 | #define FSCRYPT_POLICY_FLAGS_VALID 0x0F | ||
| 21 | 22 | ||
| 22 | /* Encryption algorithms */ | 23 | /* Encryption algorithms */ |
| 23 | #define FSCRYPT_MODE_AES_256_XTS 1 | 24 | #define FSCRYPT_MODE_AES_256_XTS 1 |