2016-02-04 14:30:33

by Marcus Meissner

[permalink] [raw]
Subject: [PATCH] crypto: mark authenticated ctr(aes) also as FIPS able

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

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index ae8c57fd..ff6a799 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2143,6 +2143,10 @@ 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))",
.test = alg_test_aead,
.suite = {
@@ -2227,6 +2231,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(sha384),cbc(des))",
.test = alg_test_aead,
.suite = {
@@ -2253,6 +2261,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(sha512),cbc(aes))",
.test = alg_test_aead,
.suite = {
@@ -2292,6 +2304,10 @@ static const struct alg_test_desc alg_test_descs[] = {
}
}
}, {
+ .alg = "authenc(hmac(sha512),ctr(aes))"
+ .test = alg_test_null,
+ .fips_allowed = 1,
+ }, {
.alg = "cbc(aes)",
.test = alg_test_skcipher,
.fips_allowed = 1,
--
2.1.4


2016-02-04 14:36:51

by Stephan Müller

[permalink] [raw]
Subject: Re: [PATCH] crypto: mark authenticated ctr(aes) also as FIPS able

Am Donnerstag, 4. Februar 2016, 15:30:26 schrieb Marcus Meissner:

Hi Marcus,

> Signed-off-by: Marcus Meissner <[email protected]>

Acked-by: Stephan Mueller <[email protected]>
> ---
> crypto/testmgr.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/crypto/testmgr.c b/crypto/testmgr.c
> index ae8c57fd..ff6a799 100644
> --- a/crypto/testmgr.c
> +++ b/crypto/testmgr.c
> @@ -2143,6 +2143,10 @@ 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))",
> .test = alg_test_aead,
> .suite = {
> @@ -2227,6 +2231,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(sha384),cbc(des))",
> .test = alg_test_aead,
> .suite = {
> @@ -2253,6 +2261,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(sha512),cbc(aes))",
> .test = alg_test_aead,
> .suite = {
> @@ -2292,6 +2304,10 @@ static const struct alg_test_desc alg_test_descs[] =
> { }
> }
> }, {
> + .alg = "authenc(hmac(sha512),ctr(aes))"
> + .test = alg_test_null,
> + .fips_allowed = 1,
> + }, {
> .alg = "cbc(aes)",
> .test = alg_test_skcipher,
> .fips_allowed = 1,


Ciao
Stephan

2016-02-06 07:48:44

by Herbert Xu

[permalink] [raw]
Subject: Re: [PATCH] crypto: mark authenticated ctr(aes) also as FIPS able

On Thu, Feb 04, 2016 at 03:30:26PM +0100, Marcus Meissner wrote:
> Signed-off-by: Marcus Meissner <[email protected]>

This doesn't compile for me.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt