diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-01-03 11:16:24 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-16 20:06:48 +0100 |
| commit | a3b6f7d313afb083acec85f3ff513b4daf0d56d6 (patch) | |
| tree | ceb139171b229497e32b7c6155b136a682f9537d /crypto | |
| parent | f034d24fcef862d0fa12adcee1e5817c9ade8f7e (diff) | |
| download | linux-a3b6f7d313afb083acec85f3ff513b4daf0d56d6.tar.gz linux-a3b6f7d313afb083acec85f3ff513b4daf0d56d6.tar.bz2 linux-a3b6f7d313afb083acec85f3ff513b4daf0d56d6.zip | |
crypto: mcryptd - pass through absence of ->setkey()
commit fa59b92d299f2787e6bae1ff078ee0982e80211f upstream.
When the mcryptd template is used to wrap an unkeyed hash algorithm,
don't install a ->setkey() method to the mcryptd instance. This change
is necessary for mcryptd to keep working with unkeyed hash algorithms
once we start enforcing that ->setkey() is called when present.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/mcryptd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/mcryptd.c b/crypto/mcryptd.c index eca04d3729b3..6b4dd4b76942 100644 --- a/crypto/mcryptd.c +++ b/crypto/mcryptd.c @@ -535,7 +535,8 @@ static int mcryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb, inst->alg.finup = mcryptd_hash_finup_enqueue; inst->alg.export = mcryptd_hash_export; inst->alg.import = mcryptd_hash_import; - inst->alg.setkey = mcryptd_hash_setkey; + if (crypto_hash_alg_has_setkey(halg)) + inst->alg.setkey = mcryptd_hash_setkey; inst->alg.digest = mcryptd_hash_digest_enqueue; err = ahash_register_instance(tmpl, inst); |