aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2008-11-02 08:38:11 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2008-12-24 19:01:30 -0500
commitdec8b78606ebd5f309c38f2fb10196ce996dd18d (patch)
tree005ef526f1b0e953a3a57e6c991e0921fcd5234b /include
parent3b2f6df08258e2875f42bd630eece7e7241a053b (diff)
crypto: hash - Add import/export interface
It is often useful to save the partial state of a hash function so that it can be used as a base for two or more computations. The most prominent example is HMAC where all hashes start from a base determined by the key. Having an import/export interface means that we only have to compute that base once rather than for each message. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include')
-rw-r--r--include/crypto/hash.h21
-rw-r--r--include/crypto/internal/hash.h5
-rw-r--r--include/linux/crypto.h1
3 files changed, 22 insertions, 5 deletions
diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index f9b51d408953..cd16d6e668ce 100644
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -24,6 +24,7 @@ struct shash_desc {
24 24
25struct shash_alg { 25struct shash_alg {
26 int (*init)(struct shash_desc *desc); 26 int (*init)(struct shash_desc *desc);
27 int (*reinit)(struct shash_desc *desc);
27 int (*update)(struct shash_desc *desc, const u8 *data, 28 int (*update)(struct shash_desc *desc, const u8 *data,
28 unsigned int len); 29 unsigned int len);
29 int (*final)(struct shash_desc *desc, u8 *out); 30 int (*final)(struct shash_desc *desc, u8 *out);
@@ -116,6 +117,11 @@ static inline unsigned int crypto_ahash_reqsize(struct crypto_ahash *tfm)
116 return crypto_ahash_crt(tfm)->reqsize; 117 return crypto_ahash_crt(tfm)->reqsize;
117} 118}
118 119
120static inline void *ahash_request_ctx(struct ahash_request *req)
121{
122 return req->__ctx;
123}
124
119static inline int crypto_ahash_setkey(struct crypto_ahash *tfm, 125static inline int crypto_ahash_setkey(struct crypto_ahash *tfm,
120 const u8 *key, unsigned int keylen) 126 const u8 *key, unsigned int keylen)
121{ 127{
@@ -130,6 +136,14 @@ static inline int crypto_ahash_digest(struct ahash_request *req)
130 return crt->digest(req); 136 return crt->digest(req);
131} 137}
132 138
139static inline void crypto_ahash_export(struct ahash_request *req, u8 *out)
140{
141 memcpy(out, ahash_request_ctx(req),
142 crypto_ahash_reqsize(crypto_ahash_reqtfm(req)));
143}
144
145int crypto_ahash_import(struct ahash_request *req, const u8 *in);
146
133static inline int crypto_ahash_init(struct ahash_request *req) 147static inline int crypto_ahash_init(struct ahash_request *req)
134{ 148{
135 struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req)); 149 struct ahash_tfm *crt = crypto_ahash_crt(crypto_ahash_reqtfm(req));
@@ -262,6 +276,13 @@ int crypto_shash_setkey(struct crypto_shash *tfm, const u8 *key,
262int crypto_shash_digest(struct shash_desc *desc, const u8 *data, 276int crypto_shash_digest(struct shash_desc *desc, const u8 *data,
263 unsigned int len, u8 *out); 277 unsigned int len, u8 *out);
264 278
279static inline void crypto_shash_export(struct shash_desc *desc, u8 *out)
280{
281 memcpy(out, shash_desc_ctx(desc), crypto_shash_descsize(desc->tfm));
282}
283
284int crypto_shash_import(struct shash_desc *desc, const u8 *in);
285
265static inline int crypto_shash_init(struct shash_desc *desc) 286static inline int crypto_shash_init(struct shash_desc *desc)
266{ 287{
267 return crypto_shash_alg(desc->tfm)->init(desc); 288 return crypto_shash_alg(desc->tfm)->init(desc);
diff --git a/include/crypto/internal/hash.h b/include/crypto/internal/hash.h
index 32d3a8ed06de..92fbe7385856 100644
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
@@ -66,11 +66,6 @@ static inline struct ahash_request *ahash_dequeue_request(
66 return ahash_request_cast(crypto_dequeue_request(queue)); 66 return ahash_request_cast(crypto_dequeue_request(queue));
67} 67}
68 68
69static inline void *ahash_request_ctx(struct ahash_request *req)
70{
71 return req->__ctx;
72}
73
74static inline int ahash_tfm_in_queue(struct crypto_queue *queue, 69static inline int ahash_tfm_in_queue(struct crypto_queue *queue,
75 struct crypto_ahash *tfm) 70 struct crypto_ahash *tfm)
76{ 71{
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 44c72f0f9b05..77a1f3d9416d 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -221,6 +221,7 @@ struct ablkcipher_alg {
221 221
222struct ahash_alg { 222struct ahash_alg {
223 int (*init)(struct ahash_request *req); 223 int (*init)(struct ahash_request *req);
224 int (*reinit)(struct ahash_request *req);
224 int (*update)(struct ahash_request *req); 225 int (*update)(struct ahash_request *req);
225 int (*final)(struct ahash_request *req); 226 int (*final)(struct ahash_request *req);
226 int (*digest)(struct ahash_request *req); 227 int (*digest)(struct ahash_request *req);