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

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

crypto: hash - introduce crypto_hash_alg_has_setkey() 



commit cd6ed77ad5d223dc6299fb58f62e0f5267f7e2ba upstream.

Templates that use an shash spawn can use crypto_shash_alg_has_setkey()
to determine whether the underlying algorithm requires a key or not.
But there was no corresponding function for ahash spawns.  Add it.

Note that the new function actually has to support both shash and ahash
algorithms, since the ahash API can be used with either.

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 016572d3

crypto/ahash.c

+11 −0
Original line number Diff line number Diff line
@@ -625,5 +625,16 @@ struct hash_alg_common *ahash_attr_alg(struct rtattr *rta, u32 type, u32 mask) 
}

EXPORT_SYMBOL_GPL(ahash_attr_alg);



bool crypto_hash_alg_has_setkey(struct hash_alg_common *halg)

{

	struct crypto_alg *alg = &halg->base;



	if (alg->cra_type != &crypto_ahash_type)

		return crypto_shash_alg_has_setkey(__crypto_shash_alg(alg));



	return __crypto_ahash_alg(alg)->setkey != NULL;

}

EXPORT_SYMBOL_GPL(crypto_hash_alg_has_setkey);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Asynchronous cryptographic hash type");

include/crypto/internal/hash.h

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ static inline bool crypto_shash_alg_has_setkey(struct shash_alg *alg) 
	return alg->setkey != shash_no_setkey;

}



bool crypto_hash_alg_has_setkey(struct hash_alg_common *halg);



int crypto_init_ahash_spawn(struct crypto_ahash_spawn *spawn,

			    struct hash_alg_common *alg,

			    struct crypto_instance *inst);