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>

diff --git a/crypto/ahash.c b/crypto/ahash.c
index 9c1dc8d6106a89a0f853271c1dfc49cd301ec983..d19b52324cf520ee777743ee895efb2f537f5e62 100644 (file)
--- 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;
        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;
 
        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;
 
        hash->finup = alg->finup ?: ahash_def_finup;
        hash->digest = alg->digest;
 

-       if (alg->setkey)
+       if (alg->setkey) {

                hash->setkey = alg->setkey;
                hash->setkey = alg->setkey;

+               hash->has_setkey = true;
+       }

        if (alg->export)
                hash->export = alg->export;
        if (alg->import)
        if (alg->export)
                hash->export = alg->export;
        if (alg->import)

diff --git a/crypto/shash.c b/crypto/shash.c
index ecb1e3d39bf0776a0d8805a9f8fadd3ec288bcb0..88a27de798480cc01eb0220cdf1f0002ddd897e4 100644 (file)
--- 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;
 
        crt->finup = shash_async_finup;
        crt->digest = shash_async_digest;
 

-       if (alg->setkey)
+       if (alg->setkey) {

                crt->setkey = shash_async_setkey;
                crt->setkey = shash_async_setkey;

+               crt->has_setkey = true;
+       }

        if (alg->export)
                crt->export = shash_async_export;
        if (alg->import)
        if (alg->export)
                crt->export = shash_async_export;
        if (alg->import)

diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index 3d69c93d50e83d7b804f9de7260007ffc9903d69..6361892ea737137899c5d9489634446cb3bdedac 100644 (file)
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -204,6 +204,7 @@ struct crypto_ahash {
                      unsigned int keylen);
 
        unsigned int reqsize;
                      unsigned int keylen);
 
        unsigned int reqsize;

+       bool has_setkey;

        struct crypto_tfm base;
 };
 
        struct crypto_tfm base;
 };
 


@@ -375,6 +376,11 @@ static inline void *ahash_request_ctx(struct ahash_request *req)
 int crypto_ahash_setkey(struct crypto_ahash *tfm, const u8 *key,
                        unsigned int keylen);
 
 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;
+}
+

 /**
  * crypto_ahash_finup() - update and finalize message digest
  * @req: reference to the ahash_request handle that holds all information
 /**
  * crypto_ahash_finup() - update and finalize message digest
  * @req: reference to the ahash_request handle that holds all information