diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 20:03:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 20:03:50 -0800 |
| commit | 8129bac60f30936d2339535841db5b66d0520a67 (patch) | |
| tree | bad8c543cb71450eaa46327075c540dd6dad9111 /fs/btrfs/zlib.c | |
| parent | deb9acc12250b13e40f7133f189d8a0891da53f3 (diff) | |
| parent | 41952551acb405080726aa38a8a7ce317d9de4bb (diff) | |
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
Pull fscrypt updates from Eric Biggers:
"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"
* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
fscrypt: add additional documentation for SM4 support
fscrypt: remove unused Speck definitions
fscrypt: Add SM4 XTS/CTS symmetric algorithm support
blk-crypto: Add support for SM4-XTS blk crypto mode
fscrypt: add comment for fscrypt_valid_enc_modes_v1()
fscrypt: pass super_block to fscrypt_put_master_key_activeref()
Diffstat (limited to 'fs/btrfs/zlib.c')
0 files changed, 0 insertions, 0 deletions