Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45f31106 authored by Eric Biggers's avatar Eric Biggers Committed by Greg Kroah-Hartman
Browse files

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: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c1ebf9f8

crypto/mcryptd.c

+2 −1
Original line number Diff line number Diff line
@@ -534,6 +534,7 @@ 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;

	if (crypto_hash_alg_has_setkey(halg))

		inst->alg.setkey = mcryptd_hash_setkey;

	inst->alg.digest = mcryptd_hash_digest_enqueue;