diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-27 17:29:49 +0300 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-11 10:59:01 +0200 |
| commit | 1b7a8ec10acd4e767c0ea952693a4aa16b7a016c (patch) | |
| tree | b818e21da3e3f654671b574b0ddbbcec9e714d63 | |
| parent | 584307222b81f4b2541a632fa0aeda597cd49c6b (diff) | |
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")
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>
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -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 8e4256aae..ac4d76350 100644 --- a/crypto/shash.c +++ b/crypto/shash.c @@ -353,11 +353,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) |