diff mbox

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

Message ID 1454596226-27843-1-git-send-email-meissner@suse.de (mailing list archive)
State Changes Requested
Delegated to: Herbert Xu
Headers show

Commit Message

Marcus Meissner Feb. 4, 2016, 2:30 p.m. UTC 
Signed-off-by: Marcus Meissner <meissner@suse.de>
---
 crypto/testmgr.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

Comments

Stephan Mueller Feb. 4, 2016, 2:36 p.m. UTC | #1 
Am Donnerstag, 4. Februar 2016, 15:30:26 schrieb Marcus Meissner:

Hi Marcus,

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

Acked-by: Stephan Mueller <smueller@chronox.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,


Ciao
Stephan
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Herbert Xu Feb. 6, 2016, 7:48 a.m. UTC | #2 
On Thu, Feb 04, 2016 at 03:30:26PM +0100, Marcus Meissner wrote:
> Signed-off-by: Marcus Meissner <meissner@suse.de>

This doesn't compile for me.
diff mbox

Patch

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,