Skip to contentSkip to conversation

crypto: skip algs not flagged fips_allowed in fips mode

PATCH In review Jarod Wilson 2 participants 2 messages May 11, 2009 – May 12, 2009

Subsystems (2)
Crypto API Arm STM32
lore
Share & tools
lore

Jarod Wilson

author
#0 lore raw

PATCH v2 2/2 crypto: skip algs not flagged fips_allowed in fips mode

Because all fips-allowed algorithms must be self-tested before they can be used, they will all have entries in testmgr.c's alg_test_descs[]. Skip self-tests for any algs not flagged as fips_approved and return -EINVAL when in fips mode.

Resending with properly updated patch v2 tag.

Signed-off-by Jarod Wilson <[email protected]>
---
 crypto/testmgr.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
crypto/testmgr.c +8 -0
index 51bae62..f93b26d 100644
@@ -2308,6 +2308,9 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
 		if (i < 0)
 			goto notest;
 
+		if (fips_enabled && !alg_test_descs[i].fips_allowed)
+			goto non_fips_alg;
+
 		rc = alg_test_cipher(alg_test_descs + i, driver, type, mask);
 		goto test_done;
 	}

@@ -2316,6 +2319,9 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
 	if (i < 0)
 		goto notest;
 
+	if (fips_enabled && !alg_test_descs[i].fips_allowed)
+		goto non_fips_alg;
+
 	rc = alg_test_descs[i].test(alg_test_descs + i, driver,
 				      type, mask);
 test_done:

@@ -2331,5 +2337,7 @@ test_done:
 notest:
 	printk(KERN_INFO "alg: No test for %s (%s)\n", alg, driver);
 	return 0;
+non_fips_alg:
+	return -EINVAL;
 }
 EXPORT_SYMBOL_GPL(alg_test);
Signature · 2 lines
Jarod Wilson
[email protected]
Acked-by on v2 2/2
#1 lore raw
Quoted 9 lines · Jarod Wilson

Because all fips-allowed algorithms must be self-tested before they can be used, they will all have entries in testmgr.c's alg_test_descs[]. Skip self-tests for any algs not flagged as fips_approved and return -EINVAL when in fips mode.

Resending with properly updated patch v2 tag.

Signed-off-by Jarod Wilson <[email protected]>
Acked-by Neil Horman <[email protected]>
Quoted 1 line