diff options
| author |   Eric Biggers <ebiggers@google.com> | 2018-01-03 11:16:23 -0800 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2018-01-12 23:03:09 +1100 |
| commit | 841a3ff329713f796a63356fef6e2f72e4a3f6a3 (patch) | |
| tree | 7dd4bd49480355fa94e85547794211380c43e2f4 | |
| parent | crypto: hash - introduce crypto_hash_alg_has_setkey() (diff) | |
| download | linux-dev-841a3ff329713f796a63356fef6e2f72e4a3f6a3.tar.xz linux-dev-841a3ff329713f796a63356fef6e2f72e4a3f6a3.zip | |
crypto: cryptd - pass through absence of ->setkey()
When the cryptd template is used to wrap an unkeyed hash algorithm,
don't install a ->setkey() method to the cryptd instance. This change
is necessary for cryptd 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/cryptd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/cryptd.c b/crypto/cryptd.c index 552e3a86e829..457ae3e66a41 100644 --- a/crypto/cryptd.c +++ b/crypto/cryptd.c @@ -914,7 +914,8 @@ static int cryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb, inst->alg.finup = cryptd_hash_finup_enqueue; inst->alg.export = cryptd_hash_export; inst->alg.import = cryptd_hash_import; - inst->alg.setkey = cryptd_hash_setkey; + if (crypto_shash_alg_has_setkey(salg)) + inst->alg.setkey = cryptd_hash_setkey; inst->alg.digest = cryptd_hash_digest_enqueue; err = ahash_register_instance(tmpl, inst); |