summaryrefslogtreecommitdiff
path: root/include/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-07-14 08:50:12 +0400
committerHerbert Xu <herbert@gondor.apana.org.au>2009-07-14 08:58:00 +0400
commit113adefc73c291f93f875fe515a46d8f76252fff (patch)
treed8b71f64e7ed074ede921a1b2ba65d606367735e /include/crypto
parentaef73cfcb913eae3d0deeb60eb385f75039db40b (diff)
downloadlinux-113adefc73c291f93f875fe515a46d8f76252fff.tar.xz
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.h3
-rw-r--r--include/crypto/internal/hash.h2
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 */