crypto: testmgr - make it easier to enable the full set of tests

Currently the full set of crypto self-tests requires
CONFIG_CRYPTO_MANAGER_EXTRA_TESTS=y.  This is problematic in two ways.
First, developers regularly overlook this option.  Second, the
description of the tests as "extra" sometimes gives the impression that
it is not required that all algorithms pass these tests.

Given that the main use case for the crypto self-tests is for
developers, make enabling CONFIG_CRYPTO_SELFTESTS=y just enable the full
set of crypto self-tests by default.

The slow tests can still be disabled by adding the command-line
parameter cryptomgr.noextratests=1, soon to be renamed to
cryptomgr.noslowtests=1.  The only known use case for doing this is for
people trying to use the crypto self-tests to satisfy the FIPS 140-3
pre-operational self-testing requirements when the kernel is being
validated as a FIPS 140-3 cryptographic module.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/Kconfig b/crypto/Kconfig
index d326d3c5544fcd16944ad3cf0d72866ab3515e47..277fc93357675abccfee83648f55756165f24247 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -186,16 +186,6 @@ config CRYPTO_SELFTESTS
          enabled in production kernels, unless you are trying to use these
          tests to fulfill a FIPS testing requirement.
 
-config CRYPTO_MANAGER_EXTRA_TESTS
-       bool "Enable extra run-time crypto self tests"
-       depends on DEBUG_KERNEL && CRYPTO_SELFTESTS && CRYPTO_MANAGER
-       help
-         Enable extra run-time self tests of registered crypto algorithms,
-         including randomized fuzz tests.
-
-         This is intended for developer use only, as these tests take much
-         longer to run than the normal self tests.
-
 config CRYPTO_NULL
        tristate "Null algorithms"
        select CRYPTO_ALGAPI

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 3a624c9b552595aaf3837e75bcba55e3433529f1..a6707cda8328bbe194d9019ca75498d0568cb07e 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -45,7 +45,6 @@ static bool notests;
 module_param(notests, bool, 0644);
 MODULE_PARM_DESC(notests, "disable crypto self-tests");
 
-#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS
 static bool noextratests;
 module_param(noextratests, bool, 0644);
 MODULE_PARM_DESC(noextratests, "disable expensive crypto self-tests");
@@ -53,7 +52,6 @@ MODULE_PARM_DESC(noextratests, "disable expensive crypto self-tests");
 static unsigned int fuzz_iterations = 100;
 module_param(fuzz_iterations, uint, 0644);
 MODULE_PARM_DESC(fuzz_iterations, "number of fuzz test iterations");
-#endif
 
 #ifndef CONFIG_CRYPTO_SELFTESTS
 
@@ -321,10 +319,9 @@ struct testvec_config {
 
 /*
  * The following are the lists of testvec_configs to test for each algorithm
- * type when the basic crypto self-tests are enabled.  They aim to provide good
- * test coverage, while keeping the test time much shorter than the full fuzz
- * tests so that the basic tests can be enabled in a wider range of
- * circumstances.
+ * type when the fast crypto self-tests are enabled.  They aim to provide good
+ * test coverage, while keeping the test time much shorter than the full tests
+ * so that the fast tests can be used to fulfill FIPS 140 testing requirements.
  */
 
 /* Configs for skciphers and aeads */
@@ -873,8 +870,6 @@ static int prepare_keybuf(const u8 *key, unsigned int ksize,
        err;                                                            \
 })
 
-#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS
-
 /*
  * The fuzz tests use prandom instead of the normal Linux RNG since they don't
  * need cryptographically secure random numbers.  This greatly improves the
@@ -1239,15 +1234,6 @@ too_long:
               algname);
        return -ENAMETOOLONG;
 }
-#else /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */
-static void crypto_disable_simd_for_test(void)
-{
-}
-
-static void crypto_reenable_simd_for_test(void)
-{
-}
-#endif /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */
 
 static int build_hash_sglist(struct test_sglist *tsgl,
                             const struct hash_testvec *vec,
@@ -1688,7 +1674,6 @@ static int test_hash_vec(const struct hash_testvec *vec, unsigned int vec_num,
                        return err;
        }
 
-#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS
        if (!noextratests) {
                struct rnd_state rng;
                struct testvec_config cfg;
@@ -1706,11 +1691,9 @@ static int test_hash_vec(const struct hash_testvec *vec, unsigned int vec_num,
                        cond_resched();
                }
        }
-#endif
        return 0;
 }
 
