aboutsummaryrefslogtreecommitdiffstats
path: root/include/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-07-14 08:29:57 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2009-07-14 08:29:57 -0400
commit500b3e3c3dc8e4845b77ae81e5b7b085ab183ce6 (patch)
tree0cd5ceeab5a085ba017e535b8a232780c0850aaf /include/crypto
parent4dc10c0142ce0af8c20ec44dc6928ae63ad4f73a (diff)
crypto: ahash - Remove old_ahash_alg
Now that all ahash implementations have been converted to the new ahash type, we can remove old_ahash_alg and its associated support. 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.h6
2 files changed, 1 insertions, 8 deletions
diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index 262861d8f0cb..45c2bddfdf32 100644
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -89,7 +89,6 @@ struct crypto_ahash {
89 int (*setkey)(struct crypto_ahash *tfm, const u8 *key, 89 int (*setkey)(struct crypto_ahash *tfm, const u8 *key,
90 unsigned int keylen); 90 unsigned int keylen);
91 91
92 unsigned int digestsize;
93 unsigned int reqsize; 92 unsigned int reqsize;
94 struct crypto_tfm base; 93 struct crypto_tfm base;
95}; 94};
@@ -137,7 +136,7 @@ static inline struct hash_alg_common *crypto_hash_alg_common(
137 136
138static inline unsigned int crypto_ahash_digestsize(struct crypto_ahash *tfm) 137static inline unsigned int crypto_ahash_digestsize(struct crypto_ahash *tfm)
139{ 138{
140 return tfm->digestsize; 139 return crypto_hash_alg_common(tfm)->digestsize;
141} 140}
142 141
143static inline unsigned int crypto_ahash_statesize(struct crypto_ahash *tfm) 142static inline unsigned int crypto_ahash_statesize(struct crypto_ahash *tfm)
diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h
index e3a82514d61e..179dd8fdfa14 100644
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
@@ -109,12 +109,6 @@ static inline struct ahash_alg *__crypto_ahash_alg(struct crypto_alg *alg)
109 halg); 109 halg);
110} 110}
111 111
112static inline struct old_ahash_alg *crypto_old_ahash_alg(
113 struct crypto_ahash *tfm)
114{
115 return &crypto_ahash_tfm(tfm)->__crt_alg->cra_ahash;
116}
117
118static inline void crypto_ahash_set_reqsize(struct crypto_ahash *tfm, 112static inline void crypto_ahash_set_reqsize(struct crypto_ahash *tfm,
119 unsigned int reqsize) 113 unsigned int reqsize)
120{ 114{