From: Youquan, Song <youquan.song@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@intel.com>

Signed-off-by: Ying, Huang <ying.huang@intel.com>

Signed-off-by: Herbert Xu <herbert@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,