From cc0c35c41d054fd53ba353e0380f1af0f320f9e9 Mon Sep 17 00:00:00 2001 From: Tim Chen Date: Tue, 26 Mar 2013 13:59:25 -0700 Subject: [PATCH] --- yaml --- r: 371111 b: refs/heads/master c: bf70fa9d9ee07aa175453b19a39b2b9dab602d97 h: refs/heads/master i: 371109: 0cabfc8d643352a1e85fc106173abdbd3cc9dbe7 371107: ad6971fbce46fb61b984a1b2ac28ec85143355cf 371103: 997c46fce5abcd5e66b864f1744afbfa5c028b6d v: v3 --- [refs] | 2 +- trunk/crypto/sha512_generic.c | 13 +++++++------ trunk/include/crypto/sha.h | 3 +++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index bcf5683afd35..c9e262138671 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8275d1aa642295edd34a11a117080384bb9d65c2 +refs/heads/master: bf70fa9d9ee07aa175453b19a39b2b9dab602d97 diff --git a/trunk/crypto/sha512_generic.c b/trunk/crypto/sha512_generic.c index 71fcf361102d..4c5862095679 100644 --- a/trunk/crypto/sha512_generic.c +++ b/trunk/crypto/sha512_generic.c @@ -163,8 +163,8 @@ sha384_init(struct shash_desc *desc) return 0; } -static int -sha512_update(struct shash_desc *desc, const u8 *data, unsigned int len) +int crypto_sha512_update(struct shash_desc *desc, const u8 *data, + unsigned int len) { struct sha512_state *sctx = shash_desc_ctx(desc); @@ -197,6 +197,7 @@ sha512_update(struct shash_desc *desc, const u8 *data, unsigned int len) return 0; } +EXPORT_SYMBOL(crypto_sha512_update); static int sha512_final(struct shash_desc *desc, u8 *hash) @@ -215,10 +216,10 @@ sha512_final(struct shash_desc *desc, u8 *hash) /* Pad out to 112 mod 128. */ index = sctx->count[0] & 0x7f; pad_len = (index < 112) ? (112 - index) : ((128+112) - index); - sha512_update(desc, padding, pad_len); + crypto_sha512_update(desc, padding, pad_len); /* Append length (before padding) */ - sha512_update(desc, (const u8 *)bits, sizeof(bits)); + crypto_sha512_update(desc, (const u8 *)bits, sizeof(bits)); /* Store state in digest */ for (i = 0; i < 8; i++) @@ -245,7 +246,7 @@ static int sha384_final(struct shash_desc *desc, u8 *hash) static struct shash_alg sha512_algs[2] = { { .digestsize = SHA512_DIGEST_SIZE, .init = sha512_init, - .update = sha512_update, + .update = crypto_sha512_update, .final = sha512_final, .descsize = sizeof(struct sha512_state), .base = { @@ -257,7 +258,7 @@ static struct shash_alg sha512_algs[2] = { { }, { .digestsize = SHA384_DIGEST_SIZE, .init = sha384_init, - .update = sha512_update, + .update = crypto_sha512_update, .final = sha384_final, .descsize = sizeof(struct sha512_state), .base = { diff --git a/trunk/include/crypto/sha.h b/trunk/include/crypto/sha.h index f46ff61e3780..190f8a0e0242 100644 --- a/trunk/include/crypto/sha.h +++ b/trunk/include/crypto/sha.h @@ -89,4 +89,7 @@ extern int crypto_sha1_update(struct shash_desc *desc, const u8 *data, extern int crypto_sha256_update(struct shash_desc *desc, const u8 *data, unsigned int len); + +extern int crypto_sha512_update(struct shash_desc *desc, const u8 *data, + unsigned int len); #endif