2016-02-05 13:22:29

by Marcus Meissner

[permalink] [raw]
Subject: [PATCH 2/2] 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:41:04

by Stephan Müller

[permalink] [raw]
Subject: Re: [PATCH 2/2] crypto: testmgr: mark more algorithms as FIPS compliant

Am Freitag, 5. Februar 2016, 14:22:25 schrieb Marcus Meissner:

Hi Marcus,

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

Is this patch a duplication of the first one?

Ciao
Stephan

2016-02-05 13:42:43

by Marcus Meissner

[permalink] [raw]
Subject: Re: [PATCH 2/2] crypto: testmgr: mark more algorithms as FIPS compliant

On Fri, Feb 05, 2016 at 02:41:01PM +0100, Stephan Mueller wrote:
> Am Freitag, 5. Februar 2016, 14:22:25 schrieb Marcus Meissner:
>
> Hi Marcus,
>
> >Some more authenc() wrapped algorithms are FIPS compliant, tag
> >them as such.
>
> Is this patch a duplication of the first one?

yes, I mistakenly sent it as part of a series, while it is not.

Ciao, Marcus