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: a5596d6 ("crypto: hash - Add crypto_ahash_has_setkey") Cc: [email protected] Reported-by: Stephan Mueller <[email protected]> Signed-off-by: Herbert Xu <[email protected]> Tested-by: Stephan Mueller <[email protected]>
ambv · Jan 27, 2016 · 00420a6 · 00420a6
1 parent 625b4a9
commit 00420a6
Showing 1 changed file with 3 additions and 4 deletions.
diff --git 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)