iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: testmgr - stop checking crypto_shash_alignmask

Browse Source 
Now that the shash algorithm type does not support nonzero alignmasks,
crypto_shash_alignmask() always returns 0 and will be removed.  In
preparation for this, stop checking crypto_shash_alignmask() in testmgr.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers 2023-10-18 22:53:40 -07:00 committed by Herbert Xu
parent eed577b9a9
commit 2125c11efd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/testmgr.c
View File

@ -1275,7 +1275,6 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec,
u8 *hashstate) u8 *hashstate)
{ {
struct crypto_shash *tfm = desc->tfm; struct crypto_shash *tfm = desc->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 char *driver = crypto_shash_driver_name(tfm);
@ -1287,7 +1286,7 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec,
/* Set the key, if specified */ /* Set the key, if specified */
if (vec->ksize) { if (vec->ksize) {
err = do_setkey(crypto_shash_setkey, tfm, vec->key, vec->ksize, err = do_setkey(crypto_shash_setkey, tfm, vec->key, vec->ksize,
cfg, alignmask); cfg, 0);
if (err) { if (err) {
if (err == vec->setkey_error) if (err == vec->setkey_error)
return 0; return 0;
@ -1304,7 +1303,7 @@ static int test_shash_vec_cfg(const struct hash_testvec *vec,
} }
/* Build the scatterlist for the source data */ /* Build the scatterlist for the source data */
err = build_hash_sglist(tsgl, vec, cfg, alignmask, divs); err = build_hash_sglist(tsgl, vec, cfg, 0, divs);
if (err) { if (err) {
pr_err("alg: shash: %s: error preparing scatterlist for test vector %s, cfg=\"%s\"\n", pr_err("alg: shash: %s: error preparing scatterlist for test vector %s, cfg=\"%s\"\n",
driver, vec_name, cfg->name); driver, vec_name, cfg->name);