Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "crypto: testmgr - desupport SHA-1 for FIPS 140" 

This reverts commit 9d50a25eeb.

Reported-by: Jiri Slaby <jirislaby@kernel.org>
Reported-by: Jon Kohler <jon@nutanix.com>
Link: https://lore.kernel.org/all/05b7ef65-37bb-4391-9ec9-c382d51bae4d@kernel.org/
Link: https://lore.kernel.org/all/26F8FCC9-B448-4A89-81DF-6BAADA03E174@nutanix.com/
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2025-10-06 10:07:53 +08:00
parent ef2b6e0317
commit ca1354f799
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/testmgr.c
View File

@ -4186,6 +4186,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "authenc(hmac(sha1),cbc(aes))", .alg = "authenc(hmac(sha1),cbc(aes))",
.generic_driver = "authenc(hmac-sha1-lib,cbc(aes-generic))", .generic_driver = "authenc(hmac-sha1-lib,cbc(aes-generic))",
.test = alg_test_aead, .test = alg_test_aead,
.fips_allowed = 1,
.suite = { .suite = {
.aead = __VECS(hmac_sha1_aes_cbc_tv_temp) .aead = __VECS(hmac_sha1_aes_cbc_tv_temp)
} }
@ -4206,6 +4207,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, { }, {
.alg = "authenc(hmac(sha1),ctr(aes))", .alg = "authenc(hmac(sha1),ctr(aes))",
.test = alg_test_null, .test = alg_test_null,
.fips_allowed = 1,
}, { }, {
.alg = "authenc(hmac(sha1),ecb(cipher_null))", .alg = "authenc(hmac(sha1),ecb(cipher_null))",
.generic_driver = "authenc(hmac-sha1-lib,ecb-cipher_null)", .generic_driver = "authenc(hmac-sha1-lib,ecb-cipher_null)",
@ -4216,6 +4218,7 @@ static const struct alg_test_desc alg_test_descs[] = {
}, { }, {
.alg = "authenc(hmac(sha1),rfc3686(ctr(aes)))", .alg = "authenc(hmac(sha1),rfc3686(ctr(aes)))",
.test = alg_test_null, .test = alg_test_null,
.fips_allowed = 1,
}, { }, {
.alg = "authenc(hmac(sha224),cbc(des))", .alg = "authenc(hmac(sha224),cbc(des))",
.generic_driver = "authenc(hmac-sha224-lib,cbc(des-generic))", .generic_driver = "authenc(hmac-sha224-lib,cbc(des-generic))",
@ -5078,6 +5081,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "hmac(sha1)", .alg = "hmac(sha1)",
.generic_driver = "hmac-sha1-lib", .generic_driver = "hmac-sha1-lib",
.test = alg_test_hash, .test = alg_test_hash,
.fips_allowed = 1,
.suite = { .suite = {
.hash = __VECS(hmac_sha1_tv_template) .hash = __VECS(hmac_sha1_tv_template)
} }
@ -5448,6 +5452,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.alg = "sha1", .alg = "sha1",
.generic_driver = "sha1-lib", .generic_driver = "sha1-lib",
.test = alg_test_hash, .test = alg_test_hash,
.fips_allowed = 1,
.suite = { .suite = {
.hash = __VECS(sha1_tv_template) .hash = __VECS(sha1_tv_template)
} }