diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2016-11-06 23:31:10 -0800 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2016-11-06 23:31:10 -0800 |
| commit | d6c7f8ac7b17995a9ec714e55d70d9f337eeac61 (patch) | |
| tree | 2e1fe96499843f9ee1a2c80c687dcc5eaddb434b /crypto/ahash.c | |
| parent | 2fc3750b483ab74709f99072ac6ccc5ea9f0ae13 (diff) | |
| parent | 736d25df198dddeec82f61fee130f7d0e4212a9c (diff) | |
| download | linux-crypto-d6c7f8ac7b17995a9ec714e55d70d9f337eeac61.tar.gz linux-crypto-d6c7f8ac7b17995a9ec714e55d70d9f337eeac61.zip | |
Merge tag 'v4.9-rc3' into xtensa-for-next
Linux 4.9-rc3
Diffstat (limited to 'crypto/ahash.c')
| -rw-r--r-- | crypto/ahash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c index 3887a98a..2ce8bcb9 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 |