From dba47e3dddeb033872adaea44fb2f76a2e8b8275 Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Thu, 4 Aug 2011 20:19:24 +0200
Subject: [PATCH] --- yaml --- r: 272273 b: refs/heads/master c:
 7c390170b49337477985be7a624015160ffeb056 h: refs/heads/master i:   272271:
 16e6da5b43fd462e52da96405662f02345f16359 v: v3

---
 [refs]                      | 2 +-
 trunk/crypto/sha1_generic.c | 9 +++++----
 trunk/include/crypto/sha.h  | 3 +++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4999a0b1f44b..8962ec75358d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b64dc04beba30947dc80745dcb95ae3c04fd18cf
+refs/heads/master: 7c390170b49337477985be7a624015160ffeb056
diff --git a/trunk/crypto/sha1_generic.c b/trunk/crypto/sha1_generic.c
index 00ae60eb9254..42794803c480 100644
--- a/trunk/crypto/sha1_generic.c
+++ b/trunk/crypto/sha1_generic.c
@@ -36,7 +36,7 @@ static int sha1_init(struct shash_desc *desc)
 	return 0;
 }
 
-static int sha1_update(struct shash_desc *desc, const u8 *data,
+int crypto_sha1_update(struct shash_desc *desc, const u8 *data,
 			unsigned int len)
 {
 	struct sha1_state *sctx = shash_desc_ctx(desc);
@@ -71,6 +71,7 @@ static int sha1_update(struct shash_desc *desc, const u8 *data,
 
 	return 0;
 }
+EXPORT_SYMBOL(crypto_sha1_update);
 
 
 /* Add padding and return the message digest. */
@@ -87,10 +88,10 @@ static int sha1_final(struct shash_desc *desc, u8 *out)
 	/* Pad out to 56 mod 64 */
 	index = sctx->count & 0x3f;
 	padlen = (index < 56) ? (56 - index) : ((64+56) - index);
-	sha1_update(desc, padding, padlen);
+	crypto_sha1_update(desc, padding, padlen);
 
 	/* Append length */
-	sha1_update(desc, (const u8 *)&bits, sizeof(bits));
+	crypto_sha1_update(desc, (const u8 *)&bits, sizeof(bits));
 
 	/* Store state in digest */
 	for (i = 0; i < 5; i++)
@@ -121,7 +122,7 @@ static int sha1_import(struct shash_desc *desc, const void *in)
 static struct shash_alg alg = {
 	.digestsize	=	SHA1_DIGEST_SIZE,
 	.init		=	sha1_init,
-	.update		=	sha1_update,
+	.update		=	crypto_sha1_update,
 	.final		=	sha1_final,
 	.export		=	sha1_export,
 	.import		=	sha1_import,
diff --git a/trunk/include/crypto/sha.h b/trunk/include/crypto/sha.h
index 069e85ba97e1..83e6be5e2707 100644
--- a/trunk/include/crypto/sha.h
+++ b/trunk/include/crypto/sha.h
@@ -82,4 +82,7 @@ struct sha512_state {
 	u8 buf[SHA512_BLOCK_SIZE];
 };
 
+extern int crypto_sha1_update(struct shash_desc *desc, const u8 *data,
+			      unsigned int len);
+
 #endif