lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 5 Feb 2017 20:09:12 +0100 From: Willy Tarreau <w@....eu> To: linux-kernel@...r.kernel.org, stable@...r.kernel.org, linux@...ck-us.net Cc: Herbert Xu <herbert@...dor.apana.org.au>, Andrey Ryabinin <aryabinin@...tuozzo.com>, Willy Tarreau <w@....eu> Subject: [PATCH 3.10 008/319] crypto: shash - Fix has_key setting From: Herbert Xu <herbert@...dor.apana.org.au> 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@...r.kernel.org Reported-by: Stephan Mueller <smueller@...onox.de> Signed-off-by: Herbert Xu <herbert@...dor.apana.org.au> Tested-by: Stephan Mueller <smueller@...onox.de> Signed-off-by: Andrey Ryabinin <aryabinin@...tuozzo.com> Signed-off-by: Willy Tarreau <w@....eu> --- crypto/shash.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/crypto/shash.c b/crypto/shash.c index 8e4256a..ac4d763 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) -- 2.8.0.rc2.1.gbe9624a
Powered by blists - more mailing lists