crypto: ahash - unexport crypto_hash_alg_has_setkey()

Commit Message

Eric Biggers Jan. 27, 2024, 7:49 a.m. UTC

From: Eric Biggers <[e-mail]>

Since crypto_hash_alg_has_setkey() is only called from ahash.c itself,
make it a static function.

Signed-off-by: Eric Biggers <[e-mail]>
---
 crypto/ahash.c                 | 21 ++++++++++-----------
 include/crypto/internal/hash.h |  2 --
 2 files changed, 10 insertions(+), 13 deletions(-)


base-commit: 4d314d27130b674a3687135fe94f44a40f107f76

Comments

Herbert Xu Feb. 2, 2024, 10:12 a.m. UTC | #1

Eric Biggers <[e-mail]> wrote:
> From: Eric Biggers <[e-mail]>
> 
> Since crypto_hash_alg_has_setkey() is only called from ahash.c itself,
> make it a static function.
> 
> Signed-off-by: Eric Biggers <[e-mail]>
> ---
> crypto/ahash.c                 | 21 ++++++++++-----------
> include/crypto/internal/hash.h |  2 --
> 2 files changed, 10 insertions(+), 13 deletions(-)

Patch applied.  Thanks.

Patch

diff --git a/crypto/ahash.c b/crypto/ahash.c
index 80c3e5354711e..0ac83f7f701df 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -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");
diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h
index 59c707e4dea46..58967593b6b4d 100644
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
@@ -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(