aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/crypto.h
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2008-07-07 08:54:35 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2008-07-10 08:35:18 -0400
commit166247f46a9c866e6f7f7d2212be875fb82212a1 (patch)
tree54818c04ba4224b1a3d717f0dbf62456bb32deaa /include/linux/crypto.h
parentca786dc738f4f583b57b1bba7a335b5e8233f4b0 (diff)
crypto: hash - Removed vestigial ahash fields
The base field in ahash_tfm appears to have been cut-n-pasted from ablkcipher. It isn't needed here at all. Similarly, the info field in ahash_request also appears to have originated from its cipher counter-part and is vestigial. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/linux/crypto.h')
-rw-r--r--include/linux/crypto.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index b6efe569128d..68ef293644d3 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -137,8 +137,6 @@ struct ablkcipher_request {
137struct ahash_request { 137struct ahash_request {
138 struct crypto_async_request base; 138 struct crypto_async_request base;
139 139
140 void *info;
141
142 unsigned int nbytes; 140 unsigned int nbytes;
143 struct scatterlist *src; 141 struct scatterlist *src;
144 u8 *result; 142 u8 *result;
@@ -420,7 +418,6 @@ struct ahash_tfm {
420 unsigned int keylen); 418 unsigned int keylen);
421 419
422 unsigned int digestsize; 420 unsigned int digestsize;
423 struct crypto_ahash *base;
424 unsigned int reqsize; 421 unsigned int reqsize;
425}; 422};
426 423
@@ -1384,7 +1381,7 @@ static inline int crypto_ahash_setkey(struct crypto_ahash *tfm,
1384{ 1381{
1385 struct ahash_tfm *crt = crypto_ahash_crt(tfm); 1382 struct ahash_tfm *crt = crypto_ahash_crt(tfm);
1386 1383
1387 return crt->setkey(crt->base, key, keylen); 1384 return crt->setkey(tfm, key, keylen);
1388} 1385}
1389 1386
1390static inline int crypto_ahash_digest(struct ahash_request *req) 1387static inline int crypto_ahash_digest(struct ahash_request *req)
@@ -1396,7 +1393,7 @@ static inline int crypto_ahash_digest(struct ahash_request *req)
1396static inline void ahash_request_set_tfm(struct ahash_request *req, 1393static inline void ahash_request_set_tfm(struct ahash_request *req,
1397 struct crypto_ahash *tfm) 1394 struct crypto_ahash *tfm)
1398{ 1395{
1399 req->base.tfm = crypto_ahash_tfm(crypto_ahash_crt(tfm)->base); 1396 req->base.tfm = crypto_ahash_tfm(tfm);
1400} 1397}
1401 1398
1402static inline struct ahash_request *ahash_request_alloc( 1399static inline struct ahash_request *ahash_request_alloc(