Increase 1Password, cloudkeychain cracking performance

[hashcat.git] / OpenCL / m11600.cl

diff --git a/OpenCL/m11600.cl b/OpenCL/m11600.cl
index 16bc140..00ae013 100644 (file)
--- a/OpenCL/m11600.cl
+++ b/OpenCL/m11600.cl
@@ -7,20 +7,20 @@
 
 #define _SEVEN_ZIP_
 
-#include "include/constants.h"
-#include "include/kernel_vendor.h"
+#include "inc_hash_constants.h"
+#include "inc_vendor.cl"
 
 #define DGST_R0 0
 #define DGST_R1 1
 #define DGST_R2 2
 #define DGST_R3 3
 
-#include "include/kernel_functions.c"
-#include "OpenCL/types_ocl.c"
-#include "OpenCL/common.c"
+#include "inc_hash_functions.cl"
+#include "inc_types.cl"
+#include "inc_common.cl"
 
-#define COMPARE_S "OpenCL/check_single_comp4.c"
-#define COMPARE_M "OpenCL/check_multi_comp4.c"
+#define COMPARE_S "inc_comp_single.cl"
+#define COMPARE_M "inc_comp_multi.cl"
 
 __constant u32 te0[256] =
 {
@@ -985,7 +985,9 @@ void sha256_transform (const u32 w[16], u32 digest[8])
 
   ROUND_STEP (0);
 
+  #ifdef _unroll
   #pragma unroll
+  #endif
   for (int i = 16; i < 64; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);
@@ -2013,9 +2015,7 @@ __kernel void m11600_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf
 
     if ((out[0] == 0) && (out[1] == 0) && (out[2] == 0) && (out[3] == 0))
     {
-      mark_hash (plains_buf, hashes_shown, digests_offset + 0, gid, 0);
-
-      d_return_buf[lid] = 1;
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, digests_offset + 0, gid, 0);
     }
   }