From 28de23ec3eb8c3fe9546860350f28a84b25694fa Mon Sep 17 00:00:00 2001
From: jsteube <jens.steube@gmail.com>
Date: Mon, 10 Jul 2017 12:10:49 +0200
Subject: [PATCH] Simplify -m 10700 a bit

---
 OpenCL/m10700.cl | 553 ++++-------------------------------------------
 1 file changed, 45 insertions(+), 508 deletions(-)

diff --git a/OpenCL/m10700.cl b/OpenCL/m10700.cl
index bb85af120..3b5c73391 100644
--- a/OpenCL/m10700.cl
+++ b/OpenCL/m10700.cl
@@ -8,6 +8,9 @@
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"
+#include "inc_hash_sha256.cl"
+#include "inc_hash_sha384.cl"
+#include "inc_hash_sha512.cl"
 #include "inc_cipher_aes.cl"
 
 #define COMPARE_S "inc_comp_single.cl"
@@ -33,27 +36,7 @@ typedef struct
 
 } ctx_t;
 
-__constant u32a k_sha256[64] =
-{
-  SHA256C00, SHA256C01, SHA256C02, SHA256C03,
-  SHA256C04, SHA256C05, SHA256C06, SHA256C07,
-  SHA256C08, SHA256C09, SHA256C0a, SHA256C0b,
-  SHA256C0c, SHA256C0d, SHA256C0e, SHA256C0f,
-  SHA256C10, SHA256C11, SHA256C12, SHA256C13,
-  SHA256C14, SHA256C15, SHA256C16, SHA256C17,
-  SHA256C18, SHA256C19, SHA256C1a, SHA256C1b,
-  SHA256C1c, SHA256C1d, SHA256C1e, SHA256C1f,
-  SHA256C20, SHA256C21, SHA256C22, SHA256C23,
-  SHA256C24, SHA256C25, SHA256C26, SHA256C27,
-  SHA256C28, SHA256C29, SHA256C2a, SHA256C2b,
-  SHA256C2c, SHA256C2d, SHA256C2e, SHA256C2f,
-  SHA256C30, SHA256C31, SHA256C32, SHA256C33,
-  SHA256C34, SHA256C35, SHA256C36, SHA256C37,
-  SHA256C38, SHA256C39, SHA256C3a, SHA256C3b,
-  SHA256C3c, SHA256C3d, SHA256C3e, SHA256C3f,
-};
-
-void sha256_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest)
+void orig_sha256_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest)
 {
   u32 a = digest[0];
   u32 b = digest[1];
@@ -131,6 +114,9 @@ void sha256_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w
     ROUND256_EXPAND (); ROUND256_STEP (i);
   }
 
+  #undef ROUND256_EXPAND
+  #undef ROUND256_STEP
+
   digest[0] += a;
   digest[1] += b;
   digest[2] += c;
@@ -141,31 +127,7 @@ void sha256_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w
   digest[7] += h;
 }
 
