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

[hashcat.git] / OpenCL / m10700.cl

diff --git a/OpenCL/m10700.cl b/OpenCL/m10700.cl
index 32ae0e3..0853af2 100644 (file)
--- a/OpenCL/m10700.cl
+++ b/OpenCL/m10700.cl
@@ -7,20 +7,14 @@
 
 #define _PDF17L8_
 
-#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"
-
-#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"
 
 typedef struct
 {
@@ -132,7 +126,9 @@ void sha256_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const
 
   ROUND256_STEP (0);
 
+  #ifdef _unroll
   #pragma unroll
+  #endif
   for (int i = 16; i < 64; i += 16)
   {
     ROUND256_EXPAND (); ROUND256_STEP (i);
@@ -242,7 +238,9 @@ void sha384_transform (const u64 w0[4], const u64 w1[4], const u64 w2[4], const
 
   ROUND384_STEP (0);
 
+  #ifdef _unroll
   #pragma unroll
+  #endif
   for (int i = 16; i < 80; i += 16)
   {
     ROUND384_EXPAND (); ROUND384_STEP (i);
@@ -352,7 +350,9 @@ void sha512_transform (const u64 w0[4], const u64 w1[4], const u64 w2[4], const
 
   ROUND512_STEP (0);
 
+  #ifdef _unroll
   #pragma unroll
+  #endif
   for (int i = 16; i < 80; i += 16)
   {
     ROUND512_EXPAND (); ROUND512_STEP (i);
@@ -1170,7 +1170,7 @@ void memcat8 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const
 #define WORDSZ384   128
 #define WORDSZ512   128
 
-#define PWMAXSZ     32        // oclHashcat password length limit
+#define PWMAXSZ     32        // hashcat password length limit
 #define BLMAXSZ     BLSZ512
 #define WORDMAXSZ   WORDSZ512