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

[hashcat.git] / OpenCL / m06223.cl

diff --git a/OpenCL/m06223.cl b/OpenCL/m06223.cl
index 92f30e0..cb32195 100644 (file)
--- a/OpenCL/m06223.cl
+++ b/OpenCL/m06223.cl
@@ -5,21 +5,15 @@
 
 #define _SHA512_
 
-#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_aes256.c"
-#include "OpenCL/kernel_twofish256.c"
-#include "OpenCL/kernel_serpent256.c"
+#include "inc_cipher_aes256.cl"
+#include "inc_cipher_twofish256.cl"
+#include "inc_cipher_serpent256.cl"
 
 __constant u64 k_sha512[80] =
 {
@@ -579,8 +573,6 @@ __kernel void m06223_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf
     if (((tmp[0] == signature) && (tmp[3] == 0)) || ((tmp[0] == signature) && ((tmp[1] >> 16) <= 5)))
     {
       mark_hash (plains_buf, d_return_buf, salt_pos, 0, 0, gid, 0);
-
-      d_return_buf[lid] = 1;
     }
   }
 
@@ -595,8 +587,6 @@ __kernel void m06223_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf
     if (((tmp[0] == signature) && (tmp[3] == 0)) || ((tmp[0] == signature) && ((tmp[1] >> 16) <= 5)))
     {
       mark_hash (plains_buf, d_return_buf, salt_pos, 0, 0, gid, 0);
-
-      d_return_buf[lid] = 1;
     }
   }
 
@@ -611,8 +601,6 @@ __kernel void m06223_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf
     if (((tmp[0] == signature) && (tmp[3] == 0)) || ((tmp[0] == signature) && ((tmp[1] >> 16) <= 5)))
     {
       mark_hash (plains_buf, d_return_buf, salt_pos, 0, 0, gid, 0);
-
-      d_return_buf[lid] = 1;
     }
   }
 
@@ -650,8 +638,6 @@ __kernel void m06223_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf
     if (((tmp[0] == signature) && (tmp[3] == 0)) || ((tmp[0] == signature) && ((tmp[1] >> 16) <= 5)))
     {
       mark_hash (plains_buf, d_return_buf, salt_pos, 0, 0, gid, 0);
-
-      d_return_buf[lid] = 1;
     }
   }
 
@@ -667,8 +653,6 @@ __kernel void m06223_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf
     if (((tmp[0] == signature) && (tmp[3] == 0)) || ((tmp[0] == signature) && ((tmp[1] >> 16) <= 5)))
     {
       mark_hash (plains_buf, d_return_buf, salt_pos, 0, 0, gid, 0);
-
-      d_return_buf[lid] = 1;
     }
   }
 
@@ -684,8 +668,6 @@ __kernel void m06223_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf
     if (((tmp[0] == signature) && (tmp[3] == 0)) || ((tmp[0] == signature) && ((tmp[1] >> 16) <= 5)))
     {
       mark_hash (plains_buf, d_return_buf, salt_pos, 0, 0, gid, 0);
-
-      d_return_buf[lid] = 1;
     }
   }
 
@@ -724,8 +706,6 @@ __kernel void m06223_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf
     if (((tmp[0] == signature) && (tmp[3] == 0)) || ((tmp[0] == signature) && ((tmp[1] >> 16) <= 5)))
     {
       mark_hash (plains_buf, d_return_buf, salt_pos, 0, 0, gid, 0);
-
-      d_return_buf[lid] = 1;
     }
   }
 
@@ -742,8 +722,6 @@ __kernel void m06223_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf
     if (((tmp[0] == signature) && (tmp[3] == 0)) || ((tmp[0] == signature) && ((tmp[1] >> 16) <= 5)))
     {
       mark_hash (plains_buf, d_return_buf, salt_pos, 0, 0, gid, 0);
-
-      d_return_buf[lid] = 1;
     }
   }
 }