Skip to content

Commit ca1354f

Browse files
committed
Revert "crypto: testmgr - desupport SHA-1 for FIPS 140"
This reverts commit 9d50a25. 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>
1 parent ef2b6e0 commit ca1354f

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

crypto/testmgr.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4186,6 +4186,7 @@ static const struct alg_test_desc alg_test_descs[] = {
41864186
.alg = "authenc(hmac(sha1),cbc(aes))",
41874187
.generic_driver = "authenc(hmac-sha1-lib,cbc(aes-generic))",
41884188
.test = alg_test_aead,
4189+
.fips_allowed = 1,
41894190
.suite = {
41904191
.aead = __VECS(hmac_sha1_aes_cbc_tv_temp)
41914192
}
@@ -4206,6 +4207,7 @@ static const struct alg_test_desc alg_test_descs[] = {
42064207
}, {
42074208
.alg = "authenc(hmac(sha1),ctr(aes))",
42084209
.test = alg_test_null,
4210+
.fips_allowed = 1,
42094211
}, {
42104212
.alg = "authenc(hmac(sha1),ecb(cipher_null))",
42114213
.generic_driver = "authenc(hmac-sha1-lib,ecb-cipher_null)",
@@ -4216,6 +4218,7 @@ static const struct alg_test_desc alg_test_descs[] = {
42164218
}, {
42174219
.alg = "authenc(hmac(sha1),rfc3686(ctr(aes)))",
42184220
.test = alg_test_null,
4221+
.fips_allowed = 1,
42194222
}, {
42204223
.alg = "authenc(hmac(sha224),cbc(des))",
42214224
.generic_driver = "authenc(hmac-sha224-lib,cbc(des-generic))",
@@ -5078,6 +5081,7 @@ static const struct alg_test_desc alg_test_descs[] = {
50785081
.alg = "hmac(sha1)",
50795082
.generic_driver = "hmac-sha1-lib",
50805083
.test = alg_test_hash,
5084+
.fips_allowed = 1,
50815085
.suite = {
50825086
.hash = __VECS(hmac_sha1_tv_template)
50835087
}
@@ -5448,6 +5452,7 @@ static const struct alg_test_desc alg_test_descs[] = {
54485452
.alg = "sha1",
54495453
.generic_driver = "sha1-lib",
54505454
.test = alg_test_hash,
5455+
.fips_allowed = 1,
54515456
.suite = {
54525457
.hash = __VECS(sha1_tv_template)
54535458
}

0 commit comments

Comments
 (0)