X-Git-Url: https://www.flypig.org.uk/git/?a=blobdiff_plain;f=OpenCL%2Fm00500.cl;h=1ee2d07c41bfb6cfcf6ee093e2d3a357dc309a2e;hb=161a6eb4bc643d8e636e96eda613f5137d30da59;hp=705f594f55445d92d92f9ca9635e026a26e217d1;hpb=5c07a412ec247a9e2b32c4d79996c4db5768560c;p=hashcat.git

diff --git a/OpenCL/m00500.cl b/OpenCL/m00500.cl
index 705f594..1ee2d07 100644
--- a/OpenCL/m00500.cl
+++ b/OpenCL/m00500.cl
@@ -5,24 +5,18 @@
 
 #define _MD5_
 
-#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
+#define COMPARE_S "inc_comp_single.cl"
+#define COMPARE_M "inc_comp_multi.cl"
 
-#include "include/kernel_functions.c"
-#include "OpenCL/types_ocl.c"
-#include "OpenCL/common.c"
+#define md5crypt_magic 0x00243124u
 
-#define COMPARE_S "OpenCL/check_single_comp4.c"
-#define COMPARE_M "OpenCL/check_multi_comp4.c"
-
-#define md5crypt_magic 0x00243124
-
-static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
+void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
 {
   u32 a = digest[0];
   u32 b = digest[1];
@@ -46,8 +40,6 @@ static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], co
   u32 we_t = w3[2];
   u32 wf_t = 0;
 
-  u32 tmp2;
-
   MD5_STEP (MD5_Fo, a, b, c, d, w0_t, MD5C00, MD5S00);
   MD5_STEP (MD5_Fo, d, a, b, c, w1_t, MD5C01, MD5S01);
   MD5_STEP (MD5_Fo, c, d, a, b, w2_t, MD5C02, MD5S02);
@@ -82,22 +74,22 @@ static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], co
   MD5_STEP (MD5_Go, c, d, a, b, w7_t, MD5C1e, MD5S12);
   MD5_STEP (MD5_Go, b, c, d, a, wc_t, MD5C1f, MD5S13);
 
-  MD5_STEP (MD5_H1, a, b, c, d, w5_t, MD5C20, MD5S20);
-  MD5_STEP (MD5_H2, d, a, b, c, w8_t, MD5C21, MD5S21);
-  MD5_STEP (MD5_H1, c, d, a, b, wb_t, MD5C22, MD5S22);
-  MD5_STEP (MD5_H2, b, c, d, a, we_t, MD5C23, MD5S23);
-  MD5_STEP (MD5_H1, a, b, c, d, w1_t, MD5C24, MD5S20);
-  MD5_STEP (MD5_H2, d, a, b, c, w4_t, MD5C25, MD5S21);
-  MD5_STEP (MD5_H1, c, d, a, b, w7_t, MD5C26, MD5S22);
-  MD5_STEP (MD5_H2, b, c, d, a, wa_t, MD5C27, MD5S23);
-  MD5_STEP (MD5_H1, a, b, c, d, wd_t, MD5C28, MD5S20);
-  MD5_STEP (MD5_H2, d, a, b, c, w0_t, MD5C29, MD5S21);
-  MD5_STEP (MD5_H1, c, d, a, b, w3_t, MD5C2a, MD5S22);
-  MD5_STEP (MD5_H2, b, c, d, a, w6_t, MD5C2b, MD5S23);
-  MD5_STEP (MD5_H1, a, b, c, d, w9_t, MD5C2c, MD5S20);
-  MD5_STEP (MD5_H2, d, a, b, c, wc_t, MD5C2d, MD5S21);
-  MD5_STEP (MD5_H1, c, d, a, b, wf_t, MD5C2e, MD5S22);
-  MD5_STEP (MD5_H2, b, c, d, a, w2_t, MD5C2f, MD5S23);
+  MD5_STEP (MD5_H , a, b, c, d, w5_t, MD5C20, MD5S20);
+  MD5_STEP (MD5_H , d, a, b, c, w8_t, MD5C21, MD5S21);
+  MD5_STEP (MD5_H , c, d, a, b, wb_t, MD5C22, MD5S22);
+  MD5_STEP (MD5_H , b, c, d, a, we_t, MD5C23, MD5S23);
+  MD5_STEP (MD5_H , a, b, c, d, w1_t, MD5C24, MD5S20);
+  MD5_STEP (MD5_H , d, a, b, c, w4_t, MD5C25, MD5S21);
+  MD5_STEP (MD5_H , c, d, a, b, w7_t, MD5C26, MD5S22);
+  MD5_STEP (MD5_H , b, c, d, a, wa_t, MD5C27, MD5S23);
+  MD5_STEP (MD5_H , a, b, c, d, wd_t, MD5C28, MD5S20);
+  MD5_STEP (MD5_H , d, a, b, c, w0_t, MD5C29, MD5S21);
+  MD5_STEP (MD5_H , c, d, a, b, w3_t, MD5C2a, MD5S22);
+  MD5_STEP (MD5_H , b, c, d, a, w6_t, MD5C2b, MD5S23);
+  MD5_STEP (MD5_H , a, b, c, d, w9_t, MD5C2c, MD5S20);
+  MD5_STEP (MD5_H , d, a, b, c, wc_t, MD5C2d, MD5S21);
+  MD5_STEP (MD5_H , c, d, a, b, wf_t, MD5C2e, MD5S22);
+  MD5_STEP (MD5_H , b, c, d, a, w2_t, MD5C2f, MD5S23);
 
   MD5_STEP (MD5_I , a, b, c, d, w0_t, MD5C30, MD5S30);
   MD5_STEP (MD5_I , d, a, b, c, w7_t, MD5C31, MD5S31);
