Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

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

8 views
Skip to first unread message

Marcus Meissner

unread,
Feb 4, 2016, 9:40:08 AM2/4/16
to
Signed-off-by: Marcus Meissner <meis...@suse.de>
---
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

Stephan Mueller

unread,
Feb 4, 2016, 9:40:09 AM2/4/16
to
Am Donnerstag, 4. Februar 2016, 15:30:26 schrieb Marcus Meissner:

Hi Marcus,

> Signed-off-by: Marcus Meissner <meis...@suse.de>

Acked-by: Stephan Mueller <smue...@chronox.de>
Ciao
Stephan

Herbert Xu

unread,
Feb 6, 2016, 2:50:11 AM2/6/16
to
On Thu, Feb 04, 2016 at 03:30:26PM +0100, Marcus Meissner wrote:
> Signed-off-by: Marcus Meissner <meis...@suse.de>

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

Marcus Meissner

unread,
Feb 6, 2016, 6:00:07 AM2/6/16
to
(2nd try that adds missing , to build.)

Signed-off-by: Marcus Meissner <meis...@suse.de>
---
crypto/testmgr.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index ae8c57fd..7d66cf8 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

Herbert Xu

unread,
Feb 16, 2016, 3:30:08 PM2/16/16
to
On Sat, Feb 06, 2016 at 11:53:07AM +0100, Marcus Meissner wrote:
> (2nd try that adds missing , to build.)
>
> Signed-off-by: Marcus Meissner <meis...@suse.de>

Applied.
0 new messages