2016-02-05 13:23:33

by Marcus Meissner

Subject: [PATCH] crypto: testmgr: mark more algorithms as FIPS compliant

Some more authenc() wrapped algorithms are FIPS compliant, tag
them as such.

Signed-off-by: Marcus Meissner <[email protected]>
---
crypto/testmgr.c | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index ff6a799..b0cbad8 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2132,6 +2132,7 @@ 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 = {
@@ -2181,6 +2182,7 @@ 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 = {
@@ -2194,6 +2196,7 @@ 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 = {
@@ -2220,6 +2223,7 @@ 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 = {
@@ -2250,6 +2254,7 @@ 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 = {
@@ -2266,6 +2271,7 @@ static const struct alg_test_desc alg_test_descs[] = {
.fips_allowed = 1,
}, {
.alg = "authenc(hmac(sha512),cbc(aes))",
+ .fips_allowed = 1,
.test = alg_test_aead,
.suite = {
.aead = {
@@ -2293,6 +2299,7 @@ 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 = {
--
2.1.4

2016-02-05 13:39:34

by Stephan Müller

Subject: Re: [PATCH] crypto: testmgr: mark more algorithms as FIPS compliant

Am Freitag, 5. Februar 2016, 14:23:33 schrieb Marcus Meissner:

Hi Marcus,

>Some more authenc() wrapped algorithms are FIPS compliant, tag
>them as such.

Acked-by: Stephan Mueller <[email protected]>


Ciao
Stephan

2016-02-06 07:49:35

by Herbert Xu

Subject: Re: [PATCH] crypto: testmgr: mark more algorithms as FIPS compliant

On Fri, Feb 05, 2016 at 02:23:33PM +0100, Marcus Meissner wrote:
> Some more authenc() wrapped algorithms are FIPS compliant, tag
> them as such.
>
> Signed-off-by: Marcus Meissner <[email protected]>

Applied.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt