sha256 & sha224

13 files changed, 249 insertions, 141 deletions

diff --git a/docs/crypto.md b/docs/crypto.md
index 10401ab..673ec9c 100644
--- a/docs/crypto.md
+++ b/docs/crypto.md
@@ -15,8 +15,8 @@ insane amount anyways). i likely will go back and rewrite all of these to fix bo
 | bsdchecksum | 16 | nil | | y |
 | sha0 | 160 | nil | insecure, use sha1| y |
 | sha1 | 160 | nil | | y |
-| sha256 | 256 | nil | | todo |
-| sha224 | 224 | nil | | todo |
+| sha256 | 256 | nil | | y |
+| sha224 | 224 | nil | | y |
 | pearson | 8 | nil | use setpearson(table) to change the table, initial is 0..255| y |
 | xxh64 | 64 | nil | xxhash | todo|
 | xxh32 | 32 | nil | | todo |
diff --git a/src/crypto.h b/src/crypto.h
index 03a9728..54020a2 100644
--- a/src/crypto.h
+++ b/src/crypto.h
@@ -108,7 +108,6 @@ int l_##luaname##_update(lua_State* L){\
 }
 
 static const luaL_Reg crypto_function_list [] = {
-      {"sha256",l_sha256}, {"sha224",l_sha224},
       {"setpearson",l_setpearson}, {"xxh64",l_xxh64},
       {"xxh32",l_xxh32},  {"fletcher8",l_fletcher8},
       {"fletcher16",l_fletcher16}, {"fletcher32",l_fletcher32},
@@ -153,6 +152,8 @@ static const luaL_Reg crypto_function_list [] = {
       {"sha512", l_sha512}, {"sha512_init", l_sha512_init}, {"sha512_update", l_sha512_update}, {"sha512_final", l_sha512_final},
       {"sha384", l_sha384}, {"sha384_init", l_sha384_init}, {"sha384_update", l_sha384_update}, {"sha384_final", l_sha384_final},
       {"sha512_t", l_sha512_t}, {"sha512_t_init", l_sha512_t_init}, {"sha512_t_update", l_sha512_t_update}, {"sha512_t_final", l_sha512_t_final},
+      {"sha256",l_sha256}, {"sha256_init",l_sha256_init}, {"sha256_update",l_sha256_update}, {"sha256_final",l_sha256_final},
+      {"sha224",l_sha224}, {"sha224_init",l_sha224_init}, {"sha224_update",l_sha224_update}, {"sha224_final",l_sha224_final},
 
       {"uuencode",l_uuencode},
       {"uudecode",l_uudecode},
diff --git a/src/hash/blake.c b/src/hash/blake.c
index 6fcdae9..e027b10 100644
--- a/src/hash/blake.c
+++ b/src/hash/blake.c
@@ -210,7 +210,7 @@ void blake512(char *out, char *in, uint64_t inlen, enum blake512_v v){
     }
 
     for(int i = 0; i != (v==b512?8:6); i++){
-        sprintf(out, "%s%016lx",out, (hash)[i]);
+        sprintf(out, "%s%016llx",out, (hash)[i]);
     }
 }
 
diff --git a/src/hash/cityhash.c b/src/hash/cityhash.c
index 46bb1ed..f32453d 100644
--- a/src/hash/cityhash.c
+++ b/src/hash/cityhash.c
@@ -411,7 +411,7 @@ int l_cityhash64(lua_State* L){
   char digest[64];
 
   uint64_t u = cityhash64(a, len);
-  sprintf(digest,"%016lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
@@ -424,7 +424,7 @@ int l_cityhash128(lua_State* L){
 
   uint64_t u1, u2;
   cityhash128(a, len, &u1, &u2);
-  sprintf(digest,"%08lx%08lx",u1, u2);
+  sprintf(digest,"%08llx%08llx",u1, u2);
   lua_pushstring(L, digest);
   return 1;
 }
diff --git a/src/hash/farmhash.c b/src/hash/farmhash.c
index e57aa4f..95047ee 100644
--- a/src/hash/farmhash.c
+++ b/src/hash/farmhash.c
@@ -163,7 +163,7 @@ int l_farmhash64(lua_State* L){
   char digest[64];
 
   uint64_t u = farmhash64(a, len);
-  sprintf(digest,"%016lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
diff --git a/src/hash/fasthash.c b/src/hash/fasthash.c
index bef892b..993a22a 100644
--- a/src/hash/fasthash.c
+++ b/src/hash/fasthash.c
@@ -62,7 +62,7 @@ int l_fasthash64(lua_State* L){
   char digest[64];
 
   uint64_t u = fasthash64(a, len, seed);
-  sprintf(digest,"%016lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
diff --git a/src/hash/fnv.c b/src/hash/fnv.c
index c8e62c6..2991ca8 100644
--- a/src/hash/fnv.c
+++ b/src/hash/fnv.c
@@ -52,7 +52,7 @@ int l_fnv_##v##_final(lua_State* L){\
   struct fnv_1_hash* a = (struct fnv_1_hash*)lua_touserdata(L, 1);\
   uint64_t u = fnv_1_final(a);\
   char digest[64];\
-  sprintf(digest,"%16lx",u);\
+  sprintf(digest,"%16llx",u);\
   lua_pushstring(L, digest);\
   return 1;\
 }
@@ -69,7 +69,7 @@ int l_fnv_0(lua_State* L){
   char digest[64];
 
   uint64_t u = fnv_1(a, len, v_0);
-  sprintf(digest,"%16lx",u);
+  sprintf(digest,"%16llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
@@ -82,7 +82,7 @@ int l_fnv_1(lua_State* L){
   char digest[64];
 
   uint64_t u = fnv_1(a, len, v_1);
-  sprintf(digest,"%16lx",u);
+  sprintf(digest,"%16llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
@@ -95,7 +95,7 @@ int l_fnv_a(lua_State* L){
   char digest[64];
 
   uint64_t u = fnv_1(a, len, v_a);
-  sprintf(digest,"%16lx",u);
+  sprintf(digest,"%16llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
diff --git a/src/hash/metrohash.c b/src/hash/metrohash.c
index e015ff0..f473b95 100644
--- a/src/hash/metrohash.c
+++ b/src/hash/metrohash.c
@@ -169,7 +169,7 @@ int l_metrohash64_v1(lua_State* L){
   char digest[64];
 
   uint64_t u = metrohash64(a, len, seed, v1);
-  sprintf(digest,"%016lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
@@ -184,7 +184,7 @@ int l_metrohash64_v2(lua_State* L){
   char digest[64];
 
   uint64_t u = metrohash64(a, len, seed, v2);
-  sprintf(digest,"%016lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
@@ -200,7 +200,7 @@ int l_metrohash128_v1(lua_State* L){
 
   uint64_t u1, u2;
   metrohash128(a, len, seed, &u1, &u2, v1);
-  sprintf(digest,"%016lx%016lx",u1,u2);
+  sprintf(digest,"%016llx%016llx",u1,u2);
   lua_pushstring(L, digest);
   return 1;
 }
@@ -216,7 +216,7 @@ int l_metrohash128_v2(lua_State* L){
 
   uint64_t u1, u2;
   metrohash128(a, len, seed, &u1, &u2, v2);
-  sprintf(digest,"%016lx%016lx",u1,u2);
+  sprintf(digest,"%016llx%016llx",u1,u2);
   lua_pushstring(L, digest);
   return 1;
 }
diff --git a/src/hash/sdbm.c b/src/hash/sdbm.c
index f3457ff..9f9d08f 100644
--- a/src/hash/sdbm.c
+++ b/src/hash/sdbm.c
@@ -30,7 +30,7 @@ int l_sdbm_final(lua_State* L){
   struct sdbm_hash* a = (struct sdbm_hash*)lua_touserdata(L, 1);
   uint64_t u = sdbm_final(a);
   char digest[64];
-  sprintf(digest,"%016lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
@@ -43,7 +43,7 @@ int l_sdbm(lua_State* L){
   char digest[64];
 
   uint64_t u = sdbm(a, len);
-  sprintf(digest,"%016lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
   return 1;
 }
diff --git a/src/hash/sha2-256.c b/src/hash/sha2-256.c
index 5327209..69029bf 100644
--- a/src/hash/sha2-256.c
+++ b/src/hash/sha2-256.c
@@ -175,14 +175,14 @@ void sha512_final(struct sha512_hash* hash, char* out_stream){
 
   _sha512_t_final(hash);
 
-  sprintf((char*)out_stream, "%s%016lx", out_stream, hash->h0);
-  sprintf((char*)out_stream, "%s%016lx", out_stream, hash->h1);
-  sprintf((char*)out_stream, "%s%016lx", out_stream, hash->h2);
-  sprintf((char*)out_stream, "%s%016lx", out_stream, hash->h3);
-  sprintf((char*)out_stream, "%s%016lx", out_stream, hash->h4);
-  sprintf((char*)out_stream, "%s%016lx", out_stream, hash->h5);
-  sprintf((char*)out_stream, "%s%016lx", out_stream, hash->h6);
-  sprintf((char*)out_stream, "%s%016lx", out_stream, hash->h7);
+  sprintf((char*)out_stream, "%s%016llx", out_stream, hash->h0);
+  sprintf((char*)out_stream, "%s%016llx", out_stream, hash->h1);
+  sprintf((char*)out_stream, "%s%016llx", out_stream, hash->h2);
+  sprintf((char*)out_stream, "%s%016llx", out_stream, hash->h3);
+  sprintf((char*)out_stream, "%s%016llx", out_stream, hash->h4);
+  sprintf((char*)out_stream, "%s%016llx", out_stream, hash->h5);
+  sprintf((char*)out_stream, "%s%016llx", out_stream, hash->h6);
+  sprintf((char*)out_stream, "%s%016llx", out_stream, hash->h7);
 
   memcpy(hash, &old_hash, sizeof * hash);
   memcpy(hash->buffer, old, bs);
@@ -196,12 +196,12 @@ void sha384_final(struct sha512_hash* hash, char* out_stream){
   _sha512_t_final(hash);
 
 
-  sprintf((char*)out_stream, "%s%016lx", out_stream, hash->h0);
-  sprintf((char*)out_stream, "%s%016lx", out_stream, hash->h1);
-  sprintf((char*)out_stream, "%s%016lx", out_stream, hash->h2);
-  sprintf((char*)out_stream, "%s%016lx", out_stream, hash->h3);
-  sprintf((char*)out_stream, "%s%016lx", out_stream, hash->h4);
-  sprintf((char*)out_stream, "%s%016lx", out_stream, hash->h5);
+  sprintf((char*)out_stream, "%s%016llx", out_stream, hash->h0);
+  sprintf((char*)out_stream, "%s%016llx", out_stream, hash->h1);
+  sprintf((char*)out_stream, "%s%016llx", out_stream, hash->h2);
+  sprintf((char*)out_stream, "%s%016llx", out_stream, hash->h3);
+  sprintf((char*)out_stream, "%s%016llx", out_stream, hash->h4);
+  sprintf((char*)out_stream, "%s%016llx", out_stream, hash->h5);
 
   memcpy(hash, &old_hash, sizeof * hash);
   memcpy(hash->buffer, old, bs);
diff --git a/src/hash/sha2xx.c b/src/hash/sha2xx.c
index eafcc09..f3fbc5d 100644
--- a/src/hash/sha2xx.c
+++ b/src/hash/sha2xx.c
@@ -3,29 +3,50 @@
 #include <string.h>
 #include <stdint.h>
 
-void i_sha2xx(enum version v, char* out_stream, char* input){
-    uint32_t h0, h1, h2, h3, h4, h5, h6, h7;
-    
-    if(v == sha256){
-        h0 = 0x6a09e667;
-        h1 = 0xbb67ae85;
-        h2 = 0x3c6ef372;
-        h3 = 0xa54ff53a;
-        h4 = 0x510e527f;
-        h5 = 0x9b05688c;
-        h6 = 0x1f83d9ab;
-        h7 = 0x5be0cd19;
-    } else if (v == sha224){
-        h0 = 0xc1059ed8;
-        h1 = 0x367cd507;
-        h2 = 0x3070dd17;
-        h3 = 0xf70e5939;
-        h4 = 0xffc00b31;
-        h5 = 0x68581511;
-        h6 = 0x64f98fa7;
-        h7 = 0xbefa4fa4;
-    }
-    
+#define bs 64
+
+struct sha256_hash sha256_init(){
+    struct sha256_hash a = {.h0 = 0x6a09e667, .h1 = 0xbb67ae85, .h2 = 0x3c6ef372, .h3 = 0xa54ff53a, .h4 = 0x510e527f, .h5 = 0x9b05688c, .h6 = 0x1f83d9ab, .h7 = 0x5be0cd19,
+        .total = 0, .bufflen = 0};
+    a.buffer = calloc(sizeof * a.buffer, bs);
+    return a;
+}
+
+struct sha256_hash sha256_init_l(lua_State* L){
+    struct sha256_hash a = {.h0 = 0x6a09e667, .h1 = 0xbb67ae85, .h2 = 0x3c6ef372, .h3 = 0xa54ff53a, .h4 = 0x510e527f, .h5 = 0x9b05688c, .h6 = 0x1f83d9ab, .h7 = 0x5be0cd19,
+        .total = 0, .bufflen = 0};
+    a.buffer = lua_newuserdata(L, sizeof * a.buffer * bs);
+    memset(a.buffer, 0, bs);
+    return a;
+}
+
+struct sha256_hash sha224_init(){
+    struct sha256_hash a = sha256_init();
+    a.h0 = 0xc1059ed8;
+    a.h1 = 0x367cd507;
+    a.h2 = 0x3070dd17;
+    a.h3 = 0xf70e5939;
+    a.h4 = 0xffc00b31;
+    a.h5 = 0x68581511;
+    a.h6 = 0x64f98fa7;
+    a.h7 = 0xbefa4fa4;
+    return a;
+}
+
+struct sha256_hash sha224_init_l(lua_State* L){
+    struct sha256_hash a = sha256_init_l(L);
+    a.h0 = 0xc1059ed8;
+    a.h1 = 0x367cd507;
+    a.h2 = 0x3070dd17;
+    a.h3 = 0xf70e5939;
+    a.h4 = 0xffc00b31;
+    a.h5 = 0x68581511;
+    a.h6 = 0x64f98fa7;
+    a.h7 = 0xbefa4fa4;
+    return a;
+}
+
+void sha256_round(struct sha256_hash* hash){
     const uint32_t k[64] = {0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
         0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
         0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
@@ -34,102 +55,188 @@ void i_sha2xx(enum version v, char* out_stream, char* input){
         0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
         0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
         0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2};
-       
-    int len = 0;
-    for(int i = 0; input[i]!='\0'; i++) len++;
-    int tlen = ((((len + 8) /64) + 1) * 64) - 8;
-    
-    uint8_t* by = NULL;
-    by = calloc(tlen * 80 +  64, 1);
-    
-    memcpy(by, input, len);
-    by[len] = 0x80;
-    
-    size_t blen = 8*len;
-    for(int i = 0; i != 8; i++)
-        by[tlen + 7 - i] = (uint8_t) (blen >> (i * 8) & 0xFF);
-    
-    uint32_t hat = 0;
-    for(int z = 0; z < tlen; z+=(1024/8)){
-        uint32_t W[64];
-        memset(W, 0, 64 * sizeof (uint32_t));
+    uint32_t W[64];
+    memset(W, 0, 64 * sizeof (uint32_t));
 
-        for (int i = 0; i < 16; i++)
-		    W[i] = (by[i * 4] << 24) | (by[i * 4 + 1] << 16) | (by[i * 4 + 2] << 8) | (by[i * 4 + 3]);
+    for (int i = 0; i < 16; i++)
+	    W[i] = (hash->buffer[i * 4] << 24) | (hash->buffer[i * 4 + 1] << 16) | (hash->buffer[i * 4 + 2] << 8) | (hash->buffer[i * 4 + 3]);
 		
-        for(int i = 16; i != 64; i++){
-            uint32_t s0 = rotr32(W[i - 15], 7) ^ rotr32(W[i - 15], 18) ^ (W[i - 15] >> 3);
-            uint32_t s1 = rotr32(W[i - 2], 17) ^ rotr32(W[i - 2], 19) ^ (W[i - 2] >> 10);
-            W[i] = W[i - 16] + s0 + W[i - 7] + s1;
-        }
+    for(int i = 16; i != 64; i++){
+        uint32_t s0 = rotr32(W[i - 15], 7) ^ rotr32(W[i - 15], 18) ^ (W[i - 15] >> 3);
+        uint32_t s1 = rotr32(W[i - 2], 17) ^ rotr32(W[i - 2], 19) ^ (W[i - 2] >> 10);
+        W[i] = W[i - 16] + s0 + W[i - 7] + s1;
+    }
         
-        uint32_t a = h0;
-        uint32_t b = h1;
-        uint32_t c = h2;
-        uint32_t d = h3;
-        uint32_t e = h4;
-        uint32_t f = h5;
-        uint32_t g = h6;
-        uint32_t h = h7;
+    uint32_t a = hash->h0;
+    uint32_t b = hash->h1;
+    uint32_t c = hash->h2;
+    uint32_t d = hash->h3;
+    uint32_t e = hash->h4;
+    uint32_t f = hash->h5;
+    uint32_t g = hash->h6;
+    uint32_t h = hash->h7;
         
-        for(int i = 0; i != 64; i++){
-            uint32_t S1 = rotr32(e, 6) ^ rotr32(e, 11) ^ rotr32(e, 25);
-            uint32_t ch = (e & f) ^ ((~e) & g);
-            uint32_t temp1 = h + S1 + ch + k[i] + W[i];
+    for(int i = 0; i != 64; i++){
+        uint32_t S1 = rotr32(e, 6) ^ rotr32(e, 11) ^ rotr32(e, 25);
+        uint32_t ch = (e & f) ^ ((~e) & g);
+        uint32_t temp1 = h + S1 + ch + k[i] + W[i];
             
-            uint32_t S0 = rotr32(a, 2) ^ rotr32(a, 13) ^ rotr32(a, 22);
-            uint32_t maj = (a & b) ^ (a & c) ^ (b & c);
-            uint32_t temp2 = S0 + maj;
+        uint32_t S0 = rotr32(a, 2) ^ rotr32(a, 13) ^ rotr32(a, 22);
+        uint32_t maj = (a & b) ^ (a & c) ^ (b & c);
+        uint32_t temp2 = S0 + maj;
             
-            h = g;
-            g = f;
-            f = e;
-            e = d + temp1;
-            d = c;
-            c = b;
-            b = a;
-            a = temp1 + temp2;
-        }
-        
-        h0 += a;
-        h1 += b;
-        h2 += c;
-        h3 += d;
-        h4 += e;
-        h5 += f;
-        h6 += g;
-        h7 += h;
-        
+        h = g;
+        g = f;
+        f = e;
+        e = d + temp1;
+        d = c;
+        c = b;
+        b = a;
+        a = temp1 + temp2;
     }
-    
-    if(v == sha256)
-        sprintf(out_stream,"%x%x%x%x%x%x%x%x",h0,h1,h2,h3,h4,h5,h6,h7);
-    else if(v == sha224)
-        sprintf(out_stream,"%x%x%x%x%x%x%x",h0,h1,h2,h3,h4,h5,h6);
+        
+    hash->h0 += a;
+    hash->h1 += b;
+    hash->h2 += c;
+    hash->h3 += d;
+    hash->h4 += e;
+    hash->h5 += f;
+    hash->h6 += g;
+    hash->h7 += h;
+}
+
+#define sha224_update sha256_update
+void sha256_update(uint8_t* input, size_t len, struct sha256_hash* hash){
+  hash->total += len;
+  size_t total_add = len + hash->bufflen;
+  size_t read = 0;
+  if(total_add < bs){
+    memcpy(hash->buffer + hash->bufflen, input, len);
+    hash->bufflen += len;
     return;
+  }
+
+  for(; total_add >= bs;){
+    memcpy(hash->buffer + hash->bufflen, input + read, bs - hash->bufflen);
+    total_add -= bs;
+    hash->bufflen = 0;
+    read += bs;
+    sha256_round(hash);
+  }
+
+  memset(hash->buffer, 0, bs);
+
+  if(0 != total_add){
+    memcpy(hash->buffer, input + read, total_add);
+    hash->bufflen = total_add;
+  }
+}
+
+void _sha256_final(struct sha256_hash* hash){
+  hash->buffer[hash->bufflen] = 0x80;
+
+  if(hash->bufflen > bs - 8) {
+    //too large, needs another buffer
+    memset(hash->buffer + hash->bufflen + 1, 0, bs - hash->bufflen);
+    sha256_round(hash);
+    memset(hash->buffer, 0, bs);
+  }
+    
+  size_t blen = 8*hash->total;
+  for(int i = 0; i != 8; i++)
+    hash->buffer[63 - i] = (uint8_t) (blen >> (i * 8) & 0xFF);
+
+  sha256_round(hash);
+}
+
+void sha256_final(struct sha256_hash* hash, char* out){
+    uint8_t old[bs];
+    struct sha256_hash old_hash;
+    memcpy(&old_hash, hash, sizeof * hash);
+    memcpy(old, hash->buffer, bs);
+
+    _sha256_final(hash);
+    sprintf(out, "%x%x%x%x%x%x%x%x",hash->h0,hash->h1,hash->h2,hash->h3,hash->h4,hash->h5,hash->h6,hash->h7);
+
+    memcpy(hash, &old_hash, sizeof * hash);
+    memcpy(hash->buffer, old, bs);
+}
+
+void sha224_final(struct sha256_hash* hash, char* out){
+    uint8_t old[bs];
+    struct sha256_hash old_hash;
+    memcpy(&old_hash, hash, sizeof * hash);
+    memcpy(old, hash->buffer, bs);
+
+    _sha256_final(hash);
+    sprintf(out, "%x%x%x%x%x%x%x",hash->h0,hash->h1,hash->h2,hash->h3,hash->h4,hash->h5,hash->h6);
+
+    memcpy(hash, &old_hash, sizeof * hash);
+    memcpy(hash->buffer, old, bs);
+}
+
+void sha256(uint8_t* in, size_t len, char* out){
+    struct sha256_hash a = sha256_init();
+    sha256_update(in, len, &a);
+    sha256_final(&a, out);
+}
+
+void sha224(uint8_t* in, size_t len, char* out){
+    struct sha256_hash a = sha224_init();
+    sha224_update(in, len, &a);
+    sha224_final(&a, out);
+}
+
+common_hash_clone(sha256);
+lua_common_hash_init(sha256, sha256);
+lua_common_hash_update(sha256, sha256);
+
+int l_sha256_final(lua_State* L){
+  struct sha256_hash* a = (struct sha256_hash*)lua_touserdata(L, 1);
+
+  char digest[256];
+  sha256_final(a, digest);
+
+  lua_pushstring(L, digest);
+  return 1;
 }
 
 int l_sha256(lua_State* L){
-  
-  int len = 0;
-  char* a = (char*)luaL_checklstring(L, 1, NULL);
+  if(lua_gettop(L) == 0) return l_sha256_init(L);
+  size_t len = 0;
+  uint8_t* a = (uint8_t*)luaL_checklstring(L, 1, &len);
   
   char digest[256];
 
-  i_sha2xx(sha256, digest, a);
+  sha256(a, len, digest);
   lua_pushstring(L, digest);
 
   return 1;
 };
 
+#define sha224_hash sha256_hash
+common_hash_clone(sha224);
+lua_common_hash_init(sha224, sha224);
+lua_common_hash_update(sha224, sha224);
+
+int l_sha224_final(lua_State* L){
+  struct sha224_hash* a = (struct sha224_hash*)lua_touserdata(L, 1);
+
+  char digest[224];
+  sha224_final(a, digest);
+
+  lua_pushstring(L, digest);
+  return 1;
+}
+
 int l_sha224(lua_State* L){
-  
-  int len = 0;
-  char* a = (char*)luaL_checklstring(L, 1, NULL);
+  if(lua_gettop(L) == 0) return l_sha224_init(L);
+  size_t len = 0;
+  uint8_t* a = (uint8_t*)luaL_checklstring(L, 1, &len);
   
   char digest[224];
 
-  i_sha2xx(sha224, digest, a);
+  sha224(a, len, digest);
   lua_pushstring(L, digest);
 
   return 1;
diff --git a/src/hash/sha2xx.h b/src/hash/sha2xx.h
index a15aca6..cd7dc83 100644
--- a/src/hash/sha2xx.h
+++ b/src/hash/sha2xx.h
@@ -1,18 +1,18 @@
 #include "../lua.h"
 
-enum version {
-    sha256, sha224
+struct sha256_hash {
+    uint8_t* buffer;
+    size_t bufflen;
+    uint64_t total;
+    uint32_t h0, h1, h2, h3, h4, h5, h6, h7;
 };
 
-/**
- * calculates a sha2 hash of bytes
- *
- * @param {enum version} version to use
- * @param {char*} output stream 
- * @param {char*} input bytes
- * @return {void}
-*/
-void i_sha2xx(enum version, char* out_stream, char* input);
-
 int l_sha256(lua_State*);
+int l_sha256_init(lua_State*);
+int l_sha256_update(lua_State*);
+int l_sha256_final(lua_State*);
+
 int l_sha224(lua_State*);
+int l_sha224_init(lua_State*);
+int l_sha224_update(lua_State*);
+int l_sha224_final(lua_State*);
diff --git a/src/hash/xxh.c b/src/hash/xxh.c
index 24495c4..deb9709 100644
--- a/src/hash/xxh.c
+++ b/src/hash/xxh.c
@@ -129,7 +129,7 @@ int l_xxh64(lua_State* L){
   char digest[64];
 
   uint64_t u = i_xxhash64(a, seed, len);
-  sprintf(digest,"%016lx",u);
+  sprintf(digest,"%016llx",u);
   lua_pushstring(L, digest);
 
   return 1;