diff options
| author |   Eric Biggers <ebiggers@google.com> | 2019-01-06 19:08:01 -0800 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2019-01-18 18:40:24 +0800 |
| commit | 2b091e32a2d357beb9ffe283c696eec104729c2a (patch) | |
| tree | bd5b55d403870ca4ce83bec07c3e923b57c4c8ba /crypto/shash.c | |
| parent | crypto: shash - require neither or both ->export() and ->import() (diff) | |
| download | linux-dev-2b091e32a2d357beb9ffe283c696eec104729c2a.tar.xz linux-dev-2b091e32a2d357beb9ffe283c696eec104729c2a.zip | |
crypto: shash - remove pointless checks of shash_alg::{export,import}
crypto_init_shash_ops_async() only gives the ahash tfm non-NULL
->export() and ->import() if the underlying shash alg has these
non-NULL. This doesn't make sense because when an shash algorithm is
registered, shash_prepare_alg() sets a default ->export() and ->import()
if the implementor didn't provide them. And elsewhere it's assumed that
all shash algs and ahash tfms have non-NULL ->export() and ->import().
Therefore, remove these unnecessary, always-true conditions.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/shash.c')
| -rw-r--r-- | crypto/shash.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/shash.c b/crypto/shash.c index 2bffdecf1f83..15b369c4745f 100644 --- a/crypto/shash.c +++ b/crypto/shash.c @@ -388,10 +388,8 @@ int crypto_init_shash_ops_async(struct crypto_tfm *tfm) crypto_ahash_set_flags(crt, crypto_shash_get_flags(shash) & CRYPTO_TFM_NEED_KEY); - if (alg->export) - crt->export = shash_async_export; - if (alg->import) - crt->import = shash_async_import; + crt->export = shash_async_export; + crt->import = shash_async_import; crt->reqsize = sizeof(struct shash_desc) + crypto_shash_descsize(shash); |