diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-27 00:16:37 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-19 14:28:37 -0800 |
| commit | b3208bf4b67e216b0310818c61d072bd98d26ac6 (patch) | |
| tree | f7213c4162256f2dd5d59809d671104b49464765 | |
| parent | 180b8dcc9c9183740dfb9f9df20bc03fbee2790c (diff) | |
| download | linux-stable-b3208bf4b67e216b0310818c61d072bd98d26ac6.tar.gz linux-stable-b3208bf4b67e216b0310818c61d072bd98d26ac6.tar.bz2 linux-stable-b3208bf4b67e216b0310818c61d072bd98d26ac6.zip | |
crypto: shash - Fix has_key setting
commit 00420a65fa2beb3206090ead86942484df2275f3 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: a5596d633278 ("crypto: hash - Add crypto_ahash_has_setkey")
Reported-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 88a27de79848..359754591653 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) |