Pull fscrypt updates from Eric Biggers: - Add the IV_INO_LBLK_32 encryption policy flag which modifies the encryption to be optimized for eMMC inline encryption hardware. - Make the test_dummy_encryption mount option for ext4 and f2fs support v2 encryption policies. - Fix kerneldoc warnings and some coding style inconsistencies. * tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt: fscrypt: add support for IV_INO_LBLK_32 policies fscrypt: make test_dummy_encryption use v2 by default fscrypt: support test_dummy_encryption=v2 fscrypt: add fscrypt_add_test_dummy_key() linux/parser.h: add include guards fscrypt: remove unnecessary extern keywords fscrypt: name all function parameters fscrypt: fix all kerneldoc warnings
Showing the changes to include/uapi/linux (1 of 18 files). Show all
Unified · Split
| @@ -19,7 +19,8 @@ · 18 unmodified lines | |||
| 19 | #define FSCRYPT_POLICY_FLAGS_PAD_MASK 0x03 | 19 | #define FSCRYPT_POLICY_FLAGS_PAD_MASK 0x03 |
| 20 | #define FSCRYPT_POLICY_FLAG_DIRECT_KEY 0x04 | 20 | #define FSCRYPT_POLICY_FLAG_DIRECT_KEY 0x04 |
| 21 | #define FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64 0x08 | 21 | #define FSCRYPT_POLICY_FLAG_IV_INO_LBLK_64 0x08 |
| 22 | #define FSCRYPT_POLICY_FLAGS_VALID 0x0F | 22 | #define FSCRYPT_POLICY_FLAG_IV_INO_LBLK_32 0x10 |
| 23 | #define FSCRYPT_POLICY_FLAGS_VALID 0x1F | ||
| 23 | 24 | ||
| 24 | /* Encryption algorithms */ | 25 | /* Encryption algorithms */ |
| 25 | #define FSCRYPT_MODE_AES_256_XTS 1 | 26 | #define FSCRYPT_MODE_AES_256_XTS 1 |