Commit 8267adab authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: shash - Move finup/digest null checks to registration time 



This patch moves the run-time null finup/digest checks to the
shash_prepare_alg function which is run at registration time.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 99d27e1c

crypto/shash.c

+6 −4
Original line number Diff line number Diff line
@@ -142,8 +142,7 @@ int crypto_shash_finup(struct shash_desc *desc, const u8 *data, 
	struct shash_alg *shash = crypto_shash_alg(tfm);

	unsigned long alignmask = crypto_shash_alignmask(tfm);



	if (((unsigned long)data | (unsigned long)out) & alignmask ||

	    !shash->finup)

	if (((unsigned long)data | (unsigned long)out) & alignmask)

		return shash_finup_unaligned(desc, data, len, out);



	return shash->finup(desc, data, len, out);
@@ -164,8 +163,7 @@ int crypto_shash_digest(struct shash_desc *desc, const u8 *data, 
	struct shash_alg *shash = crypto_shash_alg(tfm);

	unsigned long alignmask = crypto_shash_alignmask(tfm);



	if (((unsigned long)data | (unsigned long)out) & alignmask ||

	    !shash->digest)

	if (((unsigned long)data | (unsigned long)out) & alignmask)

		return shash_digest_unaligned(desc, data, len, out);



	return shash->digest(desc, data, len, out);
@@ -488,6 +486,10 @@ static int shash_prepare_alg(struct shash_alg *alg) 
	base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK;

	base->cra_flags |= CRYPTO_ALG_TYPE_SHASH;



	if (!alg->finup)

		alg->finup = shash_finup_unaligned;

	if (!alg->digest)

		alg->digest = shash_digest_unaligned;

	if (!alg->import)

		alg->import = shash_no_import;

	if (!alg->export)