diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-27 00:16:37 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-27 20:25:13 +0800 |
commit | 2826e8665463f4cc132f3f2482286a649f672ad7 (patch) | |
tree | 10e66e369b6d7df12aea3e8997d934e77b6346b7 /crypto | |
parent | de63a4e2288115a06b70242a269344ce580d8431 (diff) | |
download | linux-crypto-2826e8665463f4cc132f3f2482286a649f672ad7.tar.gz linux-crypto-2826e8665463f4cc132f3f2482286a649f672ad7.zip |
crypto: shash - Fix has_key setting
The has_key logic is wrong for shash algorithms as they always
have a setkey function. So we should instead be testing against
shash_no_setkey.
Fixes: bd57898bac03 ("crypto: hash - Add crypto_ahash_has_setkey")
Cc: stable@vger.kernel.org
Reported-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Stephan Mueller <smueller@chronox.de>
Diffstat (limited to '')
-rw-r--r-- | crypto/shash.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/shash.c b/crypto/shash.c index 88a27de7..35975459 100644 --- a/crypto/shash.c +++ b/crypto/shash.c @@ -354,11 +354,10 @@ int crypto_init_shash_ops_async(struct crypto_tfm *tfm) crt->final = shash_async_final; crt->finup = shash_async_finup; crt->digest = shash_async_digest; + crt->setkey = shash_async_setkey; + + crt->has_setkey = alg->setkey != shash_no_setkey; - if (alg->setkey) { - crt->setkey = shash_async_setkey; - crt->has_setkey = true; - } if (alg->export) crt->export = shash_async_export; if (alg->import) |