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

[hashcat.git] / OpenCL / m13751.cl

diff --git a/OpenCL/m13751.cl b/OpenCL/m13751.cl
index 3892cde..e498be6 100644 (file)
--- a/OpenCL/m13751.cl
+++ b/OpenCL/m13751.cl
@@ -5,21 +5,15 @@
 
 #define _SHA256_
 
-#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 u32 k_sha256[64] =
 {
@@ -201,22 +195,27 @@ void hmac_sha256_run (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[8], u
 
   sha256_transform (w0, w1, w2, w3, digest);
 
-  w0[0] = digest[0];
-  w0[1] = digest[1];
-  w0[2] = digest[2];
-  w0[3] = digest[3];
-  w1[0] = digest[4];
-  w1[1] = digest[5];
-  w1[2] = digest[6];
-  w1[3] = digest[7];
-  w2[0] = 0x80000000;
-  w2[1] = 0;
-  w2[2] = 0;
-  w2[3] = 0;
-  w3[0] = 0;
-  w3[1] = 0;
-  w3[2] = 0;
-  w3[3] = (64 + 32) * 8;
+  u32 t0[4];
+  u32 t1[4];
+  u32 t2[4];
+  u32 t3[4];
+
+  t0[0] = digest[0];
+  t0[1] = digest[1];
+  t0[2] = digest[2];
+  t0[3] = digest[3];
+  t1[0] = digest[4];
+  t1[1] = digest[5];
+  t1[2] = digest[6];
+  t1[3] = digest[7];
+  t2[0] = 0x80000000;
+  t2[1] = 0;
+  t2[2] = 0;
+  t2[3] = 0;
+  t3[0] = 0;
+  t3[1] = 0;
+  t3[2] = 0;
+  t3[3] = (64 + 32) * 8;
 
   digest[0] = opad[0];
   digest[1] = opad[1];
@@ -227,7 +226,7 @@ void hmac_sha256_run (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[8], u
   digest[6] = opad[6];
   digest[7] = opad[7];
 
-  sha256_transform (w0, w1, w2, w3, digest);
+  sha256_transform (t0, t1, t2, t3, digest);
 }
 
 void hmac_sha256_run2 (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 w4[4], u32 w5[4], u32 w6[4], u32 w7[4], u32 ipad[8], u32 opad[8], u32 digest[8])
@@ -244,22 +243,27 @@ void hmac_sha256_run2 (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 w4[4], u3
   sha256_transform (w0, w1, w2, w3, digest);
   sha256_transform (w4, w5, w6, w7, digest);
 
-  w0[0] = digest[0];
-  w0[1] = digest[1];
-  w0[2] = digest[2];
-  w0[3] = digest[3];
-  w1[0] = digest[4];
-  w1[1] = digest[5];
-  w1[2] = digest[6];
-  w1[3] = digest[7];
-  w2[0] = 0x80000000;
-  w2[1] = 0;
-  w2[2] = 0;
-  w2[3] = 0;
-  w3[0] = 0;
-  w3[1] = 0;
-  w3[2] = 0;
-  w3[3] = (64 + 32) * 8;
+  u32 t0[4];
+  u32 t1[4];
+  u32 t2[4];
+  u32 t3[4];
+
+  t0[0] = digest[0];
+  t0[1] = digest[1];
+  t0[2] = digest[2];
+  t0[3] = digest[3];
+  t1[0] = digest[4];
+  t1[1] = digest[5];
+  t1[2] = digest[6];
+  t1[3] = digest[7];
+  t2[0] = 0x80000000;
+  t2[1] = 0;
+  t2[2] = 0;
+  t2[3] = 0;
+  t3[0] = 0;
+  t3[1] = 0;
+  t3[2] = 0;
+  t3[3] = (64 + 32) * 8;
 
   digest[0] = opad[0];
   digest[1] = opad[1];
@@ -270,7 +274,7 @@ void hmac_sha256_run2 (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 w4[4], u3
   digest[6] = opad[6];
   digest[7] = opad[7];
 
-  sha256_transform (w0, w1, w2, w3, digest);
+  sha256_transform (t0, t1, t2, t3, digest);
 }
 
 u32 u8add (const u32 a, const u32 b)
@@ -663,4 +667,3 @@ __kernel void m13751_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf
     }
   }
 }
-