Increase salt length for raw-md5 based algorithms

[hashcat.git] / OpenCL / m00030_a3.cl

diff --git a/OpenCL/m00030_a3.cl b/OpenCL/m00030_a3.cl
index 946c887..a79bfc3 100644 (file)
--- a/OpenCL/m00030_a3.cl
+++ b/OpenCL/m00030_a3.cl
@@ -51,32 +51,28 @@ static void m00030m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global k
    */
 
   u32 salt_buf0[4];
+  u32 salt_buf1[4];
+  u32 salt_buf2[4];
+  u32 salt_buf3[4];
 
   salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0];
   salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1];
   salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2];
   salt_buf0[3] = salt_bufs[salt_pos].salt_buf[ 3];
-
-  u32 salt_buf1[4];
-
   salt_buf1[0] = salt_bufs[salt_pos].salt_buf[ 4];
   salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5];
   salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6];
   salt_buf1[3] = salt_bufs[salt_pos].salt_buf[ 7];
-
-  u32 salt_buf2[4];
-
   salt_buf2[0] = salt_bufs[salt_pos].salt_buf[ 8];
-  salt_buf2[1] = 0;
-  salt_buf2[2] = 0;
-  salt_buf2[3] = 0;
-
-  u32 salt_buf3[4];
+  salt_buf2[1] = salt_bufs[salt_pos].salt_buf[ 9];
+  salt_buf2[2] = salt_bufs[salt_pos].salt_buf[10];
+  salt_buf2[3] = salt_bufs[salt_pos].salt_buf[11];
+  salt_buf3[0] = salt_bufs[salt_pos].salt_buf[12];
+  salt_buf3[1] = salt_bufs[salt_pos].salt_buf[13];
+  salt_buf3[2] = salt_bufs[salt_pos].salt_buf[14];
+  salt_buf3[3] = salt_bufs[salt_pos].salt_buf[15];
 
-  salt_buf3[0] = 0;
-  salt_buf3[1] = 0;
-  salt_buf3[2] = 0;
-  salt_buf3[3] = 0;
+  const u32 salt_len = salt_bufs[salt_pos].salt_len;
 
   switch_buffer_by_offset_le_S (salt_buf0, salt_buf1, salt_buf2, salt_buf3, pw_len);
 
@@ -97,11 +93,10 @@ static void m00030m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global k
   w[14] |= salt_buf3[2];
   w[15] |= salt_buf3[3];
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   const u32 pw_salt_len = pw_len + salt_len;
 
   w[14] = pw_salt_len * 8;
+  w[15] = 0;
 
   /**
    * base