Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
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
- Documentation/filesystems/fscrypt.rst 44 additions, 24 deletionsDocumentation/filesystems/fscrypt.rst
- Documentation/ioctl/ioctl-number.rst 1 addition, 0 deletionsDocumentation/ioctl/ioctl-number.rst
- fs/crypto/bio.c 1 addition, 28 deletionsfs/crypto/bio.c
- fs/crypto/crypto.c 17 additions, 107 deletionsfs/crypto/crypto.c
- fs/crypto/fscrypt_private.h 13 additions, 12 deletionsfs/crypto/fscrypt_private.h
- fs/crypto/keyring.c 4 additions, 2 deletionsfs/crypto/keyring.c
- fs/crypto/keysetup.c 47 additions, 111 deletionsfs/crypto/keysetup.c
- fs/crypto/keysetup_v1.c 0 additions, 4 deletionsfs/crypto/keysetup_v1.c
- fs/crypto/policy.c 40 additions, 1 deletionfs/crypto/policy.c
- fs/ext4/ext4.h 2 additions, 0 deletionsfs/ext4/ext4.h
- fs/ext4/super.c 14 additions, 0 deletionsfs/ext4/super.c
- fs/f2fs/super.c 20 additions, 6 deletionsfs/f2fs/super.c
- include/linux/fscrypt.h 3 additions, 32 deletionsinclude/linux/fscrypt.h
- include/uapi/linux/fscrypt.h 2 additions, 1 deletioninclude/uapi/linux/fscrypt.h
Please register or sign in to comment