Skip to content

L
linux
Commit 79cafe9a authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files
Options

crypto: testmgr - always print the actual hash driver name 

When alg_test() is called from tcrypt.ko rather than from the algorithm
registration code, "driver" is actually the algorithm name, not the
driver name.  So it shouldn't be used in places where a driver name is
wanted, e.g. when reporting a test failure or when checking whether the
driver is the generic driver or not.

Fix this for the hash algorithm tests by getting the driver name from
the crypto_ahash or crypto_shash that actually got allocated.
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent da094e0f
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 23 deletions
crypto/testmgr.c
View file @ 79cafe9a
...@@ -1171,8 +1171,7 @@ static inline const void *sg_data(struct scatterlist *sg) ...@@ -1171,8 +1171,7 @@ static inline const void *sg_data(struct scatterlist *sg)
} }
/* Test one hash test vector in one configuration, using the shash API */ /* Test one hash test vector in one configuration, using the shash API */
static int test_shash_vec_cfg(const char *driver, static int test_shash_vec_cfg(const struct hash_testvec *vec,
const struct hash_testvec *vec,
const char *vec_name, const char *vec_name,
const struct testvec_config *cfg, const struct testvec_config *cfg,
struct shash_desc *desc, struct shash_desc *desc,
...@@ -1183,6 +1182,7 @@ static int test_shash_vec_cfg(const char *driver, ...@@ -1183,6 +1182,7 @@ static int test_shash_vec_cfg(const char *driver,
const unsigned int alignmask = crypto_shash_alignmask(tfm); const unsigned int alignmask = crypto_shash_alignmask(tfm);
const unsigned int digestsize = crypto_shash_digestsize(tfm); const unsigned int digestsize = crypto_shash_digestsize(tfm);
const unsigned int statesize = crypto_shash_statesize(tfm); const unsigned int statesize = crypto_shash_statesize(tfm);
const char *driver = crypto_shash_driver_name(tfm);
const struct test_sg_division *divs[XBUFSIZE]; const struct test_sg_division *divs[XBUFSIZE];
unsigned int i; unsigned int i;
u8 result[HASH_MAX_DIGESTSIZE + TESTMGR_POISON_LEN]; u8 result[HASH_MAX_DIGESTSIZE + TESTMGR_POISON_LEN];
...@@ -1355,8 +1355,7 @@ static int check_nonfinal_ahash_op(const char *op, int err, ...@@ -1355,8 +1355,7 @@ static int check_nonfinal_ahash_op(const char *op, int err,
} }
/* Test one hash test vector in one configuration, using the ahash API */ /* Test one hash test vector in one configuration, using the ahash API */
static int test_ahash_vec_cfg(const char *driver, static int test_ahash_vec_cfg(const struct hash_testvec *vec,
const struct hash_testvec *vec,
const char *vec_name, const char *vec_name,
const struct testvec_config *cfg, const struct testvec_config *cfg,
struct ahash_request *req, struct ahash_request *req,
...@@ -1367,6 +1366,7 @@ static int test_ahash_vec_cfg(const char *driver, ...@@ -1367,6 +1366,7 @@ static int test_ahash_vec_cfg(const char *driver,
const unsigned int alignmask = crypto_ahash_alignmask(tfm); const unsigned int alignmask = crypto_ahash_alignmask(tfm);
const unsigned int digestsize = crypto_ahash_digestsize(tfm); const unsigned int digestsize = crypto_ahash_digestsize(tfm);
const unsigned int statesize = crypto_ahash_statesize(tfm); const unsigned int statesize = crypto_ahash_statesize(tfm);
const char *driver = crypto_ahash_driver_name(tfm);
const u32 req_flags = CRYPTO_TFM_REQ_MAY_BACKLOG | cfg->req_flags; const u32 req_flags = CRYPTO_TFM_REQ_MAY_BACKLOG | cfg->req_flags;
const struct test_sg_division *divs[XBUFSIZE]; const struct test_sg_division *divs[XBUFSIZE];
DECLARE_CRYPTO_WAIT(wait); DECLARE_CRYPTO_WAIT(wait);
...@@ -1521,8 +1521,7 @@ static int test_ahash_vec_cfg(const char *driver, ...@@ -1521,8 +1521,7 @@ static int test_ahash_vec_cfg(const char *driver,
driver, cfg); driver, cfg);
} }
static int test_hash_vec_cfg(const char *driver, static int test_hash_vec_cfg(const struct hash_testvec *vec,
const struct hash_testvec *vec,
const char *vec_name, const char *vec_name,
const struct testvec_config *cfg, const struct testvec_config *cfg,
struct ahash_request *req, struct ahash_request *req,
...@@ -1539,20 +1538,18 @@ static int test_hash_vec_cfg(const char *driver, ...@@ -1539,20 +1538,18 @@ static int test_hash_vec_cfg(const char *driver,
*/ */
if (desc) { if (desc) {
err = test_shash_vec_cfg(driver, vec, vec_name, cfg, desc, tsgl, err = test_shash_vec_cfg(vec, vec_name, cfg, desc, tsgl,
hashstate); hashstate);
if (err) if (err)
return err; return err;
} }
return test_ahash_vec_cfg(driver, vec, vec_name, cfg, req, tsgl, return test_ahash_vec_cfg(vec, vec_name, cfg, req, tsgl, hashstate);
hashstate);
} }
static int test_hash_vec(const char *driver, const struct hash_testvec *vec, static int test_hash_vec(const struct hash_testvec *vec, unsigned int vec_num,
unsigned int vec_num, struct ahash_request *req, struct ahash_request *req, struct shash_desc *desc,
struct shash_desc *desc, struct test_sglist *tsgl, struct test_sglist *tsgl, u8 *hashstate)
u8 *hashstate)
{ {
char vec_name[16]; char vec_name[16];
unsigned int i; unsigned int i;
...@@ -1561,7 +1558,7 @@ static int test_hash_vec(const char *driver, const struct hash_testvec *vec, ...@@ -1561,7 +1558,7 @@ static int test_hash_vec(const char *driver, const struct hash_testvec *vec,
sprintf(vec_name, "%u", vec_num); sprintf(vec_name, "%u", vec_num);
for (i = 0; i < ARRAY_SIZE(default_hash_testvec_configs); i++) { for (i = 0; i < ARRAY_SIZE(default_hash_testvec_configs); i++) {
err = test_hash_vec_cfg(driver, vec, vec_name, err = test_hash_vec_cfg(vec, vec_name,
&default_hash_testvec_configs[i], &default_hash_testvec_configs[i],
req, desc, tsgl, hashstate); req, desc, tsgl, hashstate);
if (err) if (err)
...@@ -1576,7 +1573,7 @@ static int test_hash_vec(const char *driver, const struct hash_testvec *vec, ...@@ -1576,7 +1573,7 @@ static int test_hash_vec(const char *driver, const struct hash_testvec *vec,
for (i = 0; i < fuzz_iterations; i++) { for (i = 0; i < fuzz_iterations; i++) {
generate_random_testvec_config(&cfg, cfgname, generate_random_testvec_config(&cfg, cfgname,
sizeof(cfgname)); sizeof(cfgname));
err = test_hash_vec_cfg(driver, vec, vec_name, &cfg, err = test_hash_vec_cfg(vec, vec_name, &cfg,
req, desc, tsgl, hashstate); req, desc, tsgl, hashstate);
if (err) if (err)
return err; return err;
...@@ -1633,8 +1630,7 @@ static void generate_random_hash_testvec(struct shash_desc *desc, ...@@ -1633,8 +1630,7 @@ static void generate_random_hash_testvec(struct shash_desc *desc,
* Test the hash algorithm represented by @req against the corresponding generic * Test the hash algorithm represented by @req against the corresponding generic
* implementation, if one is available. * implementation, if one is available.
*/ */
static int test_hash_vs_generic_impl(const char *driver, static int test_hash_vs_generic_impl(const char *generic_driver,
const char *generic_driver,
unsigned int maxkeysize, unsigned int maxkeysize,
struct ahash_request *req, struct ahash_request *req,
struct shash_desc *desc, struct shash_desc *desc,
...@@ -1646,6 +1642,7 @@ static int test_hash_vs_generic_impl(const char *driver, ...@@ -1646,6 +1642,7 @@ static int test_hash_vs_generic_impl(const char *driver,
const unsigned int blocksize = crypto_ahash_blocksize(tfm); const unsigned int blocksize = crypto_ahash_blocksize(tfm);
const unsigned int maxdatasize = (2 * PAGE_SIZE) - TESTMGR_POISON_LEN; const unsigned int maxdatasize = (2 * PAGE_SIZE) - TESTMGR_POISON_LEN;
const char *algname = crypto_hash_alg_common(tfm)->base.cra_name; const char *algname = crypto_hash_alg_common(tfm)->base.cra_name;
const char *driver = crypto_ahash_driver_name(tfm);
char _generic_driver[CRYPTO_MAX_ALG_NAME]; char _generic_driver[CRYPTO_MAX_ALG_NAME];
struct crypto_shash *generic_tfm = NULL; struct crypto_shash *generic_tfm = NULL;
struct shash_desc *generic_desc = NULL; struct shash_desc *generic_desc = NULL;
...@@ -1732,7 +1729,7 @@ static int test_hash_vs_generic_impl(const char *driver, ...@@ -1732,7 +1729,7 @@ static int test_hash_vs_generic_impl(const char *driver,
vec_name, sizeof(vec_name)); vec_name, sizeof(vec_name));
generate_random_testvec_config(cfg, cfgname, sizeof(cfgname)); generate_random_testvec_config(cfg, cfgname, sizeof(cfgname));
err = test_hash_vec_cfg(driver, &vec, vec_name, cfg, err = test_hash_vec_cfg(&vec, vec_name, cfg,
req, desc, tsgl, hashstate); req, desc, tsgl, hashstate);
if (err) if (err)
goto out; goto out;
...@@ -1749,8 +1746,7 @@ static int test_hash_vs_generic_impl(const char *driver, ...@@ -1749,8 +1746,7 @@ static int test_hash_vs_generic_impl(const char *driver,
return err; return err;
} }
#else /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */ #else /* !CONFIG_CRYPTO_MANAGER_EXTRA_TESTS */
static int test_hash_vs_generic_impl(const char *driver, static int test_hash_vs_generic_impl(const char *generic_driver,
const char *generic_driver,
unsigned int maxkeysize, unsigned int maxkeysize,
struct ahash_request *req, struct ahash_request *req,
struct shash_desc *desc, struct shash_desc *desc,
...@@ -1820,6 +1816,7 @@ static int __alg_test_hash(const struct hash_testvec *vecs, ...@@ -1820,6 +1816,7 @@ static int __alg_test_hash(const struct hash_testvec *vecs,
driver, PTR_ERR(atfm)); driver, PTR_ERR(atfm));
return PTR_ERR(atfm); return PTR_ERR(atfm);
} }
driver = crypto_ahash_driver_name(atfm);
req = ahash_request_alloc(atfm, GFP_KERNEL); req = ahash_request_alloc(atfm, GFP_KERNEL);
if (!req) { if (!req) {
...@@ -1859,13 +1856,12 @@ static int __alg_test_hash(const struct hash_testvec *vecs, ...@@ -1859,13 +1856,12 @@ static int __alg_test_hash(const struct hash_testvec *vecs,
} }
for (i = 0; i < num_vecs; i++) { for (i = 0; i < num_vecs; i++) {
err = test_hash_vec(driver, &vecs[i], i, req, desc, tsgl, err = test_hash_vec(&vecs[i], i, req, desc, tsgl, hashstate);
hashstate);
if (err) if (err)
goto out; goto out;
cond_resched(); cond_resched();
} }
err = test_hash_vs_generic_impl(driver, generic_driver, maxkeysize, req, err = test_hash_vs_generic_impl(generic_driver, maxkeysize, req,
desc, tsgl, hashstate); desc, tsgl, hashstate);
out: out:
kfree(hashstate); kfree(hashstate);
...@@ -3602,6 +3598,7 @@ static int alg_test_crc32c(const struct alg_test_desc *desc, ...@@ -3602,6 +3598,7 @@ static int alg_test_crc32c(const struct alg_test_desc *desc,
"%ld\n", driver, PTR_ERR(tfm)); "%ld\n", driver, PTR_ERR(tfm));
return PTR_ERR(tfm); return PTR_ERR(tfm);
} }
driver = crypto_shash_driver_name(tfm);
do { do {
SHASH_DESC_ON_STACK(shash, tfm); SHASH_DESC_ON_STACK(shash, tfm);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7