1 files changed, 54 insertions, 46 deletions

diff --git a/crypto/sha256_generic.c b/crypto/sha256_generic.c
index 6349d8339d37..c48459ebf05b 100644
--- a/crypto/sha256_generic.c
+++ b/crypto/sha256_generic.c
@@ -25,12 +25,6 @@
 #include <crypto/sha.h>
 #include <asm/byteorder.h>
 
-struct sha256_ctx {
-        u32 count[2];
-        u32 state[8];
-        u8 buf[128];
-};
-
 static inline u32 Ch(u32 x, u32 y, u32 z)
 {
         return z ^ (x & (y ^ z));
@@ -222,7 +216,7 @@ static void sha256_transform(u32 *state, const u8 *input)
 
 static int sha224_init(struct shash_desc *desc)
 {
-        struct sha256_ctx *sctx = shash_desc_ctx(desc);
+        struct sha256_state *sctx = shash_desc_ctx(desc);
         sctx->state[0] = SHA224_H0;
         sctx->state[1] = SHA224_H1;
         sctx->state[2] = SHA224_H2;
@@ -231,15 +225,14 @@ static int sha224_init(struct shash_desc *desc)
         sctx->state[5] = SHA224_H5;
         sctx->state[6] = SHA224_H6;
         sctx->state[7] = SHA224_H7;
-        sctx->count[0] = 0;
-        sctx->count[1] = 0;
+        sctx->count = 0;
 
         return 0;
 }
 
 static int sha256_init(struct shash_desc *desc)
 {
-        struct sha256_ctx *sctx = shash_desc_ctx(desc);
+        struct sha256_state *sctx = shash_desc_ctx(desc);
         sctx->state[0] = SHA256_H0;
         sctx->state[1] = SHA256_H1;
         sctx->state[2] = SHA256_H2;
@@ -248,7 +241,7 @@ static int sha256_init(struct shash_desc *desc)
         sctx->state[5] = SHA256_H5;
         sctx->state[6] = SHA256_H6;
         sctx->state[7] = SHA256_H7;
-        sctx->count[0] = sctx->count[1] = 0;
+        sctx->count = 0;
 
         return 0;
 }
@@ -256,58 +249,54 @@ static int sha256_init(struct shash_desc *desc)
 static int sha256_update(struct shash_desc *desc, const u8 *data,
                           unsigned int len)
 {
-        struct sha256_ctx *sctx = shash_desc_ctx(desc);
-        unsigned int i, index, part_len;
-
-        /* Compute number of bytes mod 128 */
-        index = (unsigned int)((sctx->count[0] >> 3) & 0x3f);
-
-        /* Update number of bits */
-        if ((sctx->count[0] += (len << 3)) < (len << 3)) {
-                sctx->count[1]++;
-                sctx->count[1] += (len >> 29);
-        }
-
-        part_len = 64 - index;
-
-        /* Transform as many times as possible. */
-        if (len >= part_len) {
-                memcpy(&sctx->buf[index], data, part_len);
-                sha256_transform(sctx->state, sctx->buf);
-
-                for (i = part_len; i + 63 < len; i += 64)
-                        sha256_transform(sctx->state, &data[i]);
-                index = 0;
-        } else {
-                i = 0;
+        struct sha256_state *sctx = shash_desc_ctx(desc);
+        unsigned int partial, done;
+        const u8 *src;
+
+        partial = sctx->count & 0x3f;
+        sctx->count += len;
+        done = 0;
+        src = data;
+
+        if ((partial + len) > 63) {
+                if (partial) {
+                        done = -partial;
+                        memcpy(sctx->buf + partial, data, done + 64);
+                        src = sctx->buf;
+                }
+
+                do {
+                        sha256_transform(sctx->state, src);
+                        done += 64;
+                        src = data + done;
+                } while (done + 63 < len);
+
+                partial = 0;
         }
-
-        /* Buffer remaining input */
-        memcpy(&sctx->buf[index], &data[i], len-i);
+        memcpy(sctx->buf + partial, src, len - done);
 
         return 0;
 }
 
 static int sha256_final(struct shash_desc *desc, u8 *out)
 {
-        struct sha256_ctx *sctx = shash_desc_ctx(desc);
+        struct sha256_state *sctx = shash_desc_ctx(desc);
         __be32 *dst = (__be32 *)out;
-        __be32 bits[2];
+        __be64 bits;
         unsigned int index, pad_len;
         int i;
         static const u8 padding[64] = { 0x80, };
 
         /* Save number of bits */
-        bits[1] = cpu_to_be32(sctx->count[0]);
-        bits[0] = cpu_to_be32(sctx->count[1]);
+        bits = cpu_to_be64(sctx->count << 3);
 
         /* Pad out to 56 mod 64. */
-        index = (sctx->count[0] >> 3) & 0x3f;
+        index = sctx->count & 0x3f;
         pad_len = (index < 56) ? (56 - index) : ((64+56) - index);
         sha256_update(desc, padding, pad_len);
 
         /* Append length (before padding) */
-        sha256_update(desc, (const u8 *)bits, sizeof(bits));
+        sha256_update(desc, (const u8 *)&bits, sizeof(bits));
 
         /* Store state in digest */
         for (i = 0; i < 8; i++)
@@ -331,12 +320,31 @@ static int sha224_final(struct shash_desc *desc, u8 *hash)
         return 0;
 }
 
+static int sha256_export(struct shash_desc *desc, void *out)
+{
+        struct sha256_state *sctx = shash_desc_ctx(desc);
+
+        memcpy(out, sctx, sizeof(*sctx));
+        return 0;
+}
+
+static int sha256_import(struct shash_desc *desc, const void *in)
+{
+        struct sha256_state *sctx = shash_desc_ctx(desc);
+
+        memcpy(sctx, in, sizeof(*sctx));
+        return 0;
+}
+
 static struct shash_alg sha256 = {
         .digestsize     =       SHA256_DIGEST_SIZE,
         .init           =       sha256_init,
         .update         =       sha256_update,
         .final          =       sha256_final,
-        .descsize       =       sizeof(struct sha256_ctx),
+        .export         =       sha256_export,
+        .import         =       sha256_import,
+        .descsize       =       sizeof(struct sha256_state),
+        .statesize      =       sizeof(struct sha256_state),
         .base           =       {
                 .cra_name       =       "sha256",
                 .cra_driver_name=       "sha256-generic",
@@ -351,7 +359,7 @@ static struct shash_alg sha224 = {
         .init           =       sha224_init,
         .update         =       sha256_update,
         .final          =       sha224_final,
-        .descsize       =       sizeof(struct sha256_ctx),
+        .descsize       =       sizeof(struct sha256_state),
         .base           =       {
                 .cra_name       =       "sha224",
                 .cra_driver_name=       "sha224-generic",