aboutsummaryrefslogtreecommitdiffstats
path: root/include/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-07-09 08:30:57 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2009-07-11 06:23:32 -0400
commit99d27e1c59e34869605de625b033c52163f5bfa7 (patch)
treed7e6477e8a61630fc23088e795730a7fcda60873 /include/crypto
parent7ede5a5ba55a696a6e1d8456526e44635e966a81 (diff)
crypto: shash - Export/import hash state only
This patch replaces the full descriptor export with an export of the partial hash state. This allows the use of a consistent export format across all implementations of a given algorithm. This is useful because a number of cases require the use of the partial hash state, e.g., PadLock can use the SHA1 hash state to get around the fact that it can only hash contiguous data chunks. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/crypto')
-rw-r--r--include/crypto/hash.h18
1 files changed, 14 insertions, 4 deletions
diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index d56bb71617c3..3c4cce6a425c 100644
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -24,7 +24,6 @@ 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);
28 int (*update)(struct shash_desc *desc, const u8 *data, 27 int (*update)(struct shash_desc *desc, const u8 *data,
29 unsigned int len); 28 unsigned int len);
30 int (*final)(struct shash_desc *desc, u8 *out); 29 int (*final)(struct shash_desc *desc, u8 *out);
@@ -32,11 +31,14 @@ struct shash_alg {
32 unsigned int len, u8 *out); 31 unsigned int len, u8 *out);
33 int (*digest)(struct shash_desc *desc, const u8 *data, 32 int (*digest)(struct shash_desc *desc, const u8 *data,
34 unsigned int len, u8 *out); 33 unsigned int len, u8 *out);
34 int (*export)(struct shash_desc *desc, void *out);
35 int (*import)(struct shash_desc *desc, const void *in);
35 int (*setkey)(struct crypto_shash *tfm, const u8 *key, 36 int (*setkey)(struct crypto_shash *tfm, const u8 *key,
36 unsigned int keylen); 37 unsigned int keylen);
37 38
38 unsigned int descsize; 39 unsigned int descsize;
39 unsigned int digestsize; 40 unsigned int digestsize;
41 unsigned int statesize;
40 42
41 struct crypto_alg base; 43 struct crypto_alg base;
42}; 44};
@@ -251,6 +253,11 @@ static inline unsigned int crypto_shash_digestsize(struct crypto_shash *tfm)
251 return crypto_shash_alg(tfm)->digestsize; 253 return crypto_shash_alg(tfm)->digestsize;
252} 254}
253 255
256static inline unsigned int crypto_shash_statesize(struct crypto_shash *tfm)
257{
258 return crypto_shash_alg(tfm)->statesize;
259}
260
254static inline u32 crypto_shash_get_flags(struct crypto_shash *tfm) 261static inline u32 crypto_shash_get_flags(struct crypto_shash *tfm)
255{ 262{
256 return crypto_tfm_get_flags(crypto_shash_tfm(tfm)); 263 return crypto_tfm_get_flags(crypto_shash_tfm(tfm));
@@ -281,12 +288,15 @@ int crypto_shash_setkey(struct crypto_shash *tfm, const u8 *key,
281int crypto_shash_digest(struct shash_desc *desc, const u8 *data, 288int crypto_shash_digest(struct shash_desc *desc, const u8 *data,
282 unsigned int len, u8 *out); 289 unsigned int len, u8 *out);
283 290
284static inline void crypto_shash_export(struct shash_desc *desc, u8 *out) 291static inline int crypto_shash_export(struct shash_desc *desc, void *out)
285{ 292{
286 memcpy(out, shash_desc_ctx(desc), crypto_shash_descsize(desc->tfm)); 293 return crypto_shash_alg(desc->tfm)->export(desc, out);
287} 294}
288 295
289int crypto_shash_import(struct shash_desc *desc, const u8 *in); 296static inline int crypto_shash_import(struct shash_desc *desc, const void *in)
297{
298 return crypto_shash_alg(desc->tfm)->import(desc, in);
299}
290 300
291static inline int crypto_shash_init(struct shash_desc *desc) 301static inline int crypto_shash_init(struct shash_desc *desc)
292{ 302{