Commit 284a0f6e authored by John Haxby's avatar John Haxby Committed by Herbert Xu
Browse files

crypto: testmgr - Disable fips-allowed for authenc() and des() ciphers 



No authenc() ciphers are FIPS approved, nor is ecb(des).
After the end of 2015, ansi_cprng will also be non-approved.

Signed-off-by: default avatarJohn Haxby <john.haxby@oracle.com>
Acked-by: default avatarStephan Mueller <smueller@chronox.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 640eec52

crypto/testmgr.c

+0 −16
Original line number Diff line number Diff line
@@ -2080,7 +2080,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

		.alg = "authenc(hmac(md5),ecb(cipher_null))",

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -2096,7 +2095,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

		.alg = "authenc(hmac(sha1),cbc(aes))",

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -2110,7 +2108,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

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

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -2124,7 +2121,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

		.alg = "authenc(hmac(sha1),cbc(des3_ede))",

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -2138,7 +2134,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

		.alg = "authenc(hmac(sha1),ecb(cipher_null))",

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -2158,7 +2153,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

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

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -2172,7 +2166,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

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

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -2186,7 +2179,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

		.alg = "authenc(hmac(sha256),cbc(aes))",

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -2200,7 +2192,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

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

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -2214,7 +2205,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

		.alg = "authenc(hmac(sha256),cbc(des3_ede))",

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -2228,7 +2218,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

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

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -2242,7 +2231,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

		.alg = "authenc(hmac(sha384),cbc(des3_ede))",

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -2256,7 +2244,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

		.alg = "authenc(hmac(sha512),cbc(aes))",

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -2270,7 +2257,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

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

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -2284,7 +2270,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

		.alg = "authenc(hmac(sha512),cbc(des3_ede))",

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

			.aead = {

				.enc = {
@@ -3011,7 +2996,6 @@ static const struct alg_test_desc alg_test_descs[] = { 
	}, {

		.alg = "ecb(des)",

		.test = alg_test_skcipher,

		.fips_allowed = 1,

		.suite = {

			.cipher = {

				.enc = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE