diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-25 10:48:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-25 10:48:23 -0700 |
| commit | 174fdc93a241af54772ae3e745ec719e9f6cebfc (patch) | |
| tree | afdc8399f4a17c763966e0dc25b671af24570485 /crypto/asymmetric_keys/public_key.c | |
| parent | 4cece764965020c22cff7665b18a012006359095 (diff) | |
| parent | 5a7e89d3315d1be86aff8a8bf849023cda6547f7 (diff) | |
| download | linux-174fdc93a241af54772ae3e745ec719e9f6cebfc.tar.gz | |
Merge tag 'v6.9-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a regression that broke iwd as well as a divide by zero in
iaa"
* tag 'v6.9-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: iaa - Fix nr_cpus < nr_iaa case
Revert "crypto: pkcs7 - remove sha1 support"
Diffstat (limited to 'crypto/asymmetric_keys/public_key.c')
| -rw-r--r-- | crypto/asymmetric_keys/public_key.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c index e5f22691febd59..e314fd57e6f88a 100644 --- a/crypto/asymmetric_keys/public_key.c +++ b/crypto/asymmetric_keys/public_key.c @@ -115,7 +115,8 @@ software_key_determine_akcipher(const struct public_key *pkey, */ if (!hash_algo) return -EINVAL; - if (strcmp(hash_algo, "sha224") != 0 && + if (strcmp(hash_algo, "sha1") != 0 && + strcmp(hash_algo, "sha224") != 0 && strcmp(hash_algo, "sha256") != 0 && strcmp(hash_algo, "sha384") != 0 && strcmp(hash_algo, "sha512") != 0 && |