Added new hash-mode 13800 = Windows 8+ phone PIN/Password

[hashcat.git] / OpenCL / m10900.cl

diff --git a/OpenCL/m10900.cl b/OpenCL/m10900.cl
index c2f2457..275b049 100644 (file)
--- a/OpenCL/m10900.cl
+++ b/OpenCL/m10900.cl
@@ -7,21 +7,21 @@
 
 #define NEW_SIMD_CODE
 
-#include "include/constants.h"
-#include "include/kernel_vendor.h"
+#include "inc_hash_constants.h"
+#include "inc_vendor.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/simd.c"
+#include "inc_hash_functions.cl"
+#include "inc_types.cl"
+#include "inc_common.cl"
+#include "inc_simd.cl"
 
-#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"
 
 __constant u32 k_sha256[64] =
 {
@@ -71,7 +71,7 @@ void sha256_transform_S (const u32 w0[4], const u32 w1[4], const u32 w2[4], cons
   u32 we_t = w3[2];
   u32 wf_t = w3[3];
 
-  #define ROUND_EXPAND()                              \
+  #define ROUND_EXPAND_S()                            \
   {                                                   \
     w0_t = SHA256_EXPAND_S (we_t, w9_t, w1_t, w0_t);  \
     w1_t = SHA256_EXPAND_S (wf_t, wa_t, w2_t, w1_t);  \
@@ -91,8 +91,8 @@ void sha256_transform_S (const u32 w0[4], const u32 w1[4], const u32 w2[4], cons
     wf_t = SHA256_EXPAND_S (wd_t, w8_t, w0_t, wf_t);  \
   }
 
-  #define ROUND_STEP(i)                                                                   \
-  {                                                                                       \
+  #define ROUND_STEP_S(i)                                                                   \
+  {                                                                                         \
     SHA256_STEP_S (SHA256_F0o, SHA256_F1o, a, b, c, d, e, f, g, h, w0_t, k_sha256[i +  0]); \
     SHA256_STEP_S (SHA256_F0o, SHA256_F1o, h, a, b, c, d, e, f, g, w1_t, k_sha256[i +  1]); \
     SHA256_STEP_S (SHA256_F0o, SHA256_F1o, g, h, a, b, c, d, e, f, w2_t, k_sha256[i +  2]); \
@@ -111,14 +111,14 @@ void sha256_transform_S (const u32 w0[4], const u32 w1[4], const u32 w2[4], cons
     SHA256_STEP_S (SHA256_F0o, SHA256_F1o, b, c, d, e, f, g, h, a, wf_t, k_sha256[i + 15]); \
   }
 
-  ROUND_STEP (0);
+  ROUND_STEP_S (0);
 
   #ifdef _unroll
   #pragma unroll
   #endif
   for (int i = 16; i < 64; i += 16)
   {
-    ROUND_EXPAND (); ROUND_STEP (i);
+    ROUND_EXPAND_S (); ROUND_STEP_S (i);
   }
 
   digest[0] += a;