Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

crypto: hash - Removed vestigial ahash fields

Browse source 
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>
This commit is contained in:
Herbert Xu 2008-07-07 20:54:35 +08:00
parent ca786dc738
commit 166247f46a
4 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crypto/ahash.c
View file

@ -76,7 +76,6 @@ static int crypto_init_ahash_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
crt->final = alg->final; crt->final = alg->final;
crt->digest = alg->digest; crt->digest = alg->digest;
crt->setkey = ahash_setkey; crt->setkey = ahash_setkey;
crt->base = __crypto_ahash_cast(tfm);
crt->digestsize = alg->digestsize; crt->digestsize = alg->digestsize;
return 0; return 0;

1
crypto/digest.c
View file

@ -234,7 +234,6 @@ int crypto_init_digest_ops_async(struct crypto_tfm *tfm)
crt->setkey = dalg->dia_setkey ? digest_async_setkey : crt->setkey = dalg->dia_setkey ? digest_async_setkey :
digest_async_nosetkey; digest_async_nosetkey;
crt->digestsize = dalg->dia_digestsize; crt->digestsize = dalg->dia_digestsize;
crt->base = __crypto_ahash_cast(tfm);
return 0; return 0;
} }

1
crypto/hash.c
View file

@ -128,7 +128,6 @@ static int crypto_init_hash_ops_async(struct crypto_tfm *tfm)
crt->digest = hash_async_digest; crt->digest = hash_async_digest;
crt->setkey = hash_async_setkey; crt->setkey = hash_async_setkey;
crt->digestsize = alg->digestsize; crt->digestsize = alg->digestsize;
crt->base = __crypto_ahash_cast(tfm);
return 0; return 0;
} }

7
include/linux/crypto.h
View file

@ -137,8 +137,6 @@ struct ablkcipher_request {
struct ahash_request { struct ahash_request {
struct crypto_async_request base; struct crypto_async_request base;
void *info;
unsigned int nbytes; unsigned int nbytes;
struct scatterlist *src; struct scatterlist *src;
u8 *result; u8 *result;
@ -420,7 +418,6 @@ struct ahash_tfm {
unsigned int keylen); unsigned int keylen);
unsigned int digestsize; unsigned int digestsize;
struct crypto_ahash *base;
unsigned int reqsize; unsigned int reqsize;
}; };
@ -1384,7 +1381,7 @@ static inline int crypto_ahash_setkey(struct crypto_ahash *tfm,
{ {
struct ahash_tfm *crt = crypto_ahash_crt(tfm); struct ahash_tfm *crt = crypto_ahash_crt(tfm);
return crt->setkey(crt->base, key, keylen); return crt->setkey(tfm, key, keylen);
} }
static inline int crypto_ahash_digest(struct ahash_request *req) static inline int crypto_ahash_digest(struct ahash_request *req)
@ -1396,7 +1393,7 @@ static inline int crypto_ahash_digest(struct ahash_request *req)
static inline void ahash_request_set_tfm(struct ahash_request *req, static inline void ahash_request_set_tfm(struct ahash_request *req,
struct crypto_ahash *tfm) struct crypto_ahash *tfm)
{ {
req->base.tfm = crypto_ahash_tfm(crypto_ahash_crt(tfm)->base); req->base.tfm = crypto_ahash_tfm(tfm);
} }
static inline struct ahash_request *ahash_request_alloc( static inline struct ahash_request *ahash_request_alloc(