Commit 00420a65 authored Jan 27, 2016 by Herbert Xu

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: a5596d63 ("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>

parent 625b4a98

crypto/shash.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -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;

		if (alg->setkey) {
		crt->setkey = shash_async_setkey;
		crt->has_setkey = true;
		}

		crt->has_setkey = alg->setkey != shash_no_setkey;

		if (alg->export)
		crt->export = shash_async_export;
		if (alg->import)

Admin message