diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-08 21:28:26 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-02-13 10:34:12 +0000 |
| commit | 91be8bcfc83376406f0737d91b06d2a1587aa31b (patch) | |
| tree | c10fc4ee2b53f55efc6dda349fe5eac63a0291d5 /crypto | |
| parent | 62a73f4b649dedf99e8a32fd4834ef8954d04a37 (diff) | |
crypto: hash - Add crypto_ahash_has_setkey
commit a5596d6332787fd383b3b5427b41f94254430827 upstream.
This patch adds a way for ahash users to determine whether a key
is required by a crypto_ahash transform.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ahash.c | 5 | ||||
| -rw-r--r-- | crypto/shash.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c index 96c8e7cb680f..7fd8ecf71337 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -369,6 +369,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; @@ -381,8 +382,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) diff --git a/crypto/shash.c b/crypto/shash.c index f507294f2811..d15f35019c4b 100644 --- a/crypto/shash.c +++ b/crypto/shash.c @@ -354,8 +354,10 @@ int crypto_init_shash_ops_async(struct crypto_tfm *tfm) crt->finup = shash_async_finup; crt->digest = shash_async_digest; - if (alg->setkey) + if (alg->setkey) { crt->setkey = shash_async_setkey; + crt->has_setkey = true; + } if (alg->export) crt->export = shash_async_export; if (alg->import) |