| Message ID | 20160126161637.GA24423@gondor.apana.org.au (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
Am Mittwoch, 27. Januar 2016, 00:16:37 schrieb Herbert Xu: Hi Herbert, > On Mon, Jan 25, 2016 at 10:22:36PM +0100, Stephan Mueller wrote: > > Hi Herbert, > > > > during testing of the current cryptodev-2.6 key, the AF_ALG hash does not > > seem to work as it used to. > > Oops, looks like I screwed up shash. > > ---8<--- > Subject: 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: 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> Ciao Stephan -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/crypto/shash.c b/crypto/shash.c index 88a27de..3597545 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)