diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-08 21:28:26 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-18 18:16:11 +0800 |
| commit | bd57898bac03e310b9eea53b23c26d5a743cd94b (patch) | |
| tree | 6f3e742cbbcb1e581478882d89754816e51131a0 | |
| parent | 12cc849695e5bb32645d2e145f4f35656eaebcb4 (diff) | |
| download | linux-crypto-bd57898bac03e310b9eea53b23c26d5a743cd94b.tar.gz linux-crypto-bd57898bac03e310b9eea53b23c26d5a743cd94b.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>
| -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 9c1dc8d6..d19b5232 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) diff --git a/crypto/shash.c b/crypto/shash.c index ecb1e3d3..88a27de7 100644 --- a/crypto/shash.c +++ b/crypto/shash.c @@ -355,8 +355,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) |