X-Git-Url: https://www.flypig.org.uk/git/?a=blobdiff_plain;f=OpenCL%2Fm08600_a1.cl;h=bb08ebe6109a7a718b1b70cdfe224a60eb0f4586;hb=dfc9a5ff6163db6268ca8b9c62b1c2ebd5e57638;hp=517bbe11ed9f6c2235206275a0c8e44b4826155a;hpb=911c8ae1db4529d6907b01182f2872593f250ac5;p=hashcat.git

diff --git a/OpenCL/m08600_a1.cl b/OpenCL/m08600_a1.cl
index 517bbe1..bb08ebe 100644
--- a/OpenCL/m08600_a1.cl
+++ b/OpenCL/m08600_a1.cl
@@ -79,9 +79,6 @@ void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table)
   {
     u32 s = 48;
 
-    #ifdef _unroll
-    #pragma unroll
-    #endif
     for (int j = 0; j < 12; j++)
     {
       u32x tmp_in = in[j];
@@ -115,20 +112,20 @@ void lotus_transform_password (u32x in[4], u32x out[4], __local u32 *s_lotus_mag
   }
 }
 
-void pad (u32x w[4], const u32 len)
+void pad (u32 w[4], const u32 len)
 {
   const u32 val = 16 - len;
 
-  const u32x mask1 = val << 24;
+  const u32 mask1 = val << 24;
 
-  const u32x mask2 = val << 16
+  const u32 mask2 = val << 16
                    | val << 24;
 
-  const u32x mask3 = val <<  8
+  const u32 mask3 = val <<  8
                    | val << 16
                    | val << 24;
 
-  const u32x mask4 = val <<  0
+  const u32 mask4 = val <<  0
                    | val <<  8
                    | val << 16
                    | val << 24;
@@ -226,7 +223,7 @@ void mdtransform (u32x state[4], u32x checksum[4], u32x block[4], __local u32 *s
   lotus_transform_password (block, checksum, s_lotus_magic_table);
 }
 
-void domino_big_md (const u32x saved_key[16], const u32x size, u32x state[4], __local u32 *s_lotus_magic_table)
+void domino_big_md (const u32x saved_key[16], const u32 size, u32x state[4], __local u32 *s_lotus_magic_table)
 {
   u32x checksum[4];
 
@@ -237,10 +234,28 @@ void domino_big_md (const u32x saved_key[16], const u32x size, u32x state[4], __
 
   u32x block[4];
 
-  block[0] = saved_key[0];
-  block[1] = saved_key[1];
-  block[2] = saved_key[2];
-  block[3] = saved_key[3];
+  block[0] = 0;
+  block[1] = 0;
+  block[2] = 0;
+  block[3] = 0;
+
+  u32 curpos;
+  u32 idx;
+
+  for (curpos = 0, idx = 0; curpos + 16 < size; curpos += 16, idx += 4)
+  {
+    block[0] = saved_key[idx + 0];
+    block[1] = saved_key[idx + 1];
+    block[2] = saved_key[idx + 2];
+    block[3] = saved_key[idx + 3];
+
+    mdtransform (state, checksum, block, s_lotus_magic_table);
+  }
+
+  block[0] = saved_key[idx + 0];
+  block[1] = saved_key[idx + 1];
+  block[2] = saved_key[idx + 2];
+  block[3] = saved_key[idx + 3];
 
   mdtransform (state, checksum, block, s_lotus_magic_table);