diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-01-03 11:16:24 -0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-01-12 23:03:10 +1100 |
| commit | f461f04ef38939af2cf23efadea2820f4edcdc6e (patch) | |
| tree | eb028b5133099ea1dd7062c33f7455778372e2a6 | |
| parent | 48420a717b6a7d05a8efcd2744aaaa9760d911e9 (diff) | |
| download | linux-crypto-f461f04ef38939af2cf23efadea2820f4edcdc6e.tar.gz linux-crypto-f461f04ef38939af2cf23efadea2820f4edcdc6e.zip | |
crypto: mcryptd - pass through absence of ->setkey()
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.
Cc: stable@vger.kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -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 29083828..ace346b9 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); |