Revert some RC4 based kernels back to scalar processing

[hashcat.git] / OpenCL / m09710_a3.cl

diff --git a/OpenCL/m09710_a3.cl b/OpenCL/m09710_a3.cl
index 76cfef1..229e836 100644 (file)
--- a/OpenCL/m09710_a3.cl
+++ b/OpenCL/m09710_a3.cl
@@ -5,8 +5,6 @@
 
 #define _OLDOFFICE01_
 
-#define NEW_SIMD_CODE
-
 #include "include/constants.h"
 #include "include/kernel_vendor.h"
 
@@ -37,10 +35,10 @@ static void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j)
   rc4_key->S[j] = tmp;
 }
 
-static void rc4_init_16 (__local RC4_KEY *rc4_key, const u32x data[4])
+static void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 data[4])
 {
-  u32x v = 0x03020100;
-  u32x a = 0x04040404;
+  u32 v = 0x03020100;
+  u32 a = 0x04040404;
 
   __local u32 *ptr = (__local u32 *) rc4_key->S;
 
@@ -88,7 +86,7 @@ static void rc4_init_16 (__local RC4_KEY *rc4_key, const u32x data[4])
   }
 }
 
-static u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32x in[4], u32x out[4])
+static u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 in[4], u32 out[4])
 {
   #pragma unroll
   for (u32 k = 0; k < 4; k++)
@@ -139,29 +137,29 @@ static u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32x in[4], u
   return j;
 }
 
-static void md5_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4])
+static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
 {
-  u32x a = digest[0];
-  u32x b = digest[1];
-  u32x c = digest[2];
-  u32x d = digest[3];
-
-  u32x w0_t = w0[0];
-  u32x w1_t = w0[1];
-  u32x w2_t = w0[2];
-  u32x w3_t = w0[3];
-  u32x w4_t = w1[0];
-  u32x w5_t = w1[1];
-  u32x w6_t = w1[2];
-  u32x w7_t = w1[3];
-  u32x w8_t = w2[0];
-  u32x w9_t = w2[1];
-  u32x wa_t = w2[2];
-  u32x wb_t = w2[3];
-  u32x wc_t = w3[0];
-  u32x wd_t = w3[1];
-  u32x we_t = w3[2];
-  u32x wf_t = w3[3];
+  u32 a = digest[0];
+  u32 b = digest[1];
+  u32 c = digest[2];
+  u32 d = digest[3];
+
+  u32 w0_t = w0[0];
+  u32 w1_t = w0[1];
+  u32 w2_t = w0[2];
+  u32 w3_t = w0[3];
+  u32 w4_t = w1[0];
+  u32 w5_t = w1[1];
+  u32 w6_t = w1[2];
+  u32 w7_t = w1[3];
+  u32 w8_t = w2[0];
+  u32 w9_t = w2[1];
+  u32 wa_t = w2[2];
+  u32 wb_t = w2[3];
+  u32 wc_t = w3[0];
+  u32 wd_t = w3[1];
+  u32 we_t = w3[2];
+  u32 wf_t = w3[3];
 
   MD5_STEP (MD5_Fo, a, b, c, d, w0_t, MD5C00, MD5S00);
   MD5_STEP (MD5_Fo, d, a, b, c, w1_t, MD5C01, MD5S01);
@@ -269,16 +267,16 @@ static void m09710m (__local RC4_KEY rc4_keys[64], u32 w0[4], u32 w1[4], u32 w2[
 
   for (u32 il_pos = 0; il_pos < bfs_cnt; il_pos += VECT_SIZE)
   {
-    const u32x w0r = w0r_create_bft (bfs_buf, il_pos);
+    const u32 w0r = w0r_create_bft (bfs_buf, il_pos);
 
-    const u32x w0lr = w0l | w0r;
+    const u32 w0lr = w0l | w0r;
 
     // first md5 to generate RC4 128 bit key
 
-    u32x w0_t[4];
-    u32x w1_t[4];
-    u32x w2_t[4];
-    u32x w3_t[4];
+    u32 w0_t[4];
+    u32 w1_t[4];
+    u32 w2_t[4];
+    u32 w3_t[4];
 
     w0_t[0]  = w0lr;
     w0_t[1]  = w0[1] & 0xff;
@@ -297,7 +295,7 @@ static void m09710m (__local RC4_KEY rc4_keys[64], u32 w0[4], u32 w1[4], u32 w2[
     w3_t[2]  = 9 * 8;
     w3_t[3]  = 0;
 
-    u32x digest[4];
+    u32 digest[4];
 
     digest[0] = MD5M_A;
     digest[1] = MD5M_B;
@@ -308,7 +306,7 @@ static void m09710m (__local RC4_KEY rc4_keys[64], u32 w0[4], u32 w1[4], u32 w2[
 
     // now the RC4 part
 
-    u32x key[4];
+    u32 key[4];
 
     key[0] = digest[0];
     key[1] = digest[1];
@@ -317,7 +315,7 @@ static void m09710m (__local RC4_KEY rc4_keys[64], u32 w0[4], u32 w1[4], u32 w2[
 
     rc4_init_16 (rc4_key, key);
 
-    u32x out[4];
+    u32 out[4];
 
     u8 j = rc4_next_16 (rc4_key, 0, 0, encryptedVerifier, out);
 
@@ -395,16 +393,16 @@ static void m09710s (__local RC4_KEY rc4_keys[64], u32 w0[4], u32 w1[4], u32 w2[
 
   for (u32 il_pos = 0; il_pos < bfs_cnt; il_pos += VECT_SIZE)
   {
-    const u32x w0r = w0r_create_bft (bfs_buf, il_pos);
+    const u32 w0r = w0r_create_bft (bfs_buf, il_pos);
 
-    const u32x w0lr = w0l | w0r;
+    const u32 w0lr = w0l | w0r;
 
     // first md5 to generate RC4 128 bit key
 
-    u32x w0_t[4];
-    u32x w1_t[4];
-    u32x w2_t[4];
-    u32x w3_t[4];
+    u32 w0_t[4];
+    u32 w1_t[4];
+    u32 w2_t[4];
+    u32 w3_t[4];
 
     w0_t[0]  = w0lr;
     w0_t[1]  = w0[1] & 0xff;
@@ -423,7 +421,7 @@ static void m09710s (__local RC4_KEY rc4_keys[64], u32 w0[4], u32 w1[4], u32 w2[
     w3_t[2]  = 9 * 8;
     w3_t[3]  = 0;
 
-    u32x digest[4];
+    u32 digest[4];
 
     digest[0] = MD5M_A;
     digest[1] = MD5M_B;
@@ -434,7 +432,7 @@ static void m09710s (__local RC4_KEY rc4_keys[64], u32 w0[4], u32 w1[4], u32 w2[
 
     // now the RC4 part
 
-    u32x key[4];
+    u32 key[4];
 
     key[0] = digest[0];
     key[1] = digest[1];
@@ -443,7 +441,7 @@ static void m09710s (__local RC4_KEY rc4_keys[64], u32 w0[4], u32 w1[4], u32 w2[
 
     rc4_init_16 (rc4_key, key);
 
-    u32x out[4];
+    u32 out[4];
 
     u8 j = rc4_next_16 (rc4_key, 0, 0, encryptedVerifier, out);