diff mbox

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

Message ID 1454755987-17941-1-git-send-email-meissner@suse.de (mailing list archive)
State Accepted
Delegated to: Herbert Xu
Headers show

Commit Message

Marcus Meissner Feb. 6, 2016, 10:53 a.m. UTC 
(2nd try that adds missing , to build.)

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

Comments

Herbert Xu Feb. 16, 2016, 8:22 p.m. UTC | #1 
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 <meissner@suse.de>

Applied.
diff mbox

Patch

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,