rpms/kernel/F-12 crypto-testmgr-add-null-test-for-aesni.patch, NONE, 1.1 inotify-fix-inotify-oneshot-support.patch, 1.1, 1.2 kernel.spec, 1.2105, 1.2106

Chuck Ebbert cebbert at fedoraproject.org
Wed Jul 21 04:28:56 UTC 2010


Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14707

Modified Files:
	inotify-fix-inotify-oneshot-support.patch kernel.spec 
Added Files:
	crypto-testmgr-add-null-test-for-aesni.patch 
Log Message:
Fix inotify-oneshot-support patch so it builds.
crypto-testmgr-add-null-test-for-aesni.patch:
  Add tests for aesni crypto module (#571577)

crypto-testmgr-add-null-test-for-aesni.patch:
 testmgr.c |   84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

--- NEW FILE crypto-testmgr-add-null-test-for-aesni.patch ---
From: Youquan, Song <youquan.song at intel.com>
Date: Wed, 23 Dec 2009 11:45:20 +0000 (+0800)
Subject: crypto: testmgr - Fix complain about lack test for internal used algorithm
X-Git-Tag: v2.6.34-rc1~286^2~28
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=863b557a88f8c033f7419fabafef4712a5055f85

crypto: testmgr - Fix complain about lack test for internal used algorithm

When load aesni-intel and ghash_clmulni-intel driver,kernel will complain no
 test for some internal used algorithm.
The strange information as following:

alg: No test for __aes-aesni (__driver-aes-aesni)
alg: No test for __ecb-aes-aesni (__driver-ecb-aes-aesni)
alg: No test for __cbc-aes-aesni (__driver-cbc-aes-aesni)
alg: No test for __ecb-aes-aesni (cryptd(__driver-ecb-aes-aesni)
alg: No test for __ghash (__ghash-pclmulqdqni)
alg: No test for __ghash (cryptd(__ghash-pclmulqdqni))

This patch add NULL test entries for these algorithm and driver.

Signed-off-by: Youquan, Song <youquan.song at intel.com>
Signed-off-by: Ying, Huang <ying.huang at intel.com>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
---

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 7620bfc..c494d76 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1477,9 +1477,54 @@ static int alg_test_cprng(const struct alg_test_desc *desc, const char *driver,
 	return err;
 }
 
+static int alg_test_null(const struct alg_test_desc *desc,
+			     const char *driver, u32 type, u32 mask)
+{
+	return 0;
+}
+
 /* Please keep this list sorted by algorithm name. */
 static const struct alg_test_desc alg_test_descs[] = {
 	{
+		.alg = "__driver-cbc-aes-aesni",
+		.test = alg_test_null,
+		.suite = {
+			.cipher = {
+				.enc = {
+					.vecs = NULL,
+					.count = 0
+				},
+				.dec = {
+					.vecs = NULL,
+					.count = 0
+				}
+			}
+		}
+	}, {
+		.alg = "__driver-ecb-aes-aesni",
+		.test = alg_test_null,
+		.suite = {
+			.cipher = {
+				.enc = {
+					.vecs = NULL,
+					.count = 0
+				},
+				.dec = {
+					.vecs = NULL,
+					.count = 0
+				}
+			}
+		}
+	}, {
+		.alg = "__ghash-pclmulqdqni",
+		.test = alg_test_null,
+		.suite = {
+			.hash = {
+				.vecs = NULL,
+				.count = 0
+			}
+		}
+	}, {
 		.alg = "ansi_cprng",
 		.test = alg_test_cprng,
 		.fips_allowed = 1,
@@ -1623,6 +1668,30 @@ static const struct alg_test_desc alg_test_descs[] = {
 			}
 		}
 	}, {
+		.alg = "cryptd(__driver-ecb-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,
+		.suite = {
+			.hash = {
+				.vecs = NULL,
+				.count = 0
+			}
+		}
+	}, {
 		.alg = "ctr(aes)",
 		.test = alg_test_skcipher,
 		.fips_allowed = 1,
@@ -1669,6 +1738,21 @@ static const struct alg_test_desc alg_test_descs[] = {
 			}
 		}
 	}, {
+		.alg = "ecb(__aes-aesni)",
+		.test = alg_test_null,
+		.suite = {
+			.cipher = {
+				.enc = {
+					.vecs = NULL,
+					.count = 0
+				},
+				.dec = {
+					.vecs = NULL,
+					.count = 0
+				}
+			}
+		}
+	}, {
 		.alg = "ecb(aes)",
 		.test = alg_test_skcipher,
 		.fips_allowed = 1,

inotify-fix-inotify-oneshot-support.patch:
 inotify_fsnotify.c |    3 +++
 1 file changed, 3 insertions(+)

Index: inotify-fix-inotify-oneshot-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/inotify-fix-inotify-oneshot-support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- inotify-fix-inotify-oneshot-support.patch	16 Jul 2010 14:38:15 -0000	1.1
+++ inotify-fix-inotify-oneshot-support.patch	21 Jul 2010 04:28:55 -0000	1.2
@@ -18,7 +18,7 @@ index daa666a..388a150 100644
  	}
  
 +	if (entry->mask & IN_ONESHOT)
-+		fsnotify_destroy_mark(entry);
++		fsnotify_destroy_mark_by_entry(entry);
 +
  	/*
  	 * If we hold the entry until after the event is on the queue


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.2105
retrieving revision 1.2106
diff -u -p -r1.2105 -r1.2106
--- kernel.spec	16 Jul 2010 14:38:15 -0000	1.2105
+++ kernel.spec	21 Jul 2010 04:28:55 -0000	1.2106
@@ -841,6 +841,8 @@ Patch14010: ethtool-fix-buffer-overflow.
 Patch14020: inotify-fix-inotify-oneshot-support.patch
 Patch14030: inotify-send-IN_UNMOUNT-events.patch
 
+Patch14040: crypto-testmgr-add-null-test-for-aesni.patch
+
 # ==============================================================================
 %endif
 
@@ -1537,6 +1539,9 @@ ApplyPatch ethtool-fix-buffer-overflow.p
 ApplyPatch inotify-fix-inotify-oneshot-support.patch
 ApplyPatch inotify-send-IN_UNMOUNT-events.patch
 
+# add tests for aesni module
+ApplyPatch crypto-testmgr-add-null-test-for-aesni.patch
+
 # END OF PATCH APPLICATIONS ====================================================
 %endif
 
@@ -2186,6 +2191,11 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Jul 21 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.16-144
+- Fix inotify-oneshot-support patch so it builds.
+- crypto-testmgr-add-null-test-for-aesni.patch:
+  Add tests for aesni crypto module (#571577)
+
 * Fri Jul 16 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.16-143
 - inotify-fix-inotify-oneshot-support.patch,
   inotify-send-IN_UNMOUNT-events.patch:



More information about the scm-commits mailing list