crypto: hash - Add statesize to crypto_ahash

As ahash drivers may need to use fallbacks, their state size
is thus variable.  Deal with this by making it an attribute
of crypto_ahash.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/ahash.c b/crypto/ahash.c
index 3246510..9986738 100644 (file)
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -432,6 +432,8 @@ static int crypto_ahash_init_tfm(struct crypto_tfm *tfm)
 
        hash->setkey = ahash_nosetkey;
 
+       crypto_ahash_set_statesize(hash, alg->halg.statesize);
+
        if (tfm->__crt_alg->cra_type != &crypto_ahash_type)
                return crypto_init_shash_ops_async(tfm);
 
@@ -573,6 +575,7 @@ struct crypto_ahash *crypto_clone_ahash(struct crypto_ahash *hash)
        nhash->import = hash->import;
        nhash->setkey = hash->setkey;
        nhash->reqsize = hash->reqsize;
+       nhash->statesize = hash->statesize;
 
        if (tfm->__crt_alg->cra_type != &crypto_ahash_type)
                return crypto_clone_shash_ops_async(nhash, hash);

diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index e69542d..f7c2a22 100644 (file)
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -260,6 +260,7 @@ struct crypto_ahash {
        int (*setkey)(struct crypto_ahash *tfm, const u8 *key,
                      unsigned int keylen);
 
+       unsigned int statesize;
        unsigned int reqsize;
        struct crypto_tfm base;
 };
@@ -400,7 +401,7 @@ static inline unsigned int crypto_ahash_digestsize(struct crypto_ahash *tfm)
  */
 static inline unsigned int crypto_ahash_statesize(struct crypto_ahash *tfm)
 {
-       return crypto_hash_alg_common(tfm)->statesize;
+       return tfm->statesize;
 }
 
 static inline u32 crypto_ahash_get_flags(struct crypto_ahash *tfm)

diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h
index 37edf3f..b925f82 100644 (file)
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
@@ -149,6 +149,12 @@ static inline struct ahash_alg *__crypto_ahash_alg(struct crypto_alg *alg)
                            halg);
 }
 
+static inline void crypto_ahash_set_statesize(struct crypto_ahash *tfm,
+                                             unsigned int size)
+{
+       tfm->statesize = size;
+}
+
 static inline void crypto_ahash_set_reqsize(struct crypto_ahash *tfm,
                                            unsigned int reqsize)
 {