diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-07-14 12:50:12 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-07-14 12:58:00 +0800 |
| commit | 113adefc73c291f93f875fe515a46d8f76252fff (patch) | |
| tree | d8b71f64e7ed074ede921a1b2ba65d606367735e /include/crypto | |
| parent | aef73cfcb913eae3d0deeb60eb385f75039db40b (diff) | |
| download | kernel-common-113adefc73c291f93f875fe515a46d8f76252fff.tar.gz kernel-common-113adefc73c291f93f875fe515a46d8f76252fff.tar.bz2 kernel-common-113adefc73c291f93f875fe515a46d8f76252fff.zip | |
crypto: shash - Make descsize a run-time attribute
This patch changes descsize to a run-time attribute so that
implementations can change it in their init functions.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/hash.h | 3 | ||||
| -rw-r--r-- | include/crypto/internal/hash.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/crypto/hash.h b/include/crypto/hash.h index f74214a4b01b..fcc02d978231 100644 --- a/include/crypto/hash.h +++ b/include/crypto/hash.h @@ -48,6 +48,7 @@ struct crypto_ahash { }; struct crypto_shash { + unsigned int descsize; struct crypto_tfm base; }; @@ -275,7 +276,7 @@ static inline void crypto_shash_clear_flags(struct crypto_shash *tfm, u32 flags) static inline unsigned int crypto_shash_descsize(struct crypto_shash *tfm) { - return crypto_shash_alg(tfm)->descsize; + return tfm->descsize; } static inline void *shash_desc_ctx(struct shash_desc *desc) diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h index 069b93e1a8ec..2d1b10f23c91 100644 --- a/include/crypto/internal/hash.h +++ b/include/crypto/internal/hash.h @@ -135,7 +135,7 @@ static inline void *crypto_shash_ctx_aligned(struct crypto_shash *tfm) static inline struct crypto_shash *__crypto_shash_cast(struct crypto_tfm *tfm) { - return (struct crypto_shash *)tfm; + return container_of(tfm, struct crypto_shash, base); } #endif /* _CRYPTO_INTERNAL_HASH_H */ |