summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2016-05-03 10:00:17 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2016-05-05 14:36:53 +0800
commit9e5c9fe4cbb89b9af1fcf317f7b39d993bb47a71 (patch)
tree5bdd1fd539810739c68e2ebe461740db036a77ea /crypto
parentbc197b2a9c7e0129fa0ec1961881e2a0b3bef967 (diff)
downloadlinux-9e5c9fe4cbb89b9af1fcf317f7b39d993bb47a71.tar.gz
crypto: testmgr - Add a flag allowing the self-tests to be disabled at runtime.
Running self-tests for a short-lived KVM VM takes 28ms on my laptop. This commit adds a flag 'cryptomgr.notests' which allows them to be disabled. However if fips=1 as well, we ignore this flag as FIPS mode mandates that the self-tests are run. Signed-off-by: Richard W.M. Jones <rjones@redhat.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/testmgr.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index b86883aedca1..fcd89fe4068a 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -35,6 +35,10 @@
#include "internal.h"
+static bool notests;
+module_param(notests, bool, 0644);
+MODULE_PARM_DESC(notests, "disable crypto self-tests");
+
#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
/* a perfect nop */
@@ -3868,6 +3872,11 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
int j;
int rc;
+ if (!fips_enabled && notests) {
+ printk_once(KERN_INFO "alg: self-tests disabled\n");
+ return 0;
+ }
+
alg_test_descs_check_order();
if ((type & CRYPTO_ALG_TYPE_MASK) == CRYPTO_ALG_TYPE_CIPHER) {