diff --git a/src/argon2s/blake2/blake2b.c b/src/argon2s/blake2/blake2b.c
index ca05df598..7194b87a7 100644
--- a/src/argon2s/blake2/blake2b.c
+++ b/src/argon2s/blake2/blake2b.c
@@ -15,10 +15,11 @@
  * software. If not, they may be obtained at the above URLs.
  */
 
+// blake2b speedup barrystyle/icemining (10102018)
+
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
-
 #include "blake2.h"
 #include "blake2-impl.h"
 
@@ -28,40 +29,20 @@ static const uint64_t blake2b_IV[8] = {
     UINT64_C(0x510e527fade682d1), UINT64_C(0x9b05688c2b3e6c1f),
     UINT64_C(0x1f83d9abfb41bd6b), UINT64_C(0x5be0cd19137e2179)};
 
-static const unsigned int blake2b_sigma[12][16] = {
-    {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
-    {14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3},
-    {11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4},
-    {7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8},
-    {9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13},
-    {2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9},
-    {12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11},
-    {13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10},
-    {6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5},
-    {10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0},
-    {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15},
-    {14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3},
-};
-
 static BLAKE2_INLINE void blake2b_set_lastnode(blake2b_state *S) {
     S->f[1] = (uint64_t)-1;
 }
 
 static BLAKE2_INLINE void blake2b_set_lastblock(blake2b_state *S) {
-    if (S->last_node) {
-        blake2b_set_lastnode(S);
-    }
     S->f[0] = (uint64_t)-1;
 }
 
-static BLAKE2_INLINE void blake2b_increment_counter(blake2b_state *S,
-                                                    uint64_t inc) {
+static BLAKE2_INLINE void blake2b_increment_counter(blake2b_state *S, uint64_t inc) {
     S->t[0] += inc;
     S->t[1] += (S->t[0] < inc);
 }
 
 static BLAKE2_INLINE void blake2b_invalidate_state(blake2b_state *S) {
-    clear_internal_memory(S, sizeof(*S));      /* wipe */
     blake2b_set_lastblock(S); /* invalidate for further use */
 }
 
@@ -73,16 +54,9 @@ static BLAKE2_INLINE void blake2b_init0(blake2b_state *S) {
 int blake2b_init_param(blake2b_state *S, const blake2b_param *P) {
     const unsigned char *p = (const unsigned char *)P;
     unsigned int i;
-
-    if (NULL == P || NULL == S) {
-        return -1;
-    }
-
     blake2b_init0(S);
-    /* IV XOR Parameter Block */
-    for (i = 0; i < 8; ++i) {
+    for (i = 0; i < 8; ++i)
         S->h[i] ^= load64(&p[i * sizeof(S->h[i])]);
-    }
     S->outlen = P->digest_length;
     return 0;
 }
@@ -90,17 +64,6 @@ int blake2b_init_param(blake2b_state *S, const blake2b_param *P) {
 /* Sequential blake2b initialization */
 int blake2b_init(blake2b_state *S, size_t outlen) {
     blake2b_param P;
-
-    if (S == NULL) {
-        return -1;
-    }
-
-    if ((outlen == 0) || (outlen > BLAKE2B_OUTBYTES)) {
-        blake2b_invalidate_state(S);
-        return -1;
-    }
-
-    /* Setup Parameter Block for unkeyed BLAKE2 */
     P.digest_length = (uint8_t)outlen;
     P.key_length = 0;
     P.fanout = 1;
@@ -112,29 +75,11 @@ int blake2b_init(blake2b_state *S, size_t outlen) {
     memset(P.reserved, 0, sizeof(P.reserved));
     memset(P.salt, 0, sizeof(P.salt));
     memset(P.personal, 0, sizeof(P.personal));
-
     return blake2b_init_param(S, &P);
 }
 
-int blake2b_init_key(blake2b_state *S, size_t outlen, const void *key,
-                     size_t keylen) {
+int blake2b_init_key(blake2b_state *S, size_t outlen, const void *key, size_t keylen) {
     blake2b_param P;
-
-    if (S == NULL) {
-        return -1;
-    }
-
-    if ((outlen == 0) || (outlen > BLAKE2B_OUTBYTES)) {
-        blake2b_invalidate_state(S);
-        return -1;
-    }
-
-    if ((key == 0) || (keylen == 0) || (keylen > BLAKE2B_KEYBYTES)) {
-        blake2b_invalidate_state(S);
-        return -1;
-    }
-
-    /* Setup Parameter Block for keyed BLAKE2 */
     P.digest_length = (uint8_t)outlen;
     P.key_length = (uint8_t)keylen;
     P.fanout = 1;
@@ -143,103 +88,818 @@ int blake2b_init_key(blake2b_state *S, size_t outlen, const void *key,
     P.node_offset = 0;
     P.node_depth = 0;
     P.inner_length = 0;
-    memset(P.reserved, 0, sizeof(P.reserved));
-    memset(P.salt, 0, sizeof(P.salt));
-    memset(P.personal, 0, sizeof(P.personal));
-
-    if (blake2b_init_param(S, &P) < 0) {
-        blake2b_invalidate_state(S);
-        return -1;
-    }
-
-    {
-        uint8_t block[BLAKE2B_BLOCKBYTES];
-        memset(block, 0, BLAKE2B_BLOCKBYTES);
-        memcpy(block, key, keylen);
-        blake2b_update(S, block, BLAKE2B_BLOCKBYTES);
-        /* Burn the key from stack */
-        clear_internal_memory(block, BLAKE2B_BLOCKBYTES);
-    }
+    uint8_t block[BLAKE2B_BLOCKBYTES];
+    memcpy(block, key, keylen);
+    blake2b_update(S, block, BLAKE2B_BLOCKBYTES);
     return 0;
 }
 
-static void blake2b_compress(blake2b_state *S, const uint8_t *block) {
+static void blake2b_compress(blake2b_state* S, const uint8_t* block)
+{
     uint64_t m[16];
     uint64_t v[16];
     unsigned int i, r;
 
-    for (i = 0; i < 16; ++i) {
+    for (i = 0; i < 16; ++i)
         m[i] = load64(block + i * sizeof(m[i]));
-    }
 
-    for (i = 0; i < 8; ++i) {
-        v[i] = S->h[i];
-    }
-
-    v[8] = blake2b_IV[0];
-    v[9] = blake2b_IV[1];
-    v[10] = blake2b_IV[2];
-    v[11] = blake2b_IV[3];
-    v[12] = blake2b_IV[4] ^ S->t[0];
-    v[13] = blake2b_IV[5] ^ S->t[1];
-    v[14] = blake2b_IV[6] ^ S->f[0];
-    v[15] = blake2b_IV[7] ^ S->f[1];
-
-#define G(r, i, a, b, c, d)                                                    \
-    do {                                                                       \
-        a = a + b + m[blake2b_sigma[r][2 * i + 0]];                            \
-        d = rotr64(d ^ a, 32);                                                 \
-        c = c + d;                                                             \
-        b = rotr64(b ^ c, 24);                                                 \
-        a = a + b + m[blake2b_sigma[r][2 * i + 1]];                            \
-        d = rotr64(d ^ a, 16);                                                 \
-        c = c + d;                                                             \
-        b = rotr64(b ^ c, 63);                                                 \
-    } while ((void)0, 0)
-
-#define ROUND(r)                                                               \
-    do {                                                                       \
-        G(r, 0, v[0], v[4], v[8], v[12]);                                      \
-        G(r, 1, v[1], v[5], v[9], v[13]);                                      \
-        G(r, 2, v[2], v[6], v[10], v[14]);                                     \
-        G(r, 3, v[3], v[7], v[11], v[15]);                                     \
-        G(r, 4, v[0], v[5], v[10], v[15]);                                     \
-        G(r, 5, v[1], v[6], v[11], v[12]);                                     \
-        G(r, 6, v[2], v[7], v[8], v[13]);                                      \
-        G(r, 7, v[3], v[4], v[9], v[14]);                                      \
-    } while ((void)0, 0)
-
-    for (r = 0; r < 12; ++r) {
-        ROUND(r);
-    }
-
-    for (i = 0; i < 8; ++i) {
-        S->h[i] = S->h[i] ^ v[i] ^ v[i + 8];
-    }
-
-#undef G
-#undef ROUND
+    v[0] = S->h[0];
+    v[1] = S->h[1];
+    v[2] = S->h[2];
+    v[3] = S->h[3];
+    v[4] = S->h[4];
+    v[5] = S->h[5];
+    v[6] = S->h[6];
+    v[7] = S->h[7];
+    v[8] = 0x6a09e667f3bcc908;
+    v[9] = 0xbb67ae8584caa73b;
+    v[10] = 0x3c6ef372fe94f82b;
+    v[11] = 0xa54ff53a5f1d36f1;
+    v[12] = 0x510e527fade682d1 ^ S->t[0];
+    v[13] = 0x9b05688c2b3e6c1f ^ S->t[1];
+    v[14] = 0x1f83d9abfb41bd6b ^ S->f[0];
+    v[15] = 0x5be0cd19137e2179 ^ S->f[1];
+    v[0] = v[0] + v[4] + m[0];
+    v[12] = rotr64(v[12] ^ v[0], 32);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 24);
+    v[0] = v[0] + v[4] + m[1];
+    v[12] = rotr64(v[12] ^ v[0], 16);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 63);
+    v[1] = v[1] + v[5] + m[2];
+    v[13] = rotr64(v[13] ^ v[1], 32);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 24);
+    v[1] = v[1] + v[5] + m[3];
+    v[13] = rotr64(v[13] ^ v[1], 16);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 63);
+    v[2] = v[2] + v[6] + m[4];
+    v[14] = rotr64(v[14] ^ v[2], 32);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 24);
+    v[2] = v[2] + v[6] + m[5];
+    v[14] = rotr64(v[14] ^ v[2], 16);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 63);
+    v[3] = v[3] + v[7] + m[6];
+    v[15] = rotr64(v[15] ^ v[3], 32);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 24);
+    v[3] = v[3] + v[7] + m[7];
+    v[15] = rotr64(v[15] ^ v[3], 16);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 63);
+    v[0] = v[0] + v[5] + m[8];
+    v[15] = rotr64(v[15] ^ v[0], 32);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 24);
+    v[0] = v[0] + v[5] + m[9];
+    v[15] = rotr64(v[15] ^ v[0], 16);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 63);
+    v[1] = v[1] + v[6] + m[10];
+    v[12] = rotr64(v[12] ^ v[1], 32);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 24);
+    v[1] = v[1] + v[6] + m[11];
+    v[12] = rotr64(v[12] ^ v[1], 16);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 63);
+    v[2] = v[2] + v[7] + m[12];
+    v[13] = rotr64(v[13] ^ v[2], 32);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 24);
+    v[2] = v[2] + v[7] + m[13];
+    v[13] = rotr64(v[13] ^ v[2], 16);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 63);
+    v[3] = v[3] + v[4] + m[14];
+    v[14] = rotr64(v[14] ^ v[3], 32);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 24);
+    v[3] = v[3] + v[4] + m[15];
+    v[14] = rotr64(v[14] ^ v[3], 16);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 63);
+    v[0] = v[0] + v[4] + m[14];
+    v[12] = rotr64(v[12] ^ v[0], 32);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 24);
+    v[0] = v[0] + v[4] + m[10];
+    v[12] = rotr64(v[12] ^ v[0], 16);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 63);
+    v[1] = v[1] + v[5] + m[4];
+    v[13] = rotr64(v[13] ^ v[1], 32);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 24);
+    v[1] = v[1] + v[5] + m[8];
+    v[13] = rotr64(v[13] ^ v[1], 16);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 63);
+    v[2] = v[2] + v[6] + m[9];
+    v[14] = rotr64(v[14] ^ v[2], 32);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 24);
+    v[2] = v[2] + v[6] + m[15];
+    v[14] = rotr64(v[14] ^ v[2], 16);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 63);
+    v[3] = v[3] + v[7] + m[13];
+    v[15] = rotr64(v[15] ^ v[3], 32);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 24);
+    v[3] = v[3] + v[7] + m[6];
+    v[15] = rotr64(v[15] ^ v[3], 16);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 63);
+    v[0] = v[0] + v[5] + m[1];
+    v[15] = rotr64(v[15] ^ v[0], 32);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 24);
+    v[0] = v[0] + v[5] + m[12];
+    v[15] = rotr64(v[15] ^ v[0], 16);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 63);
+    v[1] = v[1] + v[6] + m[0];
+    v[12] = rotr64(v[12] ^ v[1], 32);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 24);
+    v[1] = v[1] + v[6] + m[2];
+    v[12] = rotr64(v[12] ^ v[1], 16);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 63);
+    v[2] = v[2] + v[7] + m[11];
+    v[13] = rotr64(v[13] ^ v[2], 32);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 24);
+    v[2] = v[2] + v[7] + m[7];
+    v[13] = rotr64(v[13] ^ v[2], 16);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 63);
+    v[3] = v[3] + v[4] + m[5];
+    v[14] = rotr64(v[14] ^ v[3], 32);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 24);
+    v[3] = v[3] + v[4] + m[3];
+    v[14] = rotr64(v[14] ^ v[3], 16);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 63);
+    v[0] = v[0] + v[4] + m[11];
+    v[12] = rotr64(v[12] ^ v[0], 32);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 24);
+    v[0] = v[0] + v[4] + m[8];
+    v[12] = rotr64(v[12] ^ v[0], 16);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 63);
+    v[1] = v[1] + v[5] + m[12];
+    v[13] = rotr64(v[13] ^ v[1], 32);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 24);
+    v[1] = v[1] + v[5] + m[0];
+    v[13] = rotr64(v[13] ^ v[1], 16);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 63);
+    v[2] = v[2] + v[6] + m[5];
+    v[14] = rotr64(v[14] ^ v[2], 32);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 24);
+    v[2] = v[2] + v[6] + m[2];
+    v[14] = rotr64(v[14] ^ v[2], 16);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 63);
+    v[3] = v[3] + v[7] + m[15];
+    v[15] = rotr64(v[15] ^ v[3], 32);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 24);
+    v[3] = v[3] + v[7] + m[13];
+    v[15] = rotr64(v[15] ^ v[3], 16);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 63);
+    v[0] = v[0] + v[5] + m[10];
+    v[15] = rotr64(v[15] ^ v[0], 32);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 24);
+    v[0] = v[0] + v[5] + m[14];
+    v[15] = rotr64(v[15] ^ v[0], 16);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 63);
+    v[1] = v[1] + v[6] + m[3];
+    v[12] = rotr64(v[12] ^ v[1], 32);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 24);
+    v[1] = v[1] + v[6] + m[6];
+    v[12] = rotr64(v[12] ^ v[1], 16);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 63);
+    v[2] = v[2] + v[7] + m[7];
+    v[13] = rotr64(v[13] ^ v[2], 32);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 24);
+    v[2] = v[2] + v[7] + m[1];
+    v[13] = rotr64(v[13] ^ v[2], 16);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 63);
+    v[3] = v[3] + v[4] + m[9];
+    v[14] = rotr64(v[14] ^ v[3], 32);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 24);
+    v[3] = v[3] + v[4] + m[4];
+    v[14] = rotr64(v[14] ^ v[3], 16);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 63);
+    v[0] = v[0] + v[4] + m[7];
+    v[12] = rotr64(v[12] ^ v[0], 32);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 24);
+    v[0] = v[0] + v[4] + m[9];
+    v[12] = rotr64(v[12] ^ v[0], 16);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 63);
+    v[1] = v[1] + v[5] + m[3];
+    v[13] = rotr64(v[13] ^ v[1], 32);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 24);
+    v[1] = v[1] + v[5] + m[1];
+    v[13] = rotr64(v[13] ^ v[1], 16);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 63);
+    v[2] = v[2] + v[6] + m[13];
+    v[14] = rotr64(v[14] ^ v[2], 32);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 24);
+    v[2] = v[2] + v[6] + m[12];
+    v[14] = rotr64(v[14] ^ v[2], 16);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 63);
+    v[3] = v[3] + v[7] + m[11];
+    v[15] = rotr64(v[15] ^ v[3], 32);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 24);
+    v[3] = v[3] + v[7] + m[14];
+    v[15] = rotr64(v[15] ^ v[3], 16);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 63);
+    v[0] = v[0] + v[5] + m[2];
+    v[15] = rotr64(v[15] ^ v[0], 32);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 24);
+    v[0] = v[0] + v[5] + m[6];
+    v[15] = rotr64(v[15] ^ v[0], 16);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 63);
+    v[1] = v[1] + v[6] + m[5];
+    v[12] = rotr64(v[12] ^ v[1], 32);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 24);
+    v[1] = v[1] + v[6] + m[10];
+    v[12] = rotr64(v[12] ^ v[1], 16);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 63);
+    v[2] = v[2] + v[7] + m[4];
+    v[13] = rotr64(v[13] ^ v[2], 32);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 24);
+    v[2] = v[2] + v[7] + m[0];
+    v[13] = rotr64(v[13] ^ v[2], 16);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 63);
+    v[3] = v[3] + v[4] + m[15];
+    v[14] = rotr64(v[14] ^ v[3], 32);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 24);
+    v[3] = v[3] + v[4] + m[8];
+    v[14] = rotr64(v[14] ^ v[3], 16);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 63);
+    v[0] = v[0] + v[4] + m[9];
+    v[12] = rotr64(v[12] ^ v[0], 32);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 24);
+    v[0] = v[0] + v[4] + m[0];
+    v[12] = rotr64(v[12] ^ v[0], 16);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 63);
+    v[1] = v[1] + v[5] + m[5];
+    v[13] = rotr64(v[13] ^ v[1], 32);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 24);
+    v[1] = v[1] + v[5] + m[7];
+    v[13] = rotr64(v[13] ^ v[1], 16);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 63);
+    v[2] = v[2] + v[6] + m[2];
+    v[14] = rotr64(v[14] ^ v[2], 32);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 24);
+    v[2] = v[2] + v[6] + m[4];
+    v[14] = rotr64(v[14] ^ v[2], 16);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 63);
+    v[3] = v[3] + v[7] + m[10];
+    v[15] = rotr64(v[15] ^ v[3], 32);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 24);
+    v[3] = v[3] + v[7] + m[15];
+    v[15] = rotr64(v[15] ^ v[3], 16);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 63);
+    v[0] = v[0] + v[5] + m[14];
+    v[15] = rotr64(v[15] ^ v[0], 32);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 24);
+    v[0] = v[0] + v[5] + m[1];
+    v[15] = rotr64(v[15] ^ v[0], 16);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 63);
+    v[1] = v[1] + v[6] + m[11];
+    v[12] = rotr64(v[12] ^ v[1], 32);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 24);
+    v[1] = v[1] + v[6] + m[12];
+    v[12] = rotr64(v[12] ^ v[1], 16);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 63);
+    v[2] = v[2] + v[7] + m[6];
+    v[13] = rotr64(v[13] ^ v[2], 32);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 24);
+    v[2] = v[2] + v[7] + m[8];
+    v[13] = rotr64(v[13] ^ v[2], 16);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 63);
+    v[3] = v[3] + v[4] + m[3];
+    v[14] = rotr64(v[14] ^ v[3], 32);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 24);
+    v[3] = v[3] + v[4] + m[13];
+    v[14] = rotr64(v[14] ^ v[3], 16);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 63);
+    v[0] = v[0] + v[4] + m[2];
+    v[12] = rotr64(v[12] ^ v[0], 32);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 24);
+    v[0] = v[0] + v[4] + m[12];
+    v[12] = rotr64(v[12] ^ v[0], 16);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 63);
+    v[1] = v[1] + v[5] + m[6];
+    v[13] = rotr64(v[13] ^ v[1], 32);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 24);
+    v[1] = v[1] + v[5] + m[10];
+    v[13] = rotr64(v[13] ^ v[1], 16);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 63);
+    v[2] = v[2] + v[6] + m[0];
+    v[14] = rotr64(v[14] ^ v[2], 32);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 24);
+    v[2] = v[2] + v[6] + m[11];
+    v[14] = rotr64(v[14] ^ v[2], 16);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 63);
+    v[3] = v[3] + v[7] + m[8];
+    v[15] = rotr64(v[15] ^ v[3], 32);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 24);
+    v[3] = v[3] + v[7] + m[3];
+    v[15] = rotr64(v[15] ^ v[3], 16);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 63);
+    v[0] = v[0] + v[5] + m[4];
+    v[15] = rotr64(v[15] ^ v[0], 32);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 24);
+    v[0] = v[0] + v[5] + m[13];
+    v[15] = rotr64(v[15] ^ v[0], 16);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 63);
+    v[1] = v[1] + v[6] + m[7];
+    v[12] = rotr64(v[12] ^ v[1], 32);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 24);
+    v[1] = v[1] + v[6] + m[5];
+    v[12] = rotr64(v[12] ^ v[1], 16);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 63);
+    v[2] = v[2] + v[7] + m[15];
+    v[13] = rotr64(v[13] ^ v[2], 32);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 24);
+    v[2] = v[2] + v[7] + m[14];
+    v[13] = rotr64(v[13] ^ v[2], 16);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 63);
+    v[3] = v[3] + v[4] + m[1];
+    v[14] = rotr64(v[14] ^ v[3], 32);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 24);
+    v[3] = v[3] + v[4] + m[9];
+    v[14] = rotr64(v[14] ^ v[3], 16);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 63);
+    v[0] = v[0] + v[4] + m[12];
+    v[12] = rotr64(v[12] ^ v[0], 32);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 24);
+    v[0] = v[0] + v[4] + m[5];
+    v[12] = rotr64(v[12] ^ v[0], 16);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 63);
+    v[1] = v[1] + v[5] + m[1];
+    v[13] = rotr64(v[13] ^ v[1], 32);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 24);
+    v[1] = v[1] + v[5] + m[15];
+    v[13] = rotr64(v[13] ^ v[1], 16);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 63);
+    v[2] = v[2] + v[6] + m[14];
+    v[14] = rotr64(v[14] ^ v[2], 32);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 24);
+    v[2] = v[2] + v[6] + m[13];
+    v[14] = rotr64(v[14] ^ v[2], 16);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 63);
+    v[3] = v[3] + v[7] + m[4];
+    v[15] = rotr64(v[15] ^ v[3], 32);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 24);
+    v[3] = v[3] + v[7] + m[10];
+    v[15] = rotr64(v[15] ^ v[3], 16);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 63);
+    v[0] = v[0] + v[5] + m[0];
+    v[15] = rotr64(v[15] ^ v[0], 32);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 24);
+    v[0] = v[0] + v[5] + m[7];
+    v[15] = rotr64(v[15] ^ v[0], 16);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 63);
+    v[1] = v[1] + v[6] + m[6];
+    v[12] = rotr64(v[12] ^ v[1], 32);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 24);
+    v[1] = v[1] + v[6] + m[3];
+    v[12] = rotr64(v[12] ^ v[1], 16);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 63);
+    v[2] = v[2] + v[7] + m[9];
+    v[13] = rotr64(v[13] ^ v[2], 32);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 24);
+    v[2] = v[2] + v[7] + m[2];
+    v[13] = rotr64(v[13] ^ v[2], 16);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 63);
+    v[3] = v[3] + v[4] + m[8];
+    v[14] = rotr64(v[14] ^ v[3], 32);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 24);
+    v[3] = v[3] + v[4] + m[11];
+    v[14] = rotr64(v[14] ^ v[3], 16);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 63);
+    v[0] = v[0] + v[4] + m[13];
+    v[12] = rotr64(v[12] ^ v[0], 32);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 24);
+    v[0] = v[0] + v[4] + m[11];
+    v[12] = rotr64(v[12] ^ v[0], 16);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 63);
+    v[1] = v[1] + v[5] + m[7];
+    v[13] = rotr64(v[13] ^ v[1], 32);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 24);
+    v[1] = v[1] + v[5] + m[14];
+    v[13] = rotr64(v[13] ^ v[1], 16);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 63);
+    v[2] = v[2] + v[6] + m[12];
+    v[14] = rotr64(v[14] ^ v[2], 32);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 24);
+    v[2] = v[2] + v[6] + m[1];
+    v[14] = rotr64(v[14] ^ v[2], 16);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 63);
+    v[3] = v[3] + v[7] + m[3];
+    v[15] = rotr64(v[15] ^ v[3], 32);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 24);
+    v[3] = v[3] + v[7] + m[9];
+    v[15] = rotr64(v[15] ^ v[3], 16);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 63);
+    v[0] = v[0] + v[5] + m[5];
+    v[15] = rotr64(v[15] ^ v[0], 32);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 24);
+    v[0] = v[0] + v[5] + m[0];
+    v[15] = rotr64(v[15] ^ v[0], 16);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 63);
+    v[1] = v[1] + v[6] + m[15];
+    v[12] = rotr64(v[12] ^ v[1], 32);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 24);
+    v[1] = v[1] + v[6] + m[4];
+    v[12] = rotr64(v[12] ^ v[1], 16);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 63);
+    v[2] = v[2] + v[7] + m[8];
+    v[13] = rotr64(v[13] ^ v[2], 32);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 24);
+    v[2] = v[2] + v[7] + m[6];
+    v[13] = rotr64(v[13] ^ v[2], 16);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 63);
+    v[3] = v[3] + v[4] + m[2];
+    v[14] = rotr64(v[14] ^ v[3], 32);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 24);
+    v[3] = v[3] + v[4] + m[10];
+    v[14] = rotr64(v[14] ^ v[3], 16);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 63);
+    v[0] = v[0] + v[4] + m[6];
+    v[12] = rotr64(v[12] ^ v[0], 32);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 24);
+    v[0] = v[0] + v[4] + m[15];
+    v[12] = rotr64(v[12] ^ v[0], 16);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 63);
+    v[1] = v[1] + v[5] + m[14];
+    v[13] = rotr64(v[13] ^ v[1], 32);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 24);
+    v[1] = v[1] + v[5] + m[9];
+    v[13] = rotr64(v[13] ^ v[1], 16);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 63);
+    v[2] = v[2] + v[6] + m[11];
+    v[14] = rotr64(v[14] ^ v[2], 32);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 24);
+    v[2] = v[2] + v[6] + m[3];
+    v[14] = rotr64(v[14] ^ v[2], 16);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 63);
+    v[3] = v[3] + v[7] + m[0];
+    v[15] = rotr64(v[15] ^ v[3], 32);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 24);
+    v[3] = v[3] + v[7] + m[8];
+    v[15] = rotr64(v[15] ^ v[3], 16);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 63);
+    v[0] = v[0] + v[5] + m[12];
+    v[15] = rotr64(v[15] ^ v[0], 32);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 24);
+    v[0] = v[0] + v[5] + m[2];
+    v[15] = rotr64(v[15] ^ v[0], 16);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 63);
+    v[1] = v[1] + v[6] + m[13];
+    v[12] = rotr64(v[12] ^ v[1], 32);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 24);
+    v[1] = v[1] + v[6] + m[7];
+    v[12] = rotr64(v[12] ^ v[1], 16);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 63);
+    v[2] = v[2] + v[7] + m[1];
+    v[13] = rotr64(v[13] ^ v[2], 32);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 24);
+    v[2] = v[2] + v[7] + m[4];
+    v[13] = rotr64(v[13] ^ v[2], 16);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 63);
+    v[3] = v[3] + v[4] + m[10];
+    v[14] = rotr64(v[14] ^ v[3], 32);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 24);
+    v[3] = v[3] + v[4] + m[5];
+    v[14] = rotr64(v[14] ^ v[3], 16);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 63);
+    v[0] = v[0] + v[4] + m[10];
+    v[12] = rotr64(v[12] ^ v[0], 32);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 24);
+    v[0] = v[0] + v[4] + m[2];
+    v[12] = rotr64(v[12] ^ v[0], 16);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 63);
+    v[1] = v[1] + v[5] + m[8];
+    v[13] = rotr64(v[13] ^ v[1], 32);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 24);
+    v[1] = v[1] + v[5] + m[4];
+    v[13] = rotr64(v[13] ^ v[1], 16);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 63);
+    v[2] = v[2] + v[6] + m[7];
+    v[14] = rotr64(v[14] ^ v[2], 32);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 24);
+    v[2] = v[2] + v[6] + m[6];
+    v[14] = rotr64(v[14] ^ v[2], 16);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 63);
+    v[3] = v[3] + v[7] + m[1];
+    v[15] = rotr64(v[15] ^ v[3], 32);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 24);
+    v[3] = v[3] + v[7] + m[5];
+    v[15] = rotr64(v[15] ^ v[3], 16);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 63);
+    v[0] = v[0] + v[5] + m[15];
+    v[15] = rotr64(v[15] ^ v[0], 32);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 24);
+    v[0] = v[0] + v[5] + m[11];
+    v[15] = rotr64(v[15] ^ v[0], 16);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 63);
+    v[1] = v[1] + v[6] + m[9];
+    v[12] = rotr64(v[12] ^ v[1], 32);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 24);
+    v[1] = v[1] + v[6] + m[14];
+    v[12] = rotr64(v[12] ^ v[1], 16);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 63);
+    v[2] = v[2] + v[7] + m[3];
+    v[13] = rotr64(v[13] ^ v[2], 32);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 24);
+    v[2] = v[2] + v[7] + m[12];
+    v[13] = rotr64(v[13] ^ v[2], 16);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 63);
+    v[3] = v[3] + v[4] + m[13];
+    v[14] = rotr64(v[14] ^ v[3], 32);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 24);
+    v[3] = v[3] + v[4] + m[0];
+    v[14] = rotr64(v[14] ^ v[3], 16);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 63);
+    v[0] = v[0] + v[4] + m[0];
+    v[12] = rotr64(v[12] ^ v[0], 32);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 24);
+    v[0] = v[0] + v[4] + m[1];
+    v[12] = rotr64(v[12] ^ v[0], 16);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 63);
+    v[1] = v[1] + v[5] + m[2];
+    v[13] = rotr64(v[13] ^ v[1], 32);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 24);
+    v[1] = v[1] + v[5] + m[3];
+    v[13] = rotr64(v[13] ^ v[1], 16);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 63);
+    v[2] = v[2] + v[6] + m[4];
+    v[14] = rotr64(v[14] ^ v[2], 32);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 24);
+    v[2] = v[2] + v[6] + m[5];
+    v[14] = rotr64(v[14] ^ v[2], 16);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 63);
+    v[3] = v[3] + v[7] + m[6];
+    v[15] = rotr64(v[15] ^ v[3], 32);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 24);
+    v[3] = v[3] + v[7] + m[7];
+    v[15] = rotr64(v[15] ^ v[3], 16);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 63);
+    v[0] = v[0] + v[5] + m[8];
+    v[15] = rotr64(v[15] ^ v[0], 32);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 24);
+    v[0] = v[0] + v[5] + m[9];
+    v[15] = rotr64(v[15] ^ v[0], 16);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 63);
+    v[1] = v[1] + v[6] + m[10];
+    v[12] = rotr64(v[12] ^ v[1], 32);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 24);
+    v[1] = v[1] + v[6] + m[11];
+    v[12] = rotr64(v[12] ^ v[1], 16);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 63);
+    v[2] = v[2] + v[7] + m[12];
+    v[13] = rotr64(v[13] ^ v[2], 32);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 24);
+    v[2] = v[2] + v[7] + m[13];
+    v[13] = rotr64(v[13] ^ v[2], 16);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 63);
+    v[3] = v[3] + v[4] + m[14];
+    v[14] = rotr64(v[14] ^ v[3], 32);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 24);
+    v[3] = v[3] + v[4] + m[15];
+    v[14] = rotr64(v[14] ^ v[3], 16);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 63);
+    v[0] = v[0] + v[4] + m[14];
+    v[12] = rotr64(v[12] ^ v[0], 32);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 24);
+    v[0] = v[0] + v[4] + m[10];
+    v[12] = rotr64(v[12] ^ v[0], 16);
+    v[8] = v[8] + v[12];
+    v[4] = rotr64(v[4] ^ v[8], 63);
+    v[1] = v[1] + v[5] + m[4];
+    v[13] = rotr64(v[13] ^ v[1], 32);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 24);
+    v[1] = v[1] + v[5] + m[8];
+    v[13] = rotr64(v[13] ^ v[1], 16);
+    v[9] = v[9] + v[13];
+    v[5] = rotr64(v[5] ^ v[9], 63);
+    v[2] = v[2] + v[6] + m[9];
+    v[14] = rotr64(v[14] ^ v[2], 32);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 24);
+    v[2] = v[2] + v[6] + m[15];
+    v[14] = rotr64(v[14] ^ v[2], 16);
+    v[10] = v[10] + v[14];
+    v[6] = rotr64(v[6] ^ v[10], 63);
+    v[3] = v[3] + v[7] + m[13];
+    v[15] = rotr64(v[15] ^ v[3], 32);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 24);
+    v[3] = v[3] + v[7] + m[6];
+    v[15] = rotr64(v[15] ^ v[3], 16);
+    v[11] = v[11] + v[15];
+    v[7] = rotr64(v[7] ^ v[11], 63);
+    v[0] = v[0] + v[5] + m[1];
+    v[15] = rotr64(v[15] ^ v[0], 32);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 24);
+    v[0] = v[0] + v[5] + m[12];
+    v[15] = rotr64(v[15] ^ v[0], 16);
+    v[10] = v[10] + v[15];
+    v[5] = rotr64(v[5] ^ v[10], 63);
+    v[1] = v[1] + v[6] + m[0];
+    v[12] = rotr64(v[12] ^ v[1], 32);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 24);
+    v[1] = v[1] + v[6] + m[2];
+    v[12] = rotr64(v[12] ^ v[1], 16);
+    v[11] = v[11] + v[12];
+    v[6] = rotr64(v[6] ^ v[11], 63);
+    v[2] = v[2] + v[7] + m[11];
+    v[13] = rotr64(v[13] ^ v[2], 32);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 24);
+    v[2] = v[2] + v[7] + m[7];
+    v[13] = rotr64(v[13] ^ v[2], 16);
+    v[8] = v[8] + v[13];
+    v[7] = rotr64(v[7] ^ v[8], 63);
+    v[3] = v[3] + v[4] + m[5];
+    v[14] = rotr64(v[14] ^ v[3], 32);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 24);
+    v[3] = v[3] + v[4] + m[3];
+    v[14] = rotr64(v[14] ^ v[3], 16);
+    v[9] = v[9] + v[14];
+    v[4] = rotr64(v[4] ^ v[9], 63);
+    S->h[0] = S->h[0] ^ v[0] ^ v[8];
+    S->h[1] = S->h[1] ^ v[1] ^ v[9];
+    S->h[2] = S->h[2] ^ v[2] ^ v[10];
+    S->h[3] = S->h[3] ^ v[3] ^ v[11];
+    S->h[4] = S->h[4] ^ v[4] ^ v[12];
+    S->h[5] = S->h[5] ^ v[5] ^ v[13];
+    S->h[6] = S->h[6] ^ v[6] ^ v[14];
+    S->h[7] = S->h[7] ^ v[7] ^ v[15];
 }
 
 int blake2b_update(blake2b_state *S, const void *in, size_t inlen) {
     const uint8_t *pin = (const uint8_t *)in;
-
-    if (inlen == 0) {
-        return 0;
-    }
-
-    /* Sanity check */
-    if (S == NULL || in == NULL) {
-        return -1;
-    }
-
-    /* Is this a reused state? */
-    if (S->f[0] != 0) {
-        return -1;
-    }
-
     if (S->buflen + inlen > BLAKE2B_BLOCKBYTES) {
-        /* Complete current block */
         size_t left = S->buflen;
         size_t fill = BLAKE2B_BLOCKBYTES - left;
         memcpy(&S->buf[left], pin, fill);
@@ -248,7 +908,6 @@ int blake2b_update(blake2b_state *S, const void *in, size_t inlen) {
         S->buflen = 0;
         inlen -= fill;
         pin += fill;
-        /* Avoid buffer copies when possible */
         while (inlen > BLAKE2B_BLOCKBYTES) {
             blake2b_increment_counter(S, BLAKE2B_BLOCKBYTES);
             blake2b_compress(S, pin);
@@ -264,127 +923,59 @@ int blake2b_update(blake2b_state *S, const void *in, size_t inlen) {
 int blake2b_final(blake2b_state *S, void *out, size_t outlen) {
     uint8_t buffer[BLAKE2B_OUTBYTES] = {0};
     unsigned int i;
-
-    /* Sanity checks */
-    if (S == NULL || out == NULL || outlen < S->outlen) {
-        return -1;
-    }
-
-    /* Is this a reused state? */
-    if (S->f[0] != 0) {
-        return -1;
-    }
-
     blake2b_increment_counter(S, S->buflen);
     blake2b_set_lastblock(S);
     memset(&S->buf[S->buflen], 0, BLAKE2B_BLOCKBYTES - S->buflen); /* Padding */
     blake2b_compress(S, S->buf);
-
-    for (i = 0; i < 8; ++i) { /* Output full hash to temp buffer */
+    for (i = 0; i < 8; ++i)
         store64(buffer + sizeof(S->h[i]) * i, S->h[i]);
-    }
-
     memcpy(out, buffer, S->outlen);
-    clear_internal_memory(buffer, sizeof(buffer));
-    clear_internal_memory(S->buf, sizeof(S->buf));
-    clear_internal_memory(S->h, sizeof(S->h));
     return 0;
 }
 
-int blake2b(void *out, size_t outlen, const void *in, size_t inlen,
-            const void *key, size_t keylen) {
+int blake2b(void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen) {
     blake2b_state S;
     int ret = -1;
-
-    /* Verify parameters */
-    if (NULL == in && inlen > 0) {
-        goto fail;
-    }
-
-    if (NULL == out || outlen == 0 || outlen > BLAKE2B_OUTBYTES) {
-        goto fail;
-    }
-
-    if ((NULL == key && keylen > 0) || keylen > BLAKE2B_KEYBYTES) {
-        goto fail;
-    }
-
-    if (keylen > 0) {
-        if (blake2b_init_key(&S, outlen, key, keylen) < 0) {
-            goto fail;
-        }
-    } else {
-        if (blake2b_init(&S, outlen) < 0) {
-            goto fail;
-        }
-    }
-
-    if (blake2b_update(&S, in, inlen) < 0) {
-        goto fail;
-    }
-    ret = blake2b_final(&S, out, outlen);
-
-fail:
-    clear_internal_memory(&S, sizeof(S));
-    return ret;
+    blake2b_init(&S, outlen);
+    blake2b_update(&S, in, inlen);
+    blake2b_final(&S, out, outlen);
 }
 
-/* Argon2 Team - Begin Code */
 int blake2b_long(void *pout, size_t outlen, const void *in, size_t inlen) {
     uint8_t *out = (uint8_t *)pout;
     blake2b_state blake_state;
     uint8_t outlen_bytes[sizeof(uint32_t)] = {0};
     int ret = -1;
-
-    if (outlen > UINT32_MAX) {
-        goto fail;
-    }
-
-    /* Ensure little-endian byte order! */
     store32(outlen_bytes, (uint32_t)outlen);
 
-#define TRY(statement)                                                         \
-    do {                                                                       \
-        ret = statement;                                                       \
-        if (ret < 0) {                                                         \
-            goto fail;                                                         \
-        }                                                                      \
-    } while ((void)0, 0)
-
     if (outlen <= BLAKE2B_OUTBYTES) {
-        TRY(blake2b_init(&blake_state, outlen));
-        TRY(blake2b_update(&blake_state, outlen_bytes, sizeof(outlen_bytes)));
-        TRY(blake2b_update(&blake_state, in, inlen));
-        TRY(blake2b_final(&blake_state, out, outlen));
+        blake2b_init(&blake_state, outlen);
+        blake2b_update(&blake_state, outlen_bytes, sizeof(outlen_bytes));
+        blake2b_update(&blake_state, in, inlen);
+        blake2b_final(&blake_state, out, outlen);
     } else {
         uint32_t toproduce;
         uint8_t out_buffer[BLAKE2B_OUTBYTES];
         uint8_t in_buffer[BLAKE2B_OUTBYTES];
-        TRY(blake2b_init(&blake_state, BLAKE2B_OUTBYTES));
-        TRY(blake2b_update(&blake_state, outlen_bytes, sizeof(outlen_bytes)));
-        TRY(blake2b_update(&blake_state, in, inlen));
-        TRY(blake2b_final(&blake_state, out_buffer, BLAKE2B_OUTBYTES));
+        blake2b_init(&blake_state, BLAKE2B_OUTBYTES);
+        blake2b_update(&blake_state, outlen_bytes, sizeof(outlen_bytes));
+        blake2b_update(&blake_state, in, inlen);
+        blake2b_final(&blake_state, out_buffer, BLAKE2B_OUTBYTES);
         memcpy(out, out_buffer, BLAKE2B_OUTBYTES / 2);
         out += BLAKE2B_OUTBYTES / 2;
         toproduce = (uint32_t)outlen - BLAKE2B_OUTBYTES / 2;
 
         while (toproduce > BLAKE2B_OUTBYTES) {
             memcpy(in_buffer, out_buffer, BLAKE2B_OUTBYTES);
-            TRY(blake2b(out_buffer, BLAKE2B_OUTBYTES, in_buffer,
-                        BLAKE2B_OUTBYTES, NULL, 0));
+            blake2b(out_buffer, BLAKE2B_OUTBYTES, in_buffer,BLAKE2B_OUTBYTES, NULL, 0);
             memcpy(out, out_buffer, BLAKE2B_OUTBYTES / 2);
             out += BLAKE2B_OUTBYTES / 2;
             toproduce -= BLAKE2B_OUTBYTES / 2;
         }
 
         memcpy(in_buffer, out_buffer, BLAKE2B_OUTBYTES);
-        TRY(blake2b(out_buffer, toproduce, in_buffer, BLAKE2B_OUTBYTES, NULL,
-                    0));
+        blake2b(out_buffer, toproduce, in_buffer, BLAKE2B_OUTBYTES, NULL, 0);
         memcpy(out, out_buffer, toproduce);
     }
-fail:
-    clear_internal_memory(&blake_state, sizeof(blake_state));
     return ret;
-#undef TRY
 }
-/* Argon2 Team - End Code */
diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
index 41d9b7ba7..e113b5a6c 100644
--- a/src/primitives/block.cpp
+++ b/src/primitives/block.cpp
@@ -18,9 +18,7 @@ uint256 CBlockHeader::GetHash() const
 
 uint256 CBlockHeader::GetPoWHash() const
 {
-    uint256 thash;
-    argon2s_hash(BEGIN(nVersion), BEGIN(thash));
-    return thash;
+    return argon2s_hash(BEGIN(nVersion), END(nNonce));
 }
 
 std::string CBlock::ToString() const