Merge remote-tracking branch 'xen-tip/linux-next'

[karo-tx-linux.git] / crypto / sha256_generic.c

diff --git a/crypto/sha256_generic.c b/crypto/sha256_generic.c
index c3ed4ec924e1005dbefac4d93dc3f9eae3f54f5b..5433667795249ca298059a136998b9c2624f2c97 100644 (file)
--- a/crypto/sha256_generic.c
+++ b/crypto/sha256_generic.c
@@ -246,7 +246,7 @@ static int sha256_init(struct shash_desc *desc)
        return 0;
 }
 
-static int sha256_update(struct shash_desc *desc, const u8 *data,
+int crypto_sha256_update(struct shash_desc *desc, const u8 *data,
                          unsigned int len)
 {
        struct sha256_state *sctx = shash_desc_ctx(desc);
@@ -277,6 +277,7 @@ static int sha256_update(struct shash_desc *desc, const u8 *data,
 
        return 0;
 }
+EXPORT_SYMBOL(crypto_sha256_update);
 
 static int sha256_final(struct shash_desc *desc, u8 *out)
 {
@@ -293,10 +294,10 @@ static int sha256_final(struct shash_desc *desc, u8 *out)
        /* Pad out to 56 mod 64. */
        index = sctx->count & 0x3f;
        pad_len = (index < 56) ? (56 - index) : ((64+56) - index);
-       sha256_update(desc, padding, pad_len);
+       crypto_sha256_update(desc, padding, pad_len);
 
        /* Append length (before padding) */
-       sha256_update(desc, (const u8 *)&bits, sizeof(bits));
+       crypto_sha256_update(desc, (const u8 *)&bits, sizeof(bits));
 
        /* Store state in digest */
        for (i = 0; i < 8; i++)
@@ -339,7 +340,7 @@ static int sha256_import(struct shash_desc *desc, const void *in)
 static struct shash_alg sha256_algs[2] = { {
        .digestsize     =       SHA256_DIGEST_SIZE,
        .init           =       sha256_init,
-       .update         =       sha256_update,
+       .update         =       crypto_sha256_update,
        .final          =       sha256_final,
        .export         =       sha256_export,
        .import         =       sha256_import,
@@ -355,7 +356,7 @@ static struct shash_alg sha256_algs[2] = { {
 }, {
        .digestsize     =       SHA224_DIGEST_SIZE,
        .init           =       sha224_init,
-       .update         =       sha256_update,
+       .update         =       crypto_sha256_update,
        .final          =       sha224_final,
        .descsize       =       sizeof(struct sha256_state),
        .base           =       {