superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: shash - fold shash_digest_unaligned() into crypto_shash_digest() 

Fold shash_digest_unaligned() into its only remaining caller.  Also,
avoid a redundant check of CRYPTO_TFM_NEED_KEY by replacing the call to
crypto_shash_init() with shash->init(desc).  Finally, replace
shash_update_unaligned() + shash_final_unaligned() with
shash_finup_unaligned() which does exactly that.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
pull/318/merge
Eric Biggers 2023-10-09 00:32:14 -07:00 committed by Herbert Xu
parent 313a4074d7
commit 2e02c25ac9
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/shash.c
View File

@ -225,14 +225,6 @@ int crypto_shash_finup(struct shash_desc *desc, const u8 *data,
} }
EXPORT_SYMBOL_GPL(crypto_shash_finup); EXPORT_SYMBOL_GPL(crypto_shash_finup);
static int shash_digest_unaligned(struct shash_desc *desc, const u8 *data,
unsigned int len, u8 *out)
{
return crypto_shash_init(desc) ?:
shash_update_unaligned(desc, data, len) ?:
shash_final_unaligned(desc, out);
}
static int shash_default_digest(struct shash_desc *desc, const u8 *data, static int shash_default_digest(struct shash_desc *desc, const u8 *data,
unsigned int len, u8 *out) unsigned int len, u8 *out)
{ {
@ -260,7 +252,8 @@ int crypto_shash_digest(struct shash_desc *desc, const u8 *data,
if (crypto_shash_get_flags(tfm) & CRYPTO_TFM_NEED_KEY) if (crypto_shash_get_flags(tfm) & CRYPTO_TFM_NEED_KEY)
err = -ENOKEY; err = -ENOKEY;
else if (((unsigned long)data | (unsigned long)out) & alignmask) else if (((unsigned long)data | (unsigned long)out) & alignmask)
err = shash_digest_unaligned(desc, data, len, out); err = shash->init(desc) ?:
shash_finup_unaligned(desc, data, len, out);
else else
err = shash->digest(desc, data, len, out); err = shash->digest(desc, data, len, out);