-#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS
 /*
  * Generate a hash test vector from the given implementation.
  * Assumes the buffers in 'vec' were already allocated.
@@ -1876,17 +1859,6 @@ out:
        kfree_sensitive(generic_desc);
        return err;
 }
-#else /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */
-static int test_hash_vs_generic_impl(const char *generic_driver,
-                                    unsigned int maxkeysize,
-                                    struct ahash_request *req,
-                                    struct shash_desc *desc,
-                                    struct test_sglist *tsgl,
-                                    u8 *hashstate)
-{
-       return 0;
-}
-#endif /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */
 
 static int alloc_shash(const char *driver, u32 type, u32 mask,
                       struct crypto_shash **tfm_ret,
@@ -2260,7 +2232,6 @@ static int test_aead_vec(int enc, const struct aead_testvec *vec,
                        return err;
        }
 
-#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS
        if (!noextratests) {
                struct rnd_state rng;
                struct testvec_config cfg;
@@ -2278,12 +2249,9 @@ static int test_aead_vec(int enc, const struct aead_testvec *vec,
                        cond_resched();
                }
        }
-#endif
        return 0;
 }
 
-#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS
-
 struct aead_extra_tests_ctx {
        struct rnd_state rng;
        struct aead_request *req;
@@ -2668,14 +2636,6 @@ out:
        kfree(ctx);
        return err;
 }
-#else /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */
-static int test_aead_extra(const struct alg_test_desc *test_desc,
-                          struct aead_request *req,
-                          struct cipher_test_sglists *tsgls)
-{
-       return 0;
-}
-#endif /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */
 
 static int test_aead(int enc, const struct aead_test_suite *suite,
                     struct aead_request *req,
@@ -3015,7 +2975,6 @@ static int test_skcipher_vec(int enc, const struct cipher_testvec *vec,
                        return err;
        }
 
-#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS
        if (!noextratests) {
                struct rnd_state rng;
                struct testvec_config cfg;
@@ -3033,11 +2992,9 @@ static int test_skcipher_vec(int enc, const struct cipher_testvec *vec,
                        cond_resched();
                }
        }
-#endif
        return 0;
 }
 
-#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS
 /*
  * Generate a symmetric cipher test vector from the given implementation.
  * Assumes the buffers in 'vec' were already allocated.
@@ -3236,14 +3193,6 @@ out:
        skcipher_request_free(generic_req);
        return err;
 }
-#else /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */
-static int test_skcipher_vs_generic_impl(const char *generic_driver,
-                                        struct skcipher_request *req,
-                                        struct cipher_test_sglists *tsgls)
-{
-       return 0;
-}
-#endif /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */
 
 static int test_skcipher(int enc, const struct cipher_test_suite *suite,
                         struct skcipher_request *req,
@@ -5760,9 +5709,8 @@ static void testmgr_onetime_init(void)
        alg_check_test_descs_order();
        alg_check_testvec_configs();
 
-#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS
-       pr_warn("alg: extra crypto tests enabled.  This is intended for developer use only.\n");
-#endif
+       if (!noextratests)
+               pr_warn("alg: full crypto tests enabled.  This is intended for developer use only.\n");
 }
 
 static int alg_find_test(const char *alg)

diff --git a/include/crypto/internal/simd.h b/include/crypto/internal/simd.h
index f56049bd1660daf5fe22740358e0ee3103ed1297..7e7f1ac3b7fdab4f5d104617066bdca5274a7259 100644 (file)
--- a/include/crypto/internal/simd.h
+++ b/include/crypto/internal/simd.h
@@ -44,11 +44,9 @@ void simd_unregister_aeads(struct aead_alg *algs, int count,
  *
  * This delegates to may_use_simd(), except that this also returns false if SIMD
  * in crypto code has been temporarily disabled on this CPU by the crypto
- * self-tests, in order to test the no-SIMD fallback code.  This override is
- * currently limited to configurations where the extra self-tests are enabled,
- * because it might be a bit too invasive to be part of the regular self-tests.
+ * self-tests, in order to test the no-SIMD fallback code.
  */
-#ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS
+#ifdef CONFIG_CRYPTO_SELFTESTS
 DECLARE_PER_CPU(bool, crypto_simd_disabled_for_test);
 #define crypto_simd_usable() \
        (may_use_simd() && !this_cpu_read(crypto_simd_disabled_for_test))

diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile
index 599e61375938b30a5b631b34e6ccb86af5da3120..3e79283b617d93a36364b96e3cecbf8329ede8d7 100644 (file)
--- a/lib/crypto/Makefile
+++ b/lib/crypto/Makefile
@@ -62,7 +62,7 @@ libsha256-generic-y                           := sha256-generic.o
 
 obj-$(CONFIG_MPILIB) += mpi/
 
-obj-$(CONFIG_CRYPTO_MANAGER_EXTRA_TESTS)       += simd.o
+obj-$(CONFIG_CRYPTO_SELFTESTS)                 += simd.o
 
 obj-$(CONFIG_CRYPTO_LIB_SM3)                   += libsm3.o
 libsm3-y                                       := sm3.o