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

[hashcat.git] / OpenCL / m13200.cl

diff --git a/OpenCL/m13200.cl b/OpenCL/m13200.cl
index 3daa846..4036921 100644 (file)
--- a/OpenCL/m13200.cl
+++ b/OpenCL/m13200.cl
@@ -5,19 +5,13 @@
  * License.....: MIT
  */
 
-#define _SHA1_
+#define _AXCRYPT_
 
-#include "include/constants.h"
-#include "include/kernel_vendor.h"
-
-#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_vendor.cl"
+#include "inc_hash_constants.h"
+#include "inc_hash_functions.cl"
+#include "inc_types.cl"
+#include "inc_common.cl"
 
 __constant u32 te0[256] =
 {
@@ -988,28 +982,22 @@ __kernel void m13200_init (__global pw_t *pws, __global kernel_rule_t *rules_buf
   if (gid >= gid_max) return;
 
   u32 w0[4];
+  u32 w1[4];
+  u32 w2[4];
+  u32 w3[4];
 
   w0[0] = pws[gid].i[ 0];
   w0[1] = pws[gid].i[ 1];
   w0[2] = pws[gid].i[ 2];
   w0[3] = pws[gid].i[ 3];
-
-  u32 w1[4];
-
   w1[0] = pws[gid].i[ 4];
   w1[1] = pws[gid].i[ 5];
   w1[2] = pws[gid].i[ 6];
   w1[3] = pws[gid].i[ 7];
-
-  u32 w2[4];
-
   w2[0] = pws[gid].i[ 8];
   w2[1] = pws[gid].i[ 9];
   w2[2] = pws[gid].i[10];
   w2[3] = pws[gid].i[11];
-
-  u32 w3[4];
-
   w3[0] = pws[gid].i[12];
   w3[1] = pws[gid].i[13];
   w3[2] = pws[gid].i[14];
@@ -1033,9 +1021,7 @@ __kernel void m13200_init (__global pw_t *pws, __global kernel_rule_t *rules_buf
   w2[3] = swap32 (w2[3]);
   w3[0] = swap32 (w3[0]);
   w3[1] = swap32 (w3[1]);
-  w3[2] = swap32 (w3[2]);
-  w3[3] = swap32 (w3[3]);
-
+  w3[2] = 0;
   w3[3] = pw_len * 8;
 
   /**
@@ -1227,8 +1213,6 @@ __kernel void m13200_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf
 
   if(tmps[gid].cipher[0]==0xA6A6A6A6 && tmps[gid].cipher[1]==0xA6A6A6A6)
   {
-    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);
   }
 }