Commit b3208bf4 authored by Herbert Xu's avatar Herbert Xu Committed by Greg Kroah-Hartman

crypto: shash - Fix has_key setting

commit 00420a65 upstream.

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: a5596d63 ("crypto: hash - Add crypto_ahash_has_setkey")
Reported-by: default avatarStephan Mueller <smueller@chronox.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Tested-by: default avatarStephan Mueller <smueller@chronox.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 180b8dcc
...@@ -354,11 +354,10 @@ int crypto_init_shash_ops_async(struct crypto_tfm *tfm) ...@@ -354,11 +354,10 @@ int crypto_init_shash_ops_async(struct crypto_tfm *tfm)
crt->final = shash_async_final; crt->final = shash_async_final;
crt->finup = shash_async_finup; crt->finup = shash_async_finup;
crt->digest = shash_async_digest; 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) if (alg->export)
crt->export = shash_async_export; crt->export = shash_async_export;
if (alg->import) if (alg->import)
......
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