@@ -122,7 +114,7 @@ static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], co
   digest[3] += d;
 }
 
-static void memcat16 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append[4])
+void memcat16 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append[4])
 {
   u32 tmp0;
   u32 tmp1;
@@ -234,7 +226,7 @@ static void memcat16 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4]
   }
 }
 
-static void memcat16_x80 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append[4])
+void memcat16_x80 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append[4])
 {
   u32 tmp0;
   u32 tmp1;
@@ -346,7 +338,7 @@ static void memcat16_x80 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block
   }
 }
 
-static void memcat8 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append[2])
+void memcat8 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append[2])
 {
   u32 tmp0;
   u32 tmp1;
@@ -438,7 +430,7 @@ static void memcat8 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4],
   }
 }
 
-static void append_sign (u32 block0[4], u32 block1[4], const u32 block_len)
+void append_sign (u32 block0[4], u32 block1[4], const u32 block_len)
 {
   switch (block_len)
   {
@@ -447,18 +439,18 @@ static void append_sign (u32 block0[4], u32 block1[4], const u32 block_len)
       break;
 
     case 1:
-      block0[0] = block0[0]            | md5crypt_magic <<  8;
-      block0[1] = md5crypt_magic >> 24;
+      block0[0] = block0[0]            | md5crypt_magic <<  8u;
+      block0[1] = md5crypt_magic >> 24u;
       break;
 
     case 2:
-      block0[0] = block0[0]            | md5crypt_magic << 16;
-      block0[1] = md5crypt_magic >> 16;
+      block0[0] = block0[0]            | md5crypt_magic << 16u;
+      block0[1] = md5crypt_magic >> 16u;
       break;
 
     case 3:
-      block0[0] = block0[0]            | md5crypt_magic << 24;
-      block0[1] = md5crypt_magic >>  8;
+      block0[0] = block0[0]            | md5crypt_magic << 24u;
+      block0[1] = md5crypt_magic >>  8u;
       break;
 
     case 4:
@@ -466,18 +458,18 @@ static void append_sign (u32 block0[4], u32 block1[4], const u32 block_len)
       break;
 
     case 5:
-      block0[1] = block0[1]            | md5crypt_magic <<  8;
-      block0[2] = md5crypt_magic >> 24;
+      block0[1] = block0[1]            | md5crypt_magic <<  8u;
+      block0[2] = md5crypt_magic >> 24u;
       break;
 
     case 6:
-      block0[1] = block0[1]            | md5crypt_magic << 16;
-      block0[2] = md5crypt_magic >> 16;
+      block0[1] = block0[1]            | md5crypt_magic << 16u;
+      block0[2] = md5crypt_magic >> 16u;
       break;
 
     case 7:
-      block0[1] = block0[1]            | md5crypt_magic << 24;
-      block0[2] = md5crypt_magic >>  8;
+      block0[1] = block0[1]            | md5crypt_magic << 24u;
+      block0[2] = md5crypt_magic >>  8u;
       break;
 
     case 8:
@@ -485,18 +477,18 @@ static void append_sign (u32 block0[4], u32 block1[4], const u32 block_len)
       break;
 
     case 9:
-      block0[2] = block0[2]            | md5crypt_magic <<  8;
-      block0[3] = md5crypt_magic >> 24;
+      block0[2] = block0[2]            | md5crypt_magic <<  8u;
+      block0[3] = md5crypt_magic >> 24u;
       break;
 
     case 10:
-      block0[2] = block0[2]            | md5crypt_magic << 16;
-      block0[3] = md5crypt_magic >> 16;
+      block0[2] = block0[2]            | md5crypt_magic << 16u;
+      block0[3] = md5crypt_magic >> 16u;
       break;
 
     case 11:
-      block0[2] = block0[2]            | md5crypt_magic << 24;
-      block0[3] = md5crypt_magic >>  8;
+      block0[2] = block0[2]            | md5crypt_magic << 24u;
+      block0[3] = md5crypt_magic >>  8u;
       break;
 
     case 12:
@@ -504,23 +496,23 @@ static void append_sign (u32 block0[4], u32 block1[4], const u32 block_len)
       break;
 
     case 13:
-      block0[3] = block0[3]            | md5crypt_magic <<  8;
-      block1[0] = md5crypt_magic >> 24;
+      block0[3] = block0[3]            | md5crypt_magic <<  8u;
+      block1[0] = md5crypt_magic >> 24u;
       break;
 
     case 14:
-      block0[3] = block0[3]            | md5crypt_magic << 16;
-      block1[0] = md5crypt_magic >> 16;
+      block0[3] = block0[3]            | md5crypt_magic << 16u;
+      block1[0] = md5crypt_magic >> 16u;
       break;
 
     case 15:
-      block0[3] = block0[3]            | md5crypt_magic << 24;
-      block1[0] = md5crypt_magic >>  8;
+      block0[3] = block0[3]            | md5crypt_magic << 24u;
+      block1[0] = md5crypt_magic >>  8u;
       break;
   }
 }
 
-static void append_1st (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append)
+void append_1st (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append)
 {
   switch (block_len)
   {
@@ -754,7 +746,7 @@ static void append_1st (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[
   }
 }
 
-__kernel void m00500_init (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global md5crypt_tmp_t *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m00500_init (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global md5crypt_tmp_t *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   /**
    * base
@@ -917,7 +909,7 @@ __kernel void m00500_init (__global pw_t *pws, __global kernel_rule_t *rules_buf
   tmps[gid].digest_buf[3] = digest[3];
 }
 
-__kernel void m00500_loop (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global md5crypt_tmp_t *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m00500_loop (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global md5crypt_tmp_t *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   /**
    * base
@@ -1105,7 +1097,7 @@ __kernel void m00500_loop (__global pw_t *pws, __global kernel_rule_t *rules_buf
   tmps[gid].digest_buf[3] = digest[3];
 }
 
-__kernel void m00500_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global md5crypt_tmp_t *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m00500_comp (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global md5crypt_tmp_t *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   /**
    * modifier