From: Eric Biggers Date: Wed, 3 Jan 2018 19:16:24 +0000 (-0800) Subject: crypto: mcryptd - pass through absence of ->setkey() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=16210524c424a5df0cdd9b2b6aaee037f995f6ad;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git crypto: mcryptd - pass through absence of ->setkey() commit fa59b92d299f2787e6bae1ff078ee0982e80211f upstream. When the mcryptd template is used to wrap an unkeyed hash algorithm, don't install a ->setkey() method to the mcryptd instance. This change is necessary for mcryptd to keep working with unkeyed hash algorithms once we start enforcing that ->setkey() is called when present. Signed-off-by: Eric Biggers Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- diff --git a/crypto/mcryptd.c b/crypto/mcryptd.c index eca04d3729b3..6b4dd4b76942 100644 --- a/crypto/mcryptd.c +++ b/crypto/mcryptd.c @@ -535,7 +535,8 @@ static int mcryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb, inst->alg.finup = mcryptd_hash_finup_enqueue; inst->alg.export = mcryptd_hash_export; inst->alg.import = mcryptd_hash_import; - inst->alg.setkey = mcryptd_hash_setkey; + if (crypto_hash_alg_has_setkey(halg)) + inst->alg.setkey = mcryptd_hash_setkey; inst->alg.digest = mcryptd_hash_digest_enqueue; err = ahash_register_instance(tmpl, inst);