diff options
| author | Eric Biggers <ebiggers@google.com> | 2018-01-03 11:16:23 -0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-06-16 22:21:51 +0100 |
| commit | 6e118db666378fdc9e78a37fd6ed97b19f4e9db8 (patch) | |
| tree | 6a4c9c5341d6d5629451afa992161844e9840f27 /crypto | |
| parent | 6b3aa7a9bd2e4693f8b6b5edf9d0c724376cd979 (diff) | |
| download | linux-stable-6e118db666378fdc9e78a37fd6ed97b19f4e9db8.tar.gz linux-stable-6e118db666378fdc9e78a37fd6ed97b19f4e9db8.tar.bz2 linux-stable-6e118db666378fdc9e78a37fd6ed97b19f4e9db8.zip | |
crypto: cryptd - pass through absence of ->setkey()
commit 841a3ff329713f796a63356fef6e2f72e4a3f6a3 upstream.
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.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'crypto')
| -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 d85fab975514..8091e75cea90 100644 --- a/crypto/cryptd.c +++ b/crypto/cryptd.c @@ -617,7 +617,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); |