diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-07-15 00:40:40 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-07-15 00:40:40 -0400 |
commit | 66f6ce5e52f2f209d5bf1f06167cec888f4f4c13 (patch) | |
tree | aa7b21af00649d2f458b72ebfba071816cb340c3 /include/crypto/hash.h | |
parent | 093900c2b964da73daf234374225b5ce5d49f941 (diff) |
crypto: ahash - Add unaligned handling and default operations
This patch exports the finup operation where available and adds
a default finup operation for ahash. The operations final, finup
and digest also will now deal with unaligned result pointers by
copying it. Finally export/import operations are will now be
exported too.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/crypto/hash.h')
-rw-r--r-- | include/crypto/hash.h | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/include/crypto/hash.h b/include/crypto/hash.h index 45c2bddfdf32..3e89ce16b59c 100644 --- a/include/crypto/hash.h +++ b/include/crypto/hash.h | |||
@@ -31,6 +31,9 @@ struct ahash_request { | |||
31 | struct scatterlist *src; | 31 | struct scatterlist *src; |
32 | u8 *result; | 32 | u8 *result; |
33 | 33 | ||
34 | /* This field may only be used by the ahash API code. */ | ||
35 | void *priv; | ||
36 | |||
34 | void *__ctx[] CRYPTO_MINALIGN_ATTR; | 37 | void *__ctx[] CRYPTO_MINALIGN_ATTR; |
35 | }; | 38 | }; |
36 | 39 | ||
@@ -175,16 +178,11 @@ static inline void *ahash_request_ctx(struct ahash_request *req) | |||
175 | return req->__ctx; | 178 | return req->__ctx; |
176 | } | 179 | } |
177 | 180 | ||
178 | static inline int crypto_ahash_setkey(struct crypto_ahash *tfm, | 181 | int crypto_ahash_setkey(struct crypto_ahash *tfm, const u8 *key, |
179 | const u8 *key, unsigned int keylen) | 182 | unsigned int keylen); |
180 | { | 183 | int crypto_ahash_finup(struct ahash_request *req); |
181 | return tfm->setkey(tfm, key, keylen); | 184 | int crypto_ahash_final(struct ahash_request *req); |
182 | } | 185 | int crypto_ahash_digest(struct ahash_request *req); |
183 | |||
184 | static inline int crypto_ahash_digest(struct ahash_request *req) | ||
185 | { | ||
186 | return crypto_ahash_reqtfm(req)->digest(req); | ||
187 | } | ||
188 | 186 | ||
189 | static inline int crypto_ahash_export(struct ahash_request *req, void *out) | 187 | static inline int crypto_ahash_export(struct ahash_request *req, void *out) |
190 | { | 188 | { |
@@ -206,11 +204,6 @@ static inline int crypto_ahash_update(struct ahash_request *req) | |||
206 | return crypto_ahash_reqtfm(req)->update(req); | 204 | return crypto_ahash_reqtfm(req)->update(req); |
207 | } | 205 | } |
208 | 206 | ||
209 | static inline int crypto_ahash_final(struct ahash_request *req) | ||
210 | { | ||
211 | return crypto_ahash_reqtfm(req)->final(req); | ||
212 | } | ||
213 | |||
214 | static inline void ahash_request_set_tfm(struct ahash_request *req, | 207 | static inline void ahash_request_set_tfm(struct ahash_request *req, |
215 | struct crypto_ahash *tfm) | 208 | struct crypto_ahash *tfm) |
216 | { | 209 | { |