Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8888690e authored by Marcus Meissner's avatar Marcus Meissner Committed by Herbert Xu
Browse files

crypto: testmgr - allow rfc3686 aes-ctr variants in fips mode. 



RFC 3686 CTR in various authenc methods.

rfc3686(ctr(aes)) is already marked fips compliant,
so these should be fine.

Signed-off-by: default avatarMarcus Meissner <meissner@suse.de>
Acked-by: default avatarStephan Mueller <smueller@chronox.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f93a8b25

crypto/testmgr.c

+16 −0
Original line number Diff line number Diff line
@@ -2092,6 +2092,10 @@ 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))",

		.test = alg_test_aead,
@@ -2164,6 +2168,10 @@ static const struct alg_test_desc alg_test_descs[] = { 
		.alg = "authenc(hmac(sha256),ctr(aes))",

		.test = alg_test_null,

		.fips_allowed = 1,

	}, {

		.alg = "authenc(hmac(sha256),rfc3686(ctr(aes)))",

		.test = alg_test_null,

		.fips_allowed = 1,

	}, {

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

		.test = alg_test_aead,
@@ -2195,6 +2203,10 @@ static const struct alg_test_desc alg_test_descs[] = { 
		.alg = "authenc(hmac(sha384),ctr(aes))",

		.test = alg_test_null,

		.fips_allowed = 1,

	}, {

		.alg = "authenc(hmac(sha384),rfc3686(ctr(aes)))",

		.test = alg_test_null,

		.fips_allowed = 1,

	}, {

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

		.fips_allowed = 1,
@@ -2240,6 +2252,10 @@ static const struct alg_test_desc alg_test_descs[] = { 
		.alg = "authenc(hmac(sha512),ctr(aes))",

		.test = alg_test_null,

		.fips_allowed = 1,

	}, {

		.alg = "authenc(hmac(sha512),rfc3686(ctr(aes)))",

		.test = alg_test_null,

		.fips_allowed = 1,

	}, {

		.alg = "cbc(aes)",

		.test = alg_test_skcipher,