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

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

crypto: cryptd - pass through absence of ->setkey() 



commit 841a3ff329713f796a63356fef6e2f72e4a3f6a3 upstream.

When the cryptd template is used to wrap an unkeyed hash algorithm,
don't install a ->setkey() method to the cryptd instance.  This change
is necessary for cryptd 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 d2b492bd

crypto/cryptd.c

+2 −1
Original line number Diff line number Diff line
@@ -691,6 +691,7 @@ static int cryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb, 
	inst->alg.finup  = cryptd_hash_finup_enqueue;

	inst->alg.export = cryptd_hash_export;

	inst->alg.import = cryptd_hash_import;

	if (crypto_shash_alg_has_setkey(salg))

		inst->alg.setkey = cryptd_hash_setkey;

	inst->alg.digest = cryptd_hash_digest_enqueue;