diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-08-09 08:27:17 +0100 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-08-31 19:26:24 -0400 |
| commit | b7da50c8fca4e0033abce679e78199dbe09a1e8d (patch) | |
| tree | 2e87eab627e2855a2183089350f069be6961d782 | |
| parent | 30c2bbd8a7b7ff3b6849d6ce1a69d4db9e40183b (diff) | |
| download | lwn-b7da50c8fca4e0033abce679e78199dbe09a1e8d.tar.gz lwn-b7da50c8fca4e0033abce679e78199dbe09a1e8d.zip | |
crypto: caam - fix non-hmac hashes
[ Upstream commit a0118c8b2be9297aed8e915c60b4013326b256d4 ]
Since 6de62f15b581 ("crypto: algif_hash - Require setkey before
accept(2)"), the AF_ALG interface requires userspace to provide a key
to any algorithm that has a setkey method. However, the non-HMAC
algorithms are not keyed, so setting a key is unnecessary.
Fix this by removing the setkey method from the non-keyed hash
algorithms.
Fixes: 6de62f15b581 ("crypto: algif_hash - Require setkey before accept(2)")
Cc: <stable@vger.kernel.org>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -rw-r--r-- | drivers/crypto/caam/caamhash.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index 5408450204b0..e3920af78621 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -1861,6 +1861,7 @@ caam_hash_alloc(struct caam_hash_template *template, template->name); snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s", template->driver_name); + t_alg->ahash_alg.setkey = NULL; } alg->cra_module = THIS_MODULE; alg->cra_init = caam_hash_cra_init; |