Commit ca1354f7 authored by Herbert Xu's avatar Herbert Xu
Browse files

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



This reverts commit 9d50a25e.

Reported-by: default avatarJiri Slaby <jirislaby@kernel.org>
Reported-by: default avatarJon 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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ef2b6e03

crypto/testmgr.c

+5 −0
Original line number Diff line number Diff line
@@ -4186,6 +4186,7 @@ static const struct alg_test_desc alg_test_descs[] = { 
		.alg = "authenc(hmac(sha1),cbc(aes))",

		.generic_driver = "authenc(hmac-sha1-lib,cbc(aes-generic))",

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.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))",

		.test = alg_test_null,

		.fips_allowed = 1,

	}, {

		.alg = "authenc(hmac(sha1),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)))",

		.test = alg_test_null,

		.fips_allowed = 1,

	}, {

		.alg = "authenc(hmac(sha224),cbc(des))",

		.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)",

		.generic_driver = "hmac-sha1-lib",

		.test = alg_test_hash,

		.fips_allowed = 1,

		.suite = {

			.hash = __VECS(hmac_sha1_tv_template)

		}
@@ -5448,6 +5452,7 @@ static const struct alg_test_desc alg_test_descs[] = { 
		.alg = "sha1",

		.generic_driver = "sha1-lib",

		.test = alg_test_hash,

		.fips_allowed = 1,

		.suite = {

			.hash = __VECS(sha1_tv_template)

		}