summaryrefslogtreecommitdiffstats
path: root/crypto/ahash.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-01-08 21:28:26 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2016-01-18 18:16:11 +0800
commita5596d6332787fd383b3b5427b41f94254430827 (patch)
treea618523b21b98d08e5afd40782ea4d12924f9952 /crypto/ahash.c
parenta0fa2d037129a9849918a92d91b79ed6c7bd2818 (diff)
downloadlinux-stable-a5596d6332787fd383b3b5427b41f94254430827.tar.gz
linux-stable-a5596d6332787fd383b3b5427b41f94254430827.tar.bz2
linux-stable-a5596d6332787fd383b3b5427b41f94254430827.zip
crypto: hash - Add crypto_ahash_has_setkey
This patch adds a way for ahash users to determine whether a key is required by a crypto_ahash transform. Cc: stable@vger.kernel.org Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/ahash.c')
-rw-r--r--crypto/ahash.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c
index 9c1dc8d6106a..d19b52324cf5 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -451,6 +451,7 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)
struct ahash_alg *alg = crypto_ahash_alg(hash);
hash->setkey = ahash_nosetkey;
+ hash->has_setkey = false;
hash->export = ahash_no_export;
hash->import = ahash_no_import;
@@ -463,8 +464,10 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)
hash->finup = alg->finup ?: ahash_def_finup;
hash->digest = alg->digest;
- if (alg->setkey)
+ if (alg->setkey) {
hash->setkey = alg->setkey;
+ hash->has_setkey = true;
+ }
if (alg->export)
hash->export = alg->export;
if (alg->import)