Merge pull request #311 from fgaudreault/master

[hashcat.git] / OpenCL / m11500_a3.cl

diff --git a/OpenCL/m11500_a3.cl b/OpenCL/m11500_a3.cl
index 4b04f0d..63f97bb 100644 (file)
--- a/OpenCL/m11500_a3.cl
+++ b/OpenCL/m11500_a3.cl
@@ -7,7 +7,8 @@
 
 #define _CRC32_
 
-#define NEW_SIMD_CODE
+//incompatible because of branches
+//#define NEW_SIMD_CODE
 
 #include "include/constants.h"
 #include "include/kernel_vendor.h"
@@ -143,7 +144,7 @@ static void m11500m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global k
   const u32 lid = get_local_id (0);
 
   /**
-   * digest
+   * salt
    */
 
   const u32 iv = salt_bufs[salt_pos].salt_buf[0];
@@ -160,6 +161,10 @@ static void m11500m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global k
 
     const u32x w0 = w0l | w0r;
 
+    /**
+     * crc32
+     */
+
     u32x w_t[16];
 
     w_t[ 0] = w0;
@@ -198,11 +203,15 @@ static void m11500s (u32 w[16], const u32 pw_len, __global pw_t *pws, __global k
   const u32 lid = get_local_id (0);
 
   /**
-   * digest
+   * salt
    */
 
   const u32 iv = salt_bufs[salt_pos].salt_buf[0];
 
+  /**
+   * digest
+   */
+
   const u32 search[4] =
   {
     digests_buf[digests_offset].digest_buf[DGST_R0],
@@ -223,6 +232,10 @@ static void m11500s (u32 w[16], const u32 pw_len, __global pw_t *pws, __global k
 
     const u32x w0 = w0l | w0r;
 
+    /**
+     * crc32
+     */
+
     u32x w_t[16];
 
     w_t[ 0] = w0;