| Message ID | Y5ayAsXkTF3jK13s@sol.localdomain (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [GIT,PULL] fscrypt updates for 6.2 | expand |
The pull request you sent on Sun, 11 Dec 2022 20:45:54 -0800:
> https://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git tags/fscrypt-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8129bac60f30936d2339535841db5b66d0520a67
Thank you!
The following changes since commit f0c4d9fc9cc9462659728d168387191387e903cc: Linux 6.1-rc4 (2022-11-06 15:07:11 -0800) are available in the Git repository at: https://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git tags/fscrypt-for-linus for you to fetch changes up to 41952551acb405080726aa38a8a7ce317d9de4bb: fscrypt: add additional documentation for SM4 support (2022-12-02 10:43:00 -0800) ---------------------------------------------------------------- This release adds SM4 encryption support, contributed by Tianjia Zhang. SM4 is a Chinese block cipher that is an alternative to AES. I recommend against using SM4, but (according to Tianjia) some people are being required to use it. Since SM4 has been turning up in many other places (crypto API, wireless, TLS, OpenSSL, ARMv8 CPUs, etc.), it hasn't been very controversial, and some people have to use it, I don't think it would be fair for me to reject this optional feature. Besides the above, there are a couple cleanups. ---------------------------------------------------------------- Eric Biggers (4): fscrypt: pass super_block to fscrypt_put_master_key_activeref() fscrypt: add comment for fscrypt_valid_enc_modes_v1() fscrypt: remove unused Speck definitions fscrypt: add additional documentation for SM4 support Tianjia Zhang (2): blk-crypto: Add support for SM4-XTS blk crypto mode fscrypt: Add SM4 XTS/CTS symmetric algorithm support Documentation/filesystems/fscrypt.rst | 7 +++++++ block/blk-crypto.c | 6 ++++++ fs/crypto/fscrypt_private.h | 13 ++++--------- fs/crypto/keyring.c | 14 ++++++-------- fs/crypto/keysetup.c | 17 ++++++++++++++++- fs/crypto/policy.c | 12 ++++++++++++ include/linux/blk-crypto.h | 1 + include/uapi/linux/fscrypt.h | 4 ++-- 8 files changed, 54 insertions(+), 20 deletions(-)