-
- Downloads
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
Pull fscrypt updates from Eric Biggers: - Extend the FS_IOC_ADD_ENCRYPTION_KEY ioctl to allow the raw key to be provided via a keyring key. - Prepare for the new dirhash method (SipHash of plaintext name) that will be used by directories that are both encrypted and casefolded. - Switch to a new format for "no-key names" that prepares for the new dirhash method, and also fixes a longstanding bug where multiple filenames could map to the same no-key name. - Allow the crypto algorithms used by fscrypt to be built as loadable modules when the fscrypt-capable filesystems are. - Optimize fscrypt_zeroout_range(). - Various cleanups. * tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt: (26 commits) fscrypt: improve format of no-key names ubifs: allow both hash and disk name to be provided in no-key names ubifs: don't trigger assertion on invalid no-key filename fscrypt: clarify what is meant by a per-file key fscrypt: derive dirhash key for casefolded directories fscrypt: don't allow v1 policies with casefolding fscrypt: add "fscrypt_" prefix to fname_encrypt() fscrypt: don't print name of busy file when removing key ubifs: use IS_ENCRYPTED() instead of ubifs_crypt_is_encrypted() fscrypt: document gfp_flags for bounce page allocation fscrypt: optimize fscrypt_zeroout_range() fscrypt: remove redundant bi_status check fscrypt: Allow modular crypto algorithms fscrypt: include <linux/ioctl.h> in UAPI header fscrypt: don't check for ENOKEY from fscrypt_get_encryption_info() fscrypt: remove fscrypt_is_direct_key_policy() fscrypt: move fscrypt_valid_enc_modes() to policy.c fscrypt: check for appropriate use of DIRECT_KEY flag earlier fscrypt: split up fscrypt_supported_policy() by policy version fscrypt: introduce fscrypt_needs_contents_encryption() ...
No related branches found
No related tags found
Showing
- Documentation/filesystems/fscrypt.rst 58 additions, 17 deletionsDocumentation/filesystems/fscrypt.rst
- fs/crypto/Kconfig 15 additions, 7 deletionsfs/crypto/Kconfig
- fs/crypto/bio.c 81 additions, 33 deletionsfs/crypto/bio.c
- fs/crypto/crypto.c 6 additions, 51 deletionsfs/crypto/crypto.c
- fs/crypto/fname.c 251 additions, 65 deletionsfs/crypto/fname.c
- fs/crypto/fscrypt_private.h 22 additions, 36 deletionsfs/crypto/fscrypt_private.h
- fs/crypto/hkdf.c 1 addition, 1 deletionfs/crypto/hkdf.c
- fs/crypto/hooks.c 46 additions, 1 deletionfs/crypto/hooks.c
- fs/crypto/keyring.c 126 additions, 21 deletionsfs/crypto/keyring.c
- fs/crypto/keysetup.c 63 additions, 39 deletionsfs/crypto/keysetup.c
- fs/crypto/keysetup_v1.c 2 additions, 17 deletionsfs/crypto/keysetup_v1.c
- fs/crypto/policy.c 113 additions, 57 deletionsfs/crypto/policy.c
- fs/ext4/Kconfig 1 addition, 0 deletionsfs/ext4/Kconfig
- fs/ext4/dir.c 1 addition, 1 deletionfs/ext4/dir.c
- fs/f2fs/Kconfig 1 addition, 0 deletionsfs/f2fs/Kconfig
- fs/f2fs/dir.c 1 addition, 1 deletionfs/f2fs/dir.c
- fs/inode.c 2 additions, 1 deletionfs/inode.c
- fs/ubifs/Kconfig 1 addition, 0 deletionsfs/ubifs/Kconfig
- fs/ubifs/dir.c 8 additions, 8 deletionsfs/ubifs/dir.c
- fs/ubifs/file.c 2 additions, 2 deletionsfs/ubifs/file.c
Loading
Please register or sign in to comment