Preston_PLB
/
kernel-aes67
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: ahash - unexport crypto_hash_alg_has_setkey() 

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

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers 2024-01-26 23:49:27 -08:00 committed by Herbert Xu
parent 0c753f3342
commit 9a14b311f2
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crypto/ahash.c
View File

@ -618,6 +618,16 @@ int crypto_has_ahash(const char *alg_name, u32 type, u32 mask)
} }
EXPORT_SYMBOL_GPL(crypto_has_ahash); 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 crypto_ahash *crypto_clone_ahash(struct crypto_ahash *hash)
{ {
struct hash_alg_common *halg = crypto_hash_alg_common(hash); struct hash_alg_common *halg = crypto_hash_alg_common(hash);
@ -760,16 +770,5 @@ int ahash_register_instance(struct crypto_template *tmpl,
} }
EXPORT_SYMBOL_GPL(ahash_register_instance); 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_LICENSE("GPL");
MODULE_DESCRIPTION("Asynchronous cryptographic hash type"); MODULE_DESCRIPTION("Asynchronous cryptographic hash type");

2
include/crypto/internal/hash.h
View File

@ -87,8 +87,6 @@ static inline bool crypto_shash_alg_needs_key(struct shash_alg *alg)
!(alg->base.cra_flags & CRYPTO_ALG_OPTIONAL_KEY); !(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, int crypto_grab_ahash(struct crypto_ahash_spawn *spawn,
struct crypto_instance *inst, struct crypto_instance *inst,
const char *name, u32 type, u32 mask); const char *name, u32 type, u32 mask);