Attachment 595295 Details for Bug 830898 – Proposed patch

[patch] Proposed patch

0001-crypto-allow-aesni-intel-and-ghash_clmulni-intel-in-.patch (text/plain), 2.75 KB, created by Milan Broz on 2012-06-29 12:31:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Broz

Created: 2012-06-29 12:31:25 UTC

Size: 2.75 KB

patch

obsolete

>From 0088675c6c84ad267e8ef0fb1a176dc0783e9e4b Mon Sep 17 00:00:00 2001
>From: Milan Broz <mbroz@redhat.com>
>Date: Fri, 29 Jun 2012 12:05:42 +0200
>Subject: [PATCH] crypto: allow aesni-intel and ghash_clmulni-intel in fips
> mode
>
>Patch 863b557a88f8c033f7419fabafef4712a5055f85 added NULL entries
>for intel accelerated drivers but did not marked these fips allowed.
>This cause panic in if tunning tests in fips=1.
>
>For ghash, fips_allowed flag was added in patch
>18c0ebd2d8194cce4b3f67e2903fa01bea892cbc.
>
>Without patch, "modprobe tcrypt" fails with
>  alg: skcipher: Failed to load transform for cbc-aes-aesni: -2
>  cbc-aes-aesni: cbc(aes) alg self test failed in fips mode!
>  (panic)
>
>Also add missing cryptd(__driver-cbc-aes-aesni) and
>cryptd(__driver-gcm-aes-aesni) test to complement
>null tests above, otherwise system complains with
>  alg: No test for __cbc-aes-aesni (cryptd(__driver-cbc-aes-aesni))
>  alg: No test for __gcm-aes-aesni (cryptd(__driver-gcm-aes-aesni))
>
>Signed-off-by: Milan Broz <mbroz@redhat.com>
>Signed-off-by: Paul Wouters <pwouters@redhat.com>
>---
> crypto/testmgr.c |   21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
>diff --git a/crypto/testmgr.c b/crypto/testmgr.c
>index 6c32f69..b1cd00b 100644
>--- a/crypto/testmgr.c
>+++ b/crypto/testmgr.c
>@@ -1551,6 +1551,7 @@ static const struct alg_test_desc alg_test_descs[] = {
> 	}, {
> 		.alg = "__driver-cbc-aes-aesni",
> 		.test = alg_test_null,
>+		.fips_allowed = 1,
> 		.suite = {
> 			.cipher = {
> 				.enc = {
>@@ -1581,6 +1582,7 @@ static const struct alg_test_desc alg_test_descs[] = {
> 	}, {
> 		.alg = "__driver-ecb-aes-aesni",
> 		.test = alg_test_null,
>+		.fips_allowed = 1,
> 		.suite = {
> 			.cipher = {
> 				.enc = {
>@@ -1611,6 +1613,7 @@ static const struct alg_test_desc alg_test_descs[] = {
> 	}, {
> 		.alg = "__ghash-pclmulqdqni",
> 		.test = alg_test_null,
>+		.fips_allowed = 1,
> 		.suite = {
> 			.hash = {
> 				.vecs = NULL,
>@@ -1778,6 +1781,7 @@ static const struct alg_test_desc alg_test_descs[] = {
> 	}, {
> 		.alg = "cryptd(__driver-ecb-aes-aesni)",
> 		.test = alg_test_null,
>+		.fips_allowed = 1,
> 		.suite = {
> 			.cipher = {
> 				.enc = {
>@@ -1806,8 +1810,24 @@ static const struct alg_test_desc alg_test_descs[] = {
> 			}
> 		}
> 	}, {
>+		.alg = "cryptd(__driver-gcm-aes-aesni)",
>+		.test = alg_test_null,
>+		.suite = {
>+			.cipher = {
>+				.enc = {
>+					.vecs = NULL,
>+					.count = 0
>+				},
>+				.dec = {
>+					.vecs = NULL,
>+					.count = 0
>+				}
>+			}
>+		}
>+	}, {
> 		.alg = "cryptd(__ghash-pclmulqdqni)",
> 		.test = alg_test_null,
>+		.fips_allowed = 1,
> 		.suite = {
> 			.hash = {
> 				.vecs = NULL,
>@@ -1923,6 +1943,7 @@ static const struct alg_test_desc alg_test_descs[] = {
> 	}, {
> 		.alg = "ecb(__aes-aesni)",
> 		.test = alg_test_null,
>+		.fips_allowed = 1,
> 		.suite = {
> 			.cipher = {
> 				.enc = {
>-- 
>1.7.10
>

Actions: View | Diff

Attachments on bug 830898: 590970 | 591553 | 595295