crypto: ahash - unexport crypto_hash_alg_has_setkey()
PATCH 1/1 crypto: ahash - unexport crypto_hash_alg_has_setkey()
From: Eric Biggers <[email protected]>
Since crypto_hash_alg_has_setkey() is only called from ahash.c itself, make it a static function.
Signed-off-by Eric Biggers <[email protected]>
--- crypto/ahash.c | 21 ++++++++++----------- include/crypto/internal/hash.h | 2 -- 2 files changed, 10 insertions(+), 13 deletions(-)
crypto/ahash.c +10 -11
@@ -611,20 +611,30 @@ struct crypto_ahash *crypto_alloc_ahash(const char *alg_name, u32 type,return crypto_alloc_tfm (alg_name, &crypto_ahash_type, type, mask); }EXPORT_SYMBOL_GPL (crypto_alloc_ahash);int crypto_has_ahash (const char *alg_name,u32 type,u32 mask) {return crypto_type_has_alg (alg_name, &crypto_ahash_type, type, mask); }EXPORT_SYMBOL_GPL (crypto_has_ahash); +static bool crypto_hash_alg_has_setkey (struct hash_alg_common *halg) +{ +struct crypto_alg *alg = &halg->base; + +if (alg->cra_type == &crypto_shash_type) +return crypto_shash_alg_has_setkey (__crypto_shash_alg (alg)); + +return __crypto_ahash_alg (alg)->setkey != ahash_nosetkey; +} +struct crypto_ahash *crypto_clone_ahash (struct crypto_ahash *hash) {struct hash_alg_common *halg =crypto_hash_alg_common (hash);struct crypto_tfm *tfm =crypto_ahash_tfm (hash);struct crypto_ahash *nhash;struct ahash_alg *alg;int err;if (!crypto_hash_alg_has_setkey (halg)) { tfm =crypto_tfm_get (tfm);
@@ -753,23 +763,12 @@ int ahash_register_instance(struct crypto_template *tmpl,return -EINVAL ; err =ahash_prepare_alg (&inst->alg);if (err)return err;return crypto_register_instance (tmpl,ahash_crypto_instance (inst)); }EXPORT_SYMBOL_GPL (ahash_register_instance); -bool crypto_hash_alg_has_setkey (struct hash_alg_common *halg) -{ -struct crypto_alg *alg = &halg->base; - -if (alg->cra_type == &crypto_shash_type) -return crypto_shash_alg_has_setkey (__crypto_shash_alg (alg)); - -return __crypto_ahash_alg (alg)->setkey != ahash_nosetkey; -} -EXPORT_SYMBOL_GPL (crypto_hash_alg_has_setkey); -MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Asynchronous cryptographic hash type" );
include/crypto/internal/hash.h +0 -2
@@ -80,22 +80,20 @@ static inline bool crypto_shash_alg_has_setkey(struct shash_alg *alg) {return alg->setkey != shash_no_setkey; }static inline bool crypto_shash_alg_needs_key (struct shash_alg *alg) {return crypto_shash_alg_has_setkey (alg) && !(alg->base.cra_flags &CRYPTO_ALG_OPTIONAL_KEY ); } -bool crypto_hash_alg_has_setkey (struct hash_alg_common *halg); -int crypto_grab_ahash (struct crypto_ahash_spawn *spawn,struct crypto_instance *inst,const char *name,u32 type,u32 mask);static inline void crypto_drop_ahash (struct crypto_ahash_spawn *spawn) {crypto_drop_spawn (&spawn->base); } static inline struct hash_alg_common *crypto_spawn_ahash_alg(
base-commit: 4d314d27130b674a3687135fe94f44a40f107f76
Signature · 1 line
2.43.0
Herbert Xu
maintainerQuoted 10 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Since
crypto_hash_alg_has_setkey()is only called fromahash.citself, make it a static function.Signed-off-by Eric Biggers <[email protected]>---
crypto/ahash.c| 21 ++++++++++-----------include/crypto/internal/hash.h| 2 --2 files changed, 10 insertions(+), 13 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt