diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-01-03 11:16:24 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-17 13:21:15 +0100 |
| commit | 45f31106baa3fb77f5bdebca824bbc2956c51b7b (patch) | |
| tree | f9fdc282a22851f262063b32828ef18e600b5ac9 /crypto | |
| parent | c1ebf9f8354702eb229e623280f90ad5e456d75a (diff) | |
| download | linux-stable-45f31106baa3fb77f5bdebca824bbc2956c51b7b.tar.gz linux-stable-45f31106baa3fb77f5bdebca824bbc2956c51b7b.tar.bz2 linux-stable-45f31106baa3fb77f5bdebca824bbc2956c51b7b.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 a14100e74754..6e9389c8bfbd 100644 --- a/crypto/mcryptd.c +++ b/crypto/mcryptd.c @@ -534,7 +534,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); |