diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-29 15:33:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-29 15:33:50 -0700 |
| commit | d60ac92c105fd8c09224b92c3e34dd03327ba3f4 (patch) | |
| tree | b1c3ef3f277aa48370f590341166d4425b30cab6 /fs/crypto/policy.c | |
| parent | a769648f464c9f453b3dc5c2bb8559b28c5d78a1 (diff) | |
| parent | 19591f7e781fd1e68228f5b3bee60be6425af886 (diff) | |
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux
Pull fscrypt updates from Eric Biggers:
"Make fs/crypto/ use the HMAC-SHA512 library functions instead of
crypto_shash.
This is simpler, faster, and more reliable"
* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux:
fscrypt: use HMAC-SHA512 library for HKDF
fscrypt: Remove redundant __GFP_NOWARN
Diffstat (limited to 'fs/crypto/policy.c')
| -rw-r--r-- | fs/crypto/policy.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index 9d51f3500de3..bbb2f5ced988 100644 --- a/fs/crypto/policy.c +++ b/fs/crypto/policy.c @@ -827,10 +827,8 @@ int fscrypt_parse_test_dummy_encryption(const struct fs_parameter *param, policy->version = FSCRYPT_POLICY_V2; policy->v2.contents_encryption_mode = FSCRYPT_MODE_AES_256_XTS; policy->v2.filenames_encryption_mode = FSCRYPT_MODE_AES_256_CTS; - err = fscrypt_get_test_dummy_key_identifier( + fscrypt_get_test_dummy_key_identifier( policy->v2.master_key_identifier); - if (err) - goto out; } else { err = -EINVAL; goto out; |