-__constant u64a k_sha384[80] =
-{
-  SHA512C00, SHA512C01, SHA512C02, SHA512C03,
-  SHA512C04, SHA512C05, SHA512C06, SHA512C07,
-  SHA512C08, SHA512C09, SHA512C0a, SHA512C0b,
-  SHA512C0c, SHA512C0d, SHA512C0e, SHA512C0f,
-  SHA512C10, SHA512C11, SHA512C12, SHA512C13,
-  SHA512C14, SHA512C15, SHA512C16, SHA512C17,
-  SHA512C18, SHA512C19, SHA512C1a, SHA512C1b,
-  SHA512C1c, SHA512C1d, SHA512C1e, SHA512C1f,
-  SHA512C20, SHA512C21, SHA512C22, SHA512C23,
-  SHA512C24, SHA512C25, SHA512C26, SHA512C27,
-  SHA512C28, SHA512C29, SHA512C2a, SHA512C2b,
-  SHA512C2c, SHA512C2d, SHA512C2e, SHA512C2f,
-  SHA512C30, SHA512C31, SHA512C32, SHA512C33,
-  SHA512C34, SHA512C35, SHA512C36, SHA512C37,
-  SHA512C38, SHA512C39, SHA512C3a, SHA512C3b,
-  SHA512C3c, SHA512C3d, SHA512C3e, SHA512C3f,
-  SHA512C40, SHA512C41, SHA512C42, SHA512C43,
-  SHA512C44, SHA512C45, SHA512C46, SHA512C47,
-  SHA512C48, SHA512C49, SHA512C4a, SHA512C4b,
-  SHA512C4c, SHA512C4d, SHA512C4e, SHA512C4f,
-};
-
-void sha384_transform (const u64 *w0, const u64 *w1, const u64 *w2, const u64 *w3, u64 *digest)
+void orig_sha384_transform (const u64 *w0, const u64 *w1, const u64 *w2, const u64 *w3, u64 *digest)
 {
   u64 a = digest[0];
   u64 b = digest[1];
@@ -243,6 +205,9 @@ void sha384_transform (const u64 *w0, const u64 *w1, const u64 *w2, const u64 *w
     ROUND384_EXPAND (); ROUND384_STEP (i);
   }
 
+  #undef ROUND384_EXPAND
+  #undef ROUND384_STEP
+
   digest[0] += a;
   digest[1] += b;
   digest[2] += c;
@@ -253,31 +218,7 @@ void sha384_transform (const u64 *w0, const u64 *w1, const u64 *w2, const u64 *w
   digest[7] += h;
 }
 
-__constant u64a k_sha512[80] =
-{
-  SHA512C00, SHA512C01, SHA512C02, SHA512C03,
-  SHA512C04, SHA512C05, SHA512C06, SHA512C07,
-  SHA512C08, SHA512C09, SHA512C0a, SHA512C0b,
-  SHA512C0c, SHA512C0d, SHA512C0e, SHA512C0f,
-  SHA512C10, SHA512C11, SHA512C12, SHA512C13,
-  SHA512C14, SHA512C15, SHA512C16, SHA512C17,
-  SHA512C18, SHA512C19, SHA512C1a, SHA512C1b,
-  SHA512C1c, SHA512C1d, SHA512C1e, SHA512C1f,
-  SHA512C20, SHA512C21, SHA512C22, SHA512C23,
-  SHA512C24, SHA512C25, SHA512C26, SHA512C27,
-  SHA512C28, SHA512C29, SHA512C2a, SHA512C2b,
-  SHA512C2c, SHA512C2d, SHA512C2e, SHA512C2f,
-  SHA512C30, SHA512C31, SHA512C32, SHA512C33,
-  SHA512C34, SHA512C35, SHA512C36, SHA512C37,
-  SHA512C38, SHA512C39, SHA512C3a, SHA512C3b,
-  SHA512C3c, SHA512C3d, SHA512C3e, SHA512C3f,
-  SHA512C40, SHA512C41, SHA512C42, SHA512C43,
-  SHA512C44, SHA512C45, SHA512C46, SHA512C47,
-  SHA512C48, SHA512C49, SHA512C4a, SHA512C4b,
-  SHA512C4c, SHA512C4d, SHA512C4e, SHA512C4f,
-};
-
-void sha512_transform (const u64 *w0, const u64 *w1, const u64 *w2, const u64 *w3, u64 *digest)
+void orig_sha512_transform (const u64 *w0, const u64 *w1, const u64 *w2, const u64 *w3, u64 *digest)
 {
   u64 a = digest[0];
   u64 b = digest[1];
@@ -355,6 +296,9 @@ void sha512_transform (const u64 *w0, const u64 *w1, const u64 *w2, const u64 *w
     ROUND512_EXPAND (); ROUND512_STEP (i);
   }
 
+  #undef ROUND512_EXPAND
+  #undef ROUND512_STEP
+
   digest[0] += a;
   digest[1] += b;
   digest[2] += c;
@@ -365,339 +309,6 @@ void sha512_transform (const u64 *w0, const u64 *w1, const u64 *w2, const u64 *w
   digest[7] += h;
 }
 
-void memcat8 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append[2])
-{
-  switch (block_len)
-  {
-    case 0:
-      block0[0] = append[0];
-      block0[1] = append[1];
-      break;
-
-    case 1:
-      block0[0] = block0[0]       | append[0] <<  8;
-      block0[1] = append[0] >> 24 | append[1] <<  8;
-      block0[2] = append[1] >> 24;
-      break;
-
-    case 2:
-      block0[0] = block0[0]       | append[0] << 16;
-      block0[1] = append[0] >> 16 | append[1] << 16;
-      block0[2] = append[1] >> 16;
-      break;
-
-    case 3:
-      block0[0] = block0[0]       | append[0] << 24;
-      block0[1] = append[0] >>  8 | append[1] << 24;
-      block0[2] = append[1] >>  8;
-      break;
-
-    case 4:
-      block0[1] = append[0];
-      block0[2] = append[1];
-      break;
-
-    case 5:
-      block0[1] = block0[1]       | append[0] <<  8;
-      block0[2] = append[0] >> 24 | append[1] <<  8;
-      block0[3] = append[1] >> 24;
-      break;
-
-    case 6:
-      block0[1] = block0[1]       | append[0] << 16;
-      block0[2] = append[0] >> 16 | append[1] << 16;
-      block0[3] = append[1] >> 16;
-      break;
-
-    case 7:
-      block0[1] = block0[1]       | append[0] << 24;
-      block0[2] = append[0] >>  8 | append[1] << 24;
-      block0[3] = append[1] >>  8;
-      break;
-
-    case 8:
-      block0[2] = append[0];
-      block0[3] = append[1];
-      break;
-
-    case 9:
-      block0[2] = block0[2]       | append[0] <<  8;
-      block0[3] = append[0] >> 24 | append[1] <<  8;
-      block1[0] = append[1] >> 24;
-      break;
-
-    case 10:
-      block0[2] = block0[2]       | append[0] << 16;
-      block0[3] = append[0] >> 16 | append[1] << 16;
-      block1[0] = append[1] >> 16;
-      break;
-
-    case 11:
-      block0[2] = block0[2]       | append[0] << 24;
-      block0[3] = append[0] >>  8 | append[1] << 24;
-      block1[0] = append[1] >>  8;
-      break;
-
-    case 12:
-      block0[3] = append[0];
-      block1[0] = append[1];
-      break;
-
-    case 13:
-      block0[3] = block0[3]       | append[0] <<  8;
-      block1[0] = append[0] >> 24 | append[1] <<  8;
-      block1[1] = append[1] >> 24;
-      break;
-
-    case 14:
-      block0[3] = block0[3]       | append[0] << 16;
-      block1[0] = append[0] >> 16 | append[1] << 16;
-      block1[1] = append[1] >> 16;
-      break;
-
-    case 15:
-      block0[3] = block0[3]       | append[0] << 24;
-      block1[0] = append[0] >>  8 | append[1] << 24;
-      block1[1] = append[1] >>  8;
-      break;
-
-    case 16:
-      block1[0] = append[0];
-      block1[1] = append[1];
-      break;
-
-    case 17:
-      block1[0] = block1[0]       | append[0] <<  8;
-      block1[1] = append[0] >> 24 | append[1] <<  8;
-      block1[2] = append[1] >> 24;
-      break;
-
-    case 18:
-      block1[0] = block1[0]       | append[0] << 16;
-      block1[1] = append[0] >> 16 | append[1] << 16;
-      block1[2] = append[1] >> 16;
-      break;
-
-    case 19:
-      block1[0] = block1[0]       | append[0] << 24;
-      block1[1] = append[0] >>  8 | append[1] << 24;
-      block1[2] = append[1] >>  8;
-      break;
-
-    case 20:
-      block1[1] = append[0];
-      block1[2] = append[1];
-      break;
-
-    case 21:
-      block1[1] = block1[1]       | append[0] <<  8;
-      block1[2] = append[0] >> 24 | append[1] <<  8;
-      block1[3] = append[1] >> 24;
-      break;
-
-    case 22:
-      block1[1] = block1[1]       | append[0] << 16;
-      block1[2] = append[0] >> 16 | append[1] << 16;
-      block1[3] = append[1] >> 16;
-      break;
-
-    case 23:
-      block1[1] = block1[1]       | append[0] << 24;
-      block1[2] = append[0] >>  8 | append[1] << 24;
-      block1[3] = append[1] >>  8;
-      break;
-
-    case 24:
-      block1[2] = append[0];
-      block1[3] = append[1];
-      break;
-
-    case 25:
-      block1[2] = block1[2]       | append[0] <<  8;
-      block1[3] = append[0] >> 24 | append[1] <<  8;
-      block2[0] = append[1] >> 24;
-      break;
-
-    case 26:
-      block1[2] = block1[2]       | append[0] << 16;
-      block1[3] = append[0] >> 16 | append[1] << 16;
-      block2[0] = append[1] >> 16;
-      break;
-
-    case 27:
-      block1[2] = block1[2]       | append[0] << 24;
-      block1[3] = append[0] >>  8 | append[1] << 24;
-      block2[0] = append[1] >>  8;
-      break;
-
-    case 28:
-      block1[3] = append[0];
-      block2[0] = append[1];
-      break;
-
-    case 29:
-      block1[3] = block1[3]       | append[0] <<  8;
-      block2[0] = append[0] >> 24 | append[1] <<  8;
-      block2[1] = append[1] >> 24;
-      break;
-
-    case 30:
-      block1[3] = block1[3]       | append[0] << 16;
-      block2[0] = append[0] >> 16 | append[1] << 16;
-      block2[1] = append[1] >> 16;
-      break;
-
-    case 31:
-      block1[3] = block1[3]       | append[0] << 24;
-      block2[0] = append[0] >>  8 | append[1] << 24;
-      block2[1] = append[1] >>  8;
-      break;
-
-    case 32:
-      block2[0] = append[0];
-      block2[1] = append[1];
-      break;
-
-    case 33:
-      block2[0] = block2[0]       | append[0] <<  8;
-      block2[1] = append[0] >> 24 | append[1] <<  8;
-      block2[2] = append[1] >> 24;
-      break;
-
-    case 34:
-      block2[0] = block2[0]       | append[0] << 16;
-      block2[1] = append[0] >> 16 | append[1] << 16;
-      block2[2] = append[1] >> 16;
-      break;
-
-    case 35:
-      block2[0] = block2[0]       | append[0] << 24;
-      block2[1] = append[0] >>  8 | append[1] << 24;
-      block2[2] = append[1] >>  8;
-      break;
-
-    case 36:
-      block2[1] = append[0];
-      block2[2] = append[1];
-      break;
-
-    case 37:
-      block2[1] = block2[1]       | append[0] <<  8;
-      block2[2] = append[0] >> 24 | append[1] <<  8;
-      block2[3] = append[1] >> 24;
-      break;
-
-    case 38:
-      block2[1] = block2[1]       | append[0] << 16;
-      block2[2] = append[0] >> 16 | append[1] << 16;
-      block2[3] = append[1] >> 16;
-      break;
-
-    case 39:
-      block2[1] = block2[1]       | append[0] << 24;
-      block2[2] = append[0] >>  8 | append[1] << 24;
-      block2[3] = append[1] >>  8;
-      break;
-
-    case 40:
-      block2[2] = append[0];
-      block2[3] = append[1];
-      break;
-
-    case 41:
-      block2[2] = block2[2]       | append[0] <<  8;
-      block2[3] = append[0] >> 24 | append[1] <<  8;
-      block3[0] = append[1] >> 24;
-      break;
-
-    case 42:
-      block2[2] = block2[2]       | append[0] << 16;
-      block2[3] = append[0] >> 16 | append[1] << 16;
-      block3[0] = append[1] >> 16;
-      break;
-
-    case 43:
-      block2[2] = block2[2]       | append[0] << 24;
-      block2[3] = append[0] >>  8 | append[1] << 24;
-      block3[0] = append[1] >>  8;
-      break;
-
-    case 44:
-      block2[3] = append[0];
-      block3[0] = append[1];
-      break;
-
-    case 45:
-      block2[3] = block2[3]       | append[0] <<  8;
-      block3[0] = append[0] >> 24 | append[1] <<  8;
-      block3[1] = append[1] >> 24;
-      break;
-
-    case 46:
-      block2[3] = block2[3]       | append[0] << 16;
-      block3[0] = append[0] >> 16 | append[1] << 16;
-      block3[1] = append[1] >> 16;
-      break;
-
-    case 47:
-      block2[3] = block2[3]       | append[0] << 24;
-      block3[0] = append[0] >>  8 | append[1] << 24;
-      block3[1] = append[1] >>  8;
-      break;
-
-    case 48:
-      block3[0] = append[0];
-      block3[1] = append[1];
-      break;
-
-    case 49:
-      block3[0] = block3[0]       | append[0] <<  8;
-      block3[1] = append[0] >> 24 | append[1] <<  8;
-      block3[2] = append[1] >> 24;
-      break;
-
-    case 50:
-      block3[0] = block3[0]       | append[0] << 16;
-      block3[1] = append[0] >> 16 | append[1] << 16;
-      block3[2] = append[1] >> 16;
-      break;
-
-    case 51:
-      block3[0] = block3[0]       | append[0] << 24;
-      block3[1] = append[0] >>  8 | append[1] << 24;
-      block3[2] = append[1] >>  8;
-      break;
-
-    case 52:
-      block3[1] = append[0];
-      block3[2] = append[1];
-      break;
-
-    case 53:
-      block3[1] = block3[1]       | append[0] <<  8;
-      block3[2] = append[0] >> 24 | append[1] <<  8;
-      block3[3] = append[1] >> 24;
-      break;
-
-    case 54:
-      block3[1] = block3[1]       | append[0] << 16;
-      block3[2] = append[0] >> 16 | append[1] << 16;
-      block3[3] = append[1] >> 16;
-      break;
-
-    case 55:
-      block3[1] = block3[1]       | append[0] << 24;
-      block3[2] = append[0] >>  8 | append[1] << 24;
-      block3[3] = append[1] >>  8;
-      break;
-
-    case 56:
-      block3[2] = append[0];
-      block3[3] = append[1];
-      break;
-  }
-}
-
 #define AESSZ       16        // AES_BLOCK_SIZE
 
 #define BLSZ256     32
@@ -867,8 +478,8 @@ u32 do_round (const u32 *pw, const u32 pw_len, ctx_t *ctx, __local u32 *s_te0, _
             ctx->dgst32[7] = SHA256M_H;
             ctx->dgst_len  = BLSZ256;
             ctx->W_len     = WORDSZ256;
-            sha256_transform (&ctx->W32[ 0], &ctx->W32[ 4], &ctx->W32[ 8], &ctx->W32[12], ctx->dgst32);
-            sha256_transform (&ctx->W32[16], &ctx->W32[20], &ctx->W32[24], &ctx->W32[28], ctx->dgst32);
+            orig_sha256_transform (&ctx->W32[ 0], &ctx->W32[ 4], &ctx->W32[ 8], &ctx->W32[12], ctx->dgst32);
+            orig_sha256_transform (&ctx->W32[16], &ctx->W32[20], &ctx->W32[24], &ctx->W32[28], ctx->dgst32);
             break;
     case 1: ctx->dgst64[0] = SHA384M_A;
             ctx->dgst64[1] = SHA384M_B;
@@ -880,7 +491,7 @@ u32 do_round (const u32 *pw, const u32 pw_len, ctx_t *ctx, __local u32 *s_te0, _
             ctx->dgst64[7] = SHA384M_H;
             ctx->dgst_len  = BLSZ384;
             ctx->W_len     = WORDSZ384;
-            sha384_transform (&ctx->W64[ 0], &ctx->W64[ 4], &ctx->W64[ 8], &ctx->W64[12], ctx->dgst64);
+            orig_sha384_transform (&ctx->W64[ 0], &ctx->W64[ 4], &ctx->W64[ 8], &ctx->W64[12], ctx->dgst64);
             break;
     case 2: ctx->dgst64[0] = SHA512M_A;
             ctx->dgst64[1] = SHA512M_B;
@@ -892,7 +503,7 @@ u32 do_round (const u32 *pw, const u32 pw_len, ctx_t *ctx, __local u32 *s_te0, _
             ctx->dgst64[7] = SHA512M_H;
             ctx->dgst_len  = BLSZ512;
             ctx->W_len     = WORDSZ512;
-            sha512_transform (&ctx->W64[ 0], &ctx->W64[ 4], &ctx->W64[ 8], &ctx->W64[12], ctx->dgst64);
+            orig_sha512_transform (&ctx->W64[ 0], &ctx->W64[ 4], &ctx->W64[ 8], &ctx->W64[12], ctx->dgst64);
             break;
   }
 
@@ -911,11 +522,11 @@ u32 do_round (const u32 *pw, const u32 pw_len, ctx_t *ctx, __local u32 *s_te0, _
 
     switch (ctx->dgst_len)
     {
-      case BLSZ256: sha256_transform (&ctx->W32[ 0], &ctx->W32[ 4], &ctx->W32[ 8], &ctx->W32[12], ctx->dgst32);
+      case BLSZ256: orig_sha256_transform (&ctx->W32[ 0], &ctx->W32[ 4], &ctx->W32[ 8], &ctx->W32[12], ctx->dgst32);
                     break;
-      case BLSZ384: sha384_transform (&ctx->W64[ 0], &ctx->W64[ 4], &ctx->W64[ 8], &ctx->W64[12], ctx->dgst64);
+      case BLSZ384: orig_sha384_transform (&ctx->W64[ 0], &ctx->W64[ 4], &ctx->W64[ 8], &ctx->W64[12], ctx->dgst64);
                     break;
-      case BLSZ512: sha512_transform (&ctx->W64[ 0], &ctx->W64[ 4], &ctx->W64[ 8], &ctx->W64[12], ctx->dgst64);
+      case BLSZ512: orig_sha512_transform (&ctx->W64[ 0], &ctx->W64[ 4], &ctx->W64[ 8], &ctx->W64[12], ctx->dgst64);
                     break;
     }
   }
@@ -1013,7 +624,7 @@ u32 do_round (const u32 *pw, const u32 pw_len, ctx_t *ctx, __local u32 *s_te0, _
 
   switch (ctx->dgst_len)
   {
-    case BLSZ256: sha256_transform (&ctx->W32[ 0], &ctx->W32[ 4], &ctx->W32[ 8], &ctx->W32[12], ctx->dgst32);
+    case BLSZ256: orig_sha256_transform (&ctx->W32[ 0], &ctx->W32[ 4], &ctx->W32[ 8], &ctx->W32[12], ctx->dgst32);
                   ctx->dgst32[ 0] = swap32 (ctx->dgst32[0]);
                   ctx->dgst32[ 1] = swap32 (ctx->dgst32[1]);
                   ctx->dgst32[ 2] = swap32 (ctx->dgst32[2]);
@@ -1031,7 +642,7 @@ u32 do_round (const u32 *pw, const u32 pw_len, ctx_t *ctx, __local u32 *s_te0, _
                   ctx->dgst32[14] = 0;
                   ctx->dgst32[15] = 0;
                   break;
-    case BLSZ384: sha384_transform (&ctx->W64[ 0], &ctx->W64[ 4], &ctx->W64[ 8], &ctx->W64[12], ctx->dgst64);
+    case BLSZ384: orig_sha384_transform (&ctx->W64[ 0], &ctx->W64[ 4], &ctx->W64[ 8], &ctx->W64[12], ctx->dgst64);
                   ctx->dgst64[0] = swap64 (ctx->dgst64[0]);
                   ctx->dgst64[1] = swap64 (ctx->dgst64[1]);
                   ctx->dgst64[2] = swap64 (ctx->dgst64[2]);
@@ -1041,7 +652,7 @@ u32 do_round (const u32 *pw, const u32 pw_len, ctx_t *ctx, __local u32 *s_te0, _
                   ctx->dgst64[6] = 0;
                   ctx->dgst64[7] = 0;
                   break;
-    case BLSZ512: sha512_transform (&ctx->W64[ 0], &ctx->W64[ 4], &ctx->W64[ 8], &ctx->W64[12], ctx->dgst64);
+    case BLSZ512: orig_sha512_transform (&ctx->W64[ 0], &ctx->W64[ 4], &ctx->W64[ 8], &ctx->W64[12], ctx->dgst64);
                   ctx->dgst64[0] = swap64 (ctx->dgst64[0]);
                   ctx->dgst64[1] = swap64 (ctx->dgst64[1]);
                   ctx->dgst64[2] = swap64 (ctx->dgst64[2]);
@@ -1056,7 +667,7 @@ u32 do_round (const u32 *pw, const u32 pw_len, ctx_t *ctx, __local u32 *s_te0, _
   return ex;
 }
 
-__kernel void m10700_init (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pdf17l8_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global pdf_t *pdf_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m10700_init (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pdf17l8_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const pdf_t *pdf_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   /**
    * base
@@ -1066,103 +677,29 @@ __kernel void m10700_init (__global pw_t *pws, __global const kernel_rule_t *rul
 
   if (gid >= gid_max) return;
 
-  u32 w0[4];
+  sha256_ctx_t ctx;
 
-  w0[0] = pws[gid].i[0];
-  w0[1] = pws[gid].i[1];
-  w0[2] = pws[gid].i[2];
-  w0[3] = pws[gid].i[3];
+  sha256_init (&ctx);
 
-  const u32 pw_len = pws[gid].pw_len;
+  sha256_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len);
 
-  /**
-   * salt
-   */
+  sha256_update_global_swap (&ctx, salt_bufs[salt_pos].salt_buf, salt_bufs[salt_pos].salt_len);
 
-  u32 salt_buf[2];
+  sha256_final (&ctx);
 
-  salt_buf[0] = salt_bufs[salt_pos].salt_buf[0];
-  salt_buf[1] = salt_bufs[salt_pos].salt_buf[1];
-
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
-  /**
-   * init
-   */
-
-  u32 block_len = pw_len;
-
-  u32 block0[4];
-
-  block0[0] = w0[0];
-  block0[1] = w0[1];
-  block0[2] = w0[2];
-  block0[3] = w0[3];
-
-  u32 block1[4];
-
-  block1[0] = 0;
-  block1[1] = 0;
-  block1[2] = 0;
-  block1[3] = 0;
-
-  u32 block2[4];
-
-  block2[0] = 0;
-  block2[1] = 0;
-  block2[2] = 0;
-  block2[3] = 0;
-
-  u32 block3[4];
-
-  block3[0] = 0;
-  block3[1] = 0;
-  block3[2] = 0;
-  block3[3] = 0;
-
-  memcat8 (block0, block1, block2, block3, block_len, salt_buf);
-
-  block_len += salt_len;
-
-  append_0x80_2x4 (block0, block1, block_len);
-
-  block3[3] = swap32 (block_len * 8);
-
-  u32 digest[8];
-
-  digest[0] = SHA256M_A;
-  digest[1] = SHA256M_B;
-  digest[2] = SHA256M_C;
-  digest[3] = SHA256M_D;
-  digest[4] = SHA256M_E;
-  digest[5] = SHA256M_F;
-  digest[6] = SHA256M_G;
-  digest[7] = SHA256M_H;
-
-  sha256_transform (block0, block1, block2, block3, digest);
-
-  digest[0] = swap32 (digest[0]);
-  digest[1] = swap32 (digest[1]);
-  digest[2] = swap32 (digest[2]);
-  digest[3] = swap32 (digest[3]);
-  digest[4] = swap32 (digest[4]);
-  digest[5] = swap32 (digest[5]);
-  digest[6] = swap32 (digest[6]);
-  digest[7] = swap32 (digest[7]);
-
-  tmps[gid].dgst32[0] = digest[0];
-  tmps[gid].dgst32[1] = digest[1];
-  tmps[gid].dgst32[2] = digest[2];
-  tmps[gid].dgst32[3] = digest[3];
-  tmps[gid].dgst32[4] = digest[4];
-  tmps[gid].dgst32[5] = digest[5];
-  tmps[gid].dgst32[6] = digest[6];
-  tmps[gid].dgst32[7] = digest[7];
+  tmps[gid].dgst32[0] = swap32_S (ctx.h[0]);
+  tmps[gid].dgst32[1] = swap32_S (ctx.h[1]);
+  tmps[gid].dgst32[2] = swap32_S (ctx.h[2]);
+  tmps[gid].dgst32[3] = swap32_S (ctx.h[3]);
+  tmps[gid].dgst32[4] = swap32_S (ctx.h[4]);
+  tmps[gid].dgst32[5] = swap32_S (ctx.h[5]);
+  tmps[gid].dgst32[6] = swap32_S (ctx.h[6]);
+  tmps[gid].dgst32[7] = swap32_S (ctx.h[7]);
   tmps[gid].dgst_len  = BLSZ256;
   tmps[gid].W_len     = WORDSZ256;
 }
 
-__kernel void m10700_loop (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pdf17l8_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global pdf_t *pdf_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m10700_loop (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pdf17l8_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const pdf_t *pdf_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   const u32 gid = get_global_id (0);
   const u32 lid = get_local_id (0);
@@ -1262,7 +799,7 @@ __kernel void m10700_loop (__global pw_t *pws, __global const kernel_rule_t *rul
   tmps[gid].W_len     = ctx.W_len;
 }
 
-__kernel void m10700_comp (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pdf17l8_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global pdf_t *pdf_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m10700_comp (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pdf17l8_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const pdf_t *pdf_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   /**
    * modifier
@@ -1278,10 +815,10 @@ __kernel void m10700_comp (__global pw_t *pws, __global const kernel_rule_t *rul
    * digest
    */
 
-  const u32 r0 = swap32 (tmps[gid].dgst32[DGST_R0]);
-  const u32 r1 = swap32 (tmps[gid].dgst32[DGST_R1]);
-  const u32 r2 = swap32 (tmps[gid].dgst32[DGST_R2]);
-  const u32 r3 = swap32 (tmps[gid].dgst32[DGST_R3]);
+  const u32 r0 = swap32_S (tmps[gid].dgst32[DGST_R0]);
+  const u32 r1 = swap32_S (tmps[gid].dgst32[DGST_R1]);
+  const u32 r2 = swap32_S (tmps[gid].dgst32[DGST_R2]);
+  const u32 r3 = swap32_S (tmps[gid].dgst32[DGST_R3]);
 
   #define il_pos 0