Move macros DGST_R0 - DGST_R3 to host, define dgst_size for opencl kernel from host...

[hashcat.git] / OpenCL / m13400.cl

diff --git a/OpenCL/m13400.cl b/OpenCL/m13400.cl
index e9e36e3..fb13731 100644 (file)
--- a/OpenCL/m13400.cl
+++ b/OpenCL/m13400.cl
@@ -7,19 +7,13 @@
 
 #define _KEEPASS_
 
-#include "include/constants.h"
-#include "include/kernel_vendor.h"
+#include "inc_vendor.cl"
+#include "inc_hash_constants.h"
+#include "inc_hash_functions.cl"
+#include "inc_types.cl"
+#include "inc_common.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 "OpenCL/kernel_twofish256.c"
+#include "inc_cipher_twofish256.cl"
 
 __constant u32 te0[256] =
 {
@@ -1074,7 +1068,9 @@ void sha256_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const
 
   ROUND_STEP (0);
 
+  #ifdef _unroll
   #pragma unroll
+  #endif
   for (int i = 16; i < 64; i += 16)
   {
     ROUND_EXPAND (); ROUND_STEP (i);
@@ -1756,9 +1752,7 @@ __kernel void m13400_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf
         && esalt_bufs[salt_pos].contents_hash[6] == final_digest[6]
         && esalt_bufs[salt_pos].contents_hash[7] == final_digest[7])
         {
-          mark_hash (plains_buf, hashes_shown, digests_offset, gid, il_pos);
-
-          d_return_buf[lid] = 1;
+          mark_hash (plains_buf, d_return_buf, salt_pos, 0, digests_offset + 0, gid, il_pos);
         }
     }
     else
@@ -1962,9 +1956,7 @@ __kernel void m13400_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf
         && esalt_bufs[salt_pos].contents_hash[6] == final_digest[6]
         && esalt_bufs[salt_pos].contents_hash[7] == final_digest[7])
         {
-          mark_hash (plains_buf, hashes_shown, digests_offset, gid, il_pos);
-
-          d_return_buf[lid] = 1;
+          mark_hash (plains_buf, d_return_buf, salt_pos, 0, digests_offset + 0, gid, il_pos);
         }
     }
   }
@@ -2002,9 +1994,7 @@ __kernel void m13400_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf
       && esalt_bufs[salt_pos].expected_bytes[2] == out[2]
       && esalt_bufs[salt_pos].expected_bytes[3] == out[3])
       {
-        mark_hash (plains_buf, hashes_shown, digests_offset, gid, il_pos);
-
-        d_return_buf[lid] = 1;
+        mark_hash (plains_buf, d_return_buf, salt_pos, 0, digests_offset + 0, gid, il_pos);
       }
   }
 }