diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-08 21:28:26 +0800 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-02-09 22:57:32 -0500 |
| commit | 8c7817966b10cdb048036e456316ac3aba9f0279 (patch) | |
| tree | 6719dabbacb0afb7614060f19bef27dafcebd4df | |
| parent | cfc8c439b792a65379a8f8122d36748b097de6f0 (diff) | |
crypto: hash - Add crypto_ahash_has_setkey
[ Upstream commit a5596d6332787fd383b3b5427b41f94254430827 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | crypto/ahash.c | 5 | ||||
| -rw-r--r-- | crypto/shash.c | 4 | ||||
| -rw-r--r-- | include/crypto/hash.h | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c index c1d8591913e9..51d48cd34884 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -450,6 +450,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; @@ -462,8 +463,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 47c713954bf3..aa3e505045e0 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) diff --git a/include/crypto/hash.h b/include/crypto/hash.h index 74b13ec1ebd4..6857e565a14d 100644 --- a/include/crypto/hash.h +++ b/include/crypto/hash.h @@ -99,6 +99,7 @@ struct crypto_ahash { unsigned int keylen); unsigned int reqsize; + bool has_setkey; struct crypto_tfm base; }; @@ -186,6 +187,12 @@ static inline void *ahash_request_ctx(struct ahash_request *req) int crypto_ahash_setkey(struct crypto_ahash *tfm, const u8 *key, unsigned int keylen); + +static inline bool crypto_ahash_has_setkey(struct crypto_ahash *tfm) +{ + return tfm->has_setkey; +} + int crypto_ahash_finup(struct ahash_request *req); int crypto_ahash_final(struct ahash_request *req); int crypto_ahash_digest(struct ahash_request *req); |