From 0729a444649e5e640141cc455ffc10d92ea9519a Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@tuxdriver.com>
Date: Sun, 12 Oct 2008 20:36:51 +0800
Subject: [PATCH] --- yaml --- r: 120588 b: refs/heads/master c:
 d12d6b6d37cad766b390467e770eb0ab81345d78 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/crypto/testmgr.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b9be5a258154..476c1194042c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe5720e2b7c1e8ff95d4bf18329517cf64ad1d70
+refs/heads/master: d12d6b6d37cad766b390467e770eb0ab81345d78
diff --git a/trunk/crypto/testmgr.c b/trunk/crypto/testmgr.c
index b828c6cf1b1d..308d9cffdc46 100644
--- a/trunk/crypto/testmgr.c
+++ b/trunk/crypto/testmgr.c
@@ -1801,6 +1801,7 @@ static int alg_find_test(const char *alg)
 int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
 {
 	int i;
+	int rc;
 
 	if ((type & CRYPTO_ALG_TYPE_MASK) == CRYPTO_ALG_TYPE_CIPHER) {
 		char nalg[CRYPTO_MAX_ALG_NAME];
@@ -1820,8 +1821,12 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
 	if (i < 0)
 		goto notest;
 
-	return alg_test_descs[i].test(alg_test_descs + i, driver,
+	rc = alg_test_descs[i].test(alg_test_descs + i, driver,
 				      type, mask);
+	if (fips_enabled && rc)
+		panic("%s: %s alg self test failed in fips mode!\n", driver, alg);
+
+	return rc;
 
 notest:
 	printk(KERN_INFO "alg: No test for %s (%s)\n", alg, driver);