summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-06-29 18:03:47 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2016-07-01 23:45:03 +0800
commit2495cf25f60e085b35beb9b215235dfe1ca4f200 (patch)
tree4289c1aa25ed0128814391bba655281741a11b84
parent927ef32dccfe6e048a163138b8e714b2d944194d (diff)
downloadtalos-obmc-linux-2495cf25f60e085b35beb9b215235dfe1ca4f200.tar.gz
talos-obmc-linux-2495cf25f60e085b35beb9b215235dfe1ca4f200.zip
crypto: ahash - Add padding in crypto_ahash_extsize
The function crypto_ahash_extsize did not include padding when computing the tfm context size. This patch fixes this by using the generic crypto_alg_extsize helper. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/ahash.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c
index 3887a98abcc3..2ce8bcb9049c 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -461,10 +461,10 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)
static unsigned int crypto_ahash_extsize(struct crypto_alg *alg)
{
- if (alg->cra_type == &crypto_ahash_type)
- return alg->cra_ctxsize;
+ if (alg->cra_type != &crypto_ahash_type)
+ return sizeof(struct crypto_shash *);
- return sizeof(struct crypto_shash *);
+ return crypto_alg_extsize(alg);
}
#ifdef CONFIG_NET
OpenPOWER on IntegriCloud