diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2008-07-07 10:19:53 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2008-07-10 08:35:18 -0400 |
commit | 20036252fc61c624a49770fb89684ea5cfdfa05e (patch) | |
tree | 29db0f146bab13b399d0df9e80041fc35a64fc91 /crypto | |
parent | b8454eebe380677789735fd6bad368af2e6b2d1e (diff) |
crypto: hash - Added scatter list walking helper
This patch adds the walking helpers for hash algorithms akin to
those of block ciphers. This is a necessary step before we can
reimplement existing hash algorithms using the new ahash interface.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/ahash.c | 91 |
1 files changed, 90 insertions, 1 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c index e6e5906ca80a..27128f2c687a 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c | |||
@@ -13,7 +13,8 @@ | |||
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <crypto/algapi.h> | 16 | #include <crypto/internal/hash.h> |
17 | #include <crypto/scatterwalk.h> | ||
17 | #include <linux/err.h> | 18 | #include <linux/err.h> |
18 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
19 | #include <linux/module.h> | 20 | #include <linux/module.h> |
@@ -23,6 +24,94 @@ | |||
23 | 24 | ||
24 | #include "internal.h" | 25 | #include "internal.h" |
25 | 26 | ||
27 | static int hash_walk_next(struct crypto_hash_walk *walk) | ||
28 | { | ||
29 | unsigned int alignmask = walk->alignmask; | ||
30 | unsigned int offset = walk->offset; | ||
31 | unsigned int nbytes = min(walk->entrylen, | ||
32 | ((unsigned int)(PAGE_SIZE)) - offset); | ||
33 | |||
34 | walk->data = crypto_kmap(walk->pg, 0); | ||
35 | walk->data += offset; | ||
36 | |||
37 | if (offset & alignmask) | ||
38 | nbytes = alignmask + 1 - (offset & alignmask); | ||
39 | |||
40 | walk->entrylen -= nbytes; | ||
41 | return nbytes; | ||
42 | } | ||
43 | |||
44 | static int hash_walk_new_entry(struct crypto_hash_walk *walk) | ||
45 | { | ||
46 | struct scatterlist *sg; | ||
47 | |||
48 | sg = walk->sg; | ||
49 | walk->pg = sg_page(sg); | ||
50 | walk->offset = sg->offset; | ||
51 | walk->entrylen = sg->length; | ||
52 | |||
53 | if (walk->entrylen > walk->total) | ||
54 | walk->entrylen = walk->total; | ||
55 | walk->total -= walk->entrylen; | ||
56 | |||
57 | return hash_walk_next(walk); | ||
58 | } | ||
59 | |||
60 | int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err) | ||
61 | { | ||
62 | unsigned int alignmask = walk->alignmask; | ||
63 | unsigned int nbytes = walk->entrylen; | ||
64 | |||
65 | walk->data -= walk->offset; | ||
66 | |||
67 | if (nbytes && walk->offset & alignmask && !err) { | ||
68 | walk->offset += alignmask - 1; | ||
69 | walk->offset = ALIGN(walk->offset, alignmask + 1); | ||
70 | walk->data += walk->offset; | ||
71 | |||
72 | nbytes = min(nbytes, | ||
73 | ((unsigned int)(PAGE_SIZE)) - walk->offset); | ||
74 | walk->entrylen -= nbytes; | ||
75 | |||
76 | return nbytes; | ||
77 | } | ||
78 | |||
79 | crypto_kunmap(walk->data, 0); | ||
80 | crypto_yield(walk->flags); | ||
81 | |||
82 | if (err) | ||
83 | return err; | ||
84 | |||
85 | walk->offset = 0; | ||
86 | |||
87 | if (nbytes) | ||
88 | return hash_walk_next(walk); | ||
89 | |||
90 | if (!walk->total) | ||
91 | return 0; | ||
92 | |||
93 | walk->sg = scatterwalk_sg_next(walk->sg); | ||
94 | |||
95 | return hash_walk_new_entry(walk); | ||
96 | } | ||
97 | EXPORT_SYMBOL_GPL(crypto_hash_walk_done); | ||
98 | |||
99 | int crypto_hash_walk_first(struct ahash_request *req, | ||
100 | struct crypto_hash_walk *walk) | ||
101 | { | ||
102 | walk->total = req->nbytes; | ||
103 | |||
104 | if (!walk->total) | ||
105 | return 0; | ||
106 | |||
107 | walk->alignmask = crypto_ahash_alignmask(crypto_ahash_reqtfm(req)); | ||
108 | walk->sg = req->src; | ||
109 | walk->flags = req->base.flags; | ||
110 | |||
111 | return hash_walk_new_entry(walk); | ||
112 | } | ||
113 | EXPORT_SYMBOL_GPL(crypto_hash_walk_first); | ||
114 | |||
26 | static int ahash_setkey_unaligned(struct crypto_ahash *tfm, const u8 *key, | 115 | static int ahash_setkey_unaligned(struct crypto_ahash *tfm, const u8 *key, |
27 | unsigned int keylen) | 116 | unsigned int keylen) |
28 | { | 117 | { |