Commit 42e45119 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: testmgr - rename noextratests to noslowtests 

Rename the noextratests module parameter to noslowtests, and replace
other remaining mentions of "extra" in the code with "slow".  This
addresses confusion regarding the word "extra" like that seen at
https://lore.kernel.org/r/6cecf2de-9aa0-f6ea-0c2d-8e974a1a820b@huawei.com/

.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 698de822

crypto/testmgr.c

+20 −21
Original line number Diff line number Diff line
@@ -43,11 +43,11 @@ MODULE_IMPORT_NS("CRYPTO_INTERNAL"); 


static bool notests;

module_param(notests, bool, 0644);

MODULE_PARM_DESC(notests, "disable crypto self-tests");

MODULE_PARM_DESC(notests, "disable all crypto self-tests");



static bool noextratests;

module_param(noextratests, bool, 0644);

MODULE_PARM_DESC(noextratests, "disable expensive crypto self-tests");

static bool noslowtests;

module_param(noslowtests, bool, 0644);

MODULE_PARM_DESC(noslowtests, "disable slow crypto self-tests");



static unsigned int fuzz_iterations = 100;

module_param(fuzz_iterations, uint, 0644);
@@ -1674,7 +1674,7 @@ static int test_hash_vec(const struct hash_testvec *vec, unsigned int vec_num, 
			return err;

	}



	if (!noextratests) {

	if (!noslowtests) {

		struct rnd_state rng;

		struct testvec_config cfg;

		char cfgname[TESTVEC_CONFIG_NAMELEN];
@@ -1764,7 +1764,7 @@ static int test_hash_vs_generic_impl(const char *generic_driver, 
	char cfgname[TESTVEC_CONFIG_NAMELEN];

	int err;



	if (noextratests)

	if (noslowtests)

		return 0;



	init_rnd_state(&rng);
@@ -2232,7 +2232,7 @@ static int test_aead_vec(int enc, const struct aead_testvec *vec, 
			return err;

	}



	if (!noextratests) {

	if (!noslowtests) {

		struct rnd_state rng;

		struct testvec_config cfg;

		char cfgname[TESTVEC_CONFIG_NAMELEN];
@@ -2252,7 +2252,7 @@ static int test_aead_vec(int enc, const struct aead_testvec *vec, 
	return 0;

}



struct aead_extra_tests_ctx {

struct aead_slow_tests_ctx {

	struct rnd_state rng;

	struct aead_request *req;

	struct crypto_aead *tfm;
@@ -2427,8 +2427,7 @@ static void generate_random_aead_testvec(struct rnd_state *rng, 
		 vec->alen, vec->plen, authsize, vec->klen, vec->novrfy);

}



static void try_to_generate_inauthentic_testvec(

					struct aead_extra_tests_ctx *ctx)

static void try_to_generate_inauthentic_testvec(struct aead_slow_tests_ctx *ctx)

{

	int i;
@@ -2447,7 +2446,7 @@ static void try_to_generate_inauthentic_testvec( 
 * Generate inauthentic test vectors (i.e. ciphertext, AAD pairs that aren't the

 * result of an encryption with the key) and verify that decryption fails.

 */

static int test_aead_inauthentic_inputs(struct aead_extra_tests_ctx *ctx)

static int test_aead_inauthentic_inputs(struct aead_slow_tests_ctx *ctx)

{

	unsigned int i;

	int err;
@@ -2482,7 +2481,7 @@ static int test_aead_inauthentic_inputs(struct aead_extra_tests_ctx *ctx) 
 * Test the AEAD algorithm against the corresponding generic implementation, if

 * one is available.

 */

static int test_aead_vs_generic_impl(struct aead_extra_tests_ctx *ctx)

static int test_aead_vs_generic_impl(struct aead_slow_tests_ctx *ctx)

{

	struct crypto_aead *tfm = ctx->tfm;

	const char *algname = crypto_aead_alg(tfm)->base.cra_name;
@@ -2586,15 +2585,15 @@ static int test_aead_vs_generic_impl(struct aead_extra_tests_ctx *ctx) 
	return err;

}



static int test_aead_extra(const struct alg_test_desc *test_desc,

static int test_aead_slow(const struct alg_test_desc *test_desc,

			  struct aead_request *req,

			  struct cipher_test_sglists *tsgls)

{

	struct aead_extra_tests_ctx *ctx;

	struct aead_slow_tests_ctx *ctx;

	unsigned int i;

	int err;



	if (noextratests)

	if (noslowtests)

		return 0;



	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
@@ -2701,7 +2700,7 @@ static int alg_test_aead(const struct alg_test_desc *desc, const char *driver, 
	if (err)

		goto out;



	err = test_aead_extra(desc, req, tsgls);

	err = test_aead_slow(desc, req, tsgls);

out:

	free_cipher_test_sglists(tsgls);

	aead_request_free(req);
@@ -2975,7 +2974,7 @@ static int test_skcipher_vec(int enc, const struct cipher_testvec *vec, 
			return err;

	}



	if (!noextratests) {

	if (!noslowtests) {

		struct rnd_state rng;

		struct testvec_config cfg;

		char cfgname[TESTVEC_CONFIG_NAMELEN];
@@ -3077,7 +3076,7 @@ static int test_skcipher_vs_generic_impl(const char *generic_driver, 
	char cfgname[TESTVEC_CONFIG_NAMELEN];

	int err;



	if (noextratests)

	if (noslowtests)

		return 0;



	init_rnd_state(&rng);
@@ -5709,7 +5708,7 @@ static void testmgr_onetime_init(void) 
	alg_check_test_descs_order();

	alg_check_testvec_configs();



	if (!noextratests)

	if (!noslowtests)

		pr_warn("alg: full crypto tests enabled.  This is intended for developer use only.\n");

}