diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-07-14 08:29:57 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-07-14 08:29:57 -0400 |
commit | 500b3e3c3dc8e4845b77ae81e5b7b085ab183ce6 (patch) | |
tree | 0cd5ceeab5a085ba017e535b8a232780c0850aaf /include/linux/crypto.h | |
parent | 4dc10c0142ce0af8c20ec44dc6928ae63ad4f73a (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/linux/crypto.h')
-rw-r--r-- | include/linux/crypto.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 9e7e9b62a3dc..fd929889e8dc 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h | |||
@@ -115,12 +115,10 @@ struct crypto_async_request; | |||
115 | struct crypto_aead; | 115 | struct crypto_aead; |
116 | struct crypto_blkcipher; | 116 | struct crypto_blkcipher; |
117 | struct crypto_hash; | 117 | struct crypto_hash; |
118 | struct crypto_ahash; | ||
119 | struct crypto_rng; | 118 | struct crypto_rng; |
120 | struct crypto_tfm; | 119 | struct crypto_tfm; |
121 | struct crypto_type; | 120 | struct crypto_type; |
122 | struct aead_givcrypt_request; | 121 | struct aead_givcrypt_request; |
123 | struct ahash_request; | ||
124 | struct skcipher_givcrypt_request; | 122 | struct skcipher_givcrypt_request; |
125 | 123 | ||
126 | typedef void (*crypto_completion_t)(struct crypto_async_request *req, int err); | 124 | typedef void (*crypto_completion_t)(struct crypto_async_request *req, int err); |
@@ -211,18 +209,6 @@ struct ablkcipher_alg { | |||
211 | unsigned int ivsize; | 209 | unsigned int ivsize; |
212 | }; | 210 | }; |
213 | 211 | ||
214 | struct old_ahash_alg { | ||
215 | int (*init)(struct ahash_request *req); | ||
216 | int (*reinit)(struct ahash_request *req); | ||
217 | int (*update)(struct ahash_request *req); | ||
218 | int (*final)(struct ahash_request *req); | ||
219 | int (*digest)(struct ahash_request *req); | ||
220 | int (*setkey)(struct crypto_ahash *tfm, const u8 *key, | ||
221 | unsigned int keylen); | ||
222 | |||
223 | unsigned int digestsize; | ||
224 | }; | ||
225 | |||
226 | struct aead_alg { | 212 | struct aead_alg { |
227 | int (*setkey)(struct crypto_aead *tfm, const u8 *key, | 213 | int (*setkey)(struct crypto_aead *tfm, const u8 *key, |
228 | unsigned int keylen); | 214 | unsigned int keylen); |
@@ -309,7 +295,6 @@ struct rng_alg { | |||
309 | #define cra_cipher cra_u.cipher | 295 | #define cra_cipher cra_u.cipher |
310 | #define cra_digest cra_u.digest | 296 | #define cra_digest cra_u.digest |
311 | #define cra_hash cra_u.hash | 297 | #define cra_hash cra_u.hash |
312 | #define cra_ahash cra_u.ahash | ||
313 | #define cra_compress cra_u.compress | 298 | #define cra_compress cra_u.compress |
314 | #define cra_rng cra_u.rng | 299 | #define cra_rng cra_u.rng |
315 | 300 | ||
@@ -337,7 +322,6 @@ struct crypto_alg { | |||
337 | struct cipher_alg cipher; | 322 | struct cipher_alg cipher; |
338 | struct digest_alg digest; | 323 | struct digest_alg digest; |
339 | struct hash_alg hash; | 324 | struct hash_alg hash; |
340 | struct old_ahash_alg ahash; | ||
341 | struct compress_alg compress; | 325 | struct compress_alg compress; |
342 | struct rng_alg rng; | 326 | struct rng_alg rng; |
343 | } cra_u; | 327 | } cra_u; |