Remove MD4/MD5 *H1/*H2 functions and use original H functions. Modern compilers will...

[hashcat.git] / OpenCL / m01600.cl

diff --git a/OpenCL/m01600.cl b/OpenCL/m01600.cl
index 4dea217..a50d5f6 100644 (file)
--- a/OpenCL/m01600.cl
+++ b/OpenCL/m01600.cl
@@ -20,8 +20,8 @@
 #define COMPARE_S "OpenCL/check_single_comp4.c"
 #define COMPARE_M "OpenCL/check_multi_comp4.c"
 
-#define md5apr1_magic0 0x72706124
-#define md5apr1_magic1 0x00002431
+#define md5apr1_magic0 0x72706124u
+#define md5apr1_magic1 0x00002431u
 
 static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
 {
@@ -47,8 +47,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);
@@ -83,22 +81,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);
@@ -449,21 +447,21 @@ static void append_sign (u32 block0[4], u32 block1[4], const u32 block_len)
       break;
 
     case 1:
-      block0[0] = block0[0]            | md5apr1_magic0 <<  8;
-      block0[1] = md5apr1_magic0 >> 24 | md5apr1_magic1 <<  8;
-      block0[2] = md5apr1_magic1 >> 24;
+      block0[0] = block0[0]             | md5apr1_magic0 <<  8u;
+      block0[1] = md5apr1_magic0 >> 24u | md5apr1_magic1 <<  8u;
+      block0[2] = md5apr1_magic1 >> 24u;
       break;
 
     case 2:
-      block0[0] = block0[0]            | md5apr1_magic0 << 16;
-      block0[1] = md5apr1_magic0 >> 16 | md5apr1_magic1 << 16;
-      block0[2] = md5apr1_magic1 >> 16;
+      block0[0] = block0[0]             | md5apr1_magic0 << 16u;
+      block0[1] = md5apr1_magic0 >> 16u | md5apr1_magic1 << 16u;
+      block0[2] = md5apr1_magic1 >> 16u;
       break;
 
     case 3:
-      block0[0] = block0[0]            | md5apr1_magic0 << 24;
-      block0[1] = md5apr1_magic0 >>  8 | md5apr1_magic1 << 24;
-      block0[2] = md5apr1_magic1 >>  8;
+      block0[0] = block0[0]             | md5apr1_magic0 << 24u;
+      block0[1] = md5apr1_magic0 >>  8u | md5apr1_magic1 << 24u;
+      block0[2] = md5apr1_magic1 >>  8u;
       break;
 
     case 4:
@@ -472,21 +470,21 @@ static void append_sign (u32 block0[4], u32 block1[4], const u32 block_len)
       break;
 
     case 5:
-      block0[1] = block0[1]            | md5apr1_magic0 <<  8;
-      block0[2] = md5apr1_magic0 >> 24 | md5apr1_magic1 <<  8;
-      block0[3] = md5apr1_magic1 >> 24;
+      block0[1] = block0[1]             | md5apr1_magic0 <<  8u;
+      block0[2] = md5apr1_magic0 >> 24u | md5apr1_magic1 <<  8u;
+      block0[3] = md5apr1_magic1 >> 24u;
       break;
 
     case 6:
-      block0[1] = block0[1]            | md5apr1_magic0 << 16;
-      block0[2] = md5apr1_magic0 >> 16 | md5apr1_magic1 << 16;
-      block0[3] = md5apr1_magic1 >> 16;
+      block0[1] = block0[1]             | md5apr1_magic0 << 16u;
+      block0[2] = md5apr1_magic0 >> 16u | md5apr1_magic1 << 16u;
+      block0[3] = md5apr1_magic1 >> 16u;
       break;
 
     case 7:
-      block0[1] = block0[1]            | md5apr1_magic0 << 24;
-      block0[2] = md5apr1_magic0 >>  8 | md5apr1_magic1 << 24;
-      block0[3] = md5apr1_magic1 >>  8;
+      block0[1] = block0[1]             | md5apr1_magic0 << 24u;
+      block0[2] = md5apr1_magic0 >>  8u | md5apr1_magic1 << 24u;
+      block0[3] = md5apr1_magic1 >>  8u;
       break;
 
     case 8:
@@ -495,21 +493,21 @@ static void append_sign (u32 block0[4], u32 block1[4], const u32 block_len)
       break;
 
     case 9:
-      block0[2] = block0[2]            | md5apr1_magic0 <<  8;
-      block0[3] = md5apr1_magic0 >> 24 | md5apr1_magic1 <<  8;
-      block1[0] = md5apr1_magic1 >> 24;
+      block0[2] = block0[2]             | md5apr1_magic0 <<  8u;
+      block0[3] = md5apr1_magic0 >> 24u | md5apr1_magic1 <<  8u;
+      block1[0] = md5apr1_magic1 >> 24u;
       break;
 
     case 10:
-      block0[2] = block0[2]            | md5apr1_magic0 << 16;
-      block0[3] = md5apr1_magic0 >> 16 | md5apr1_magic1 << 16;
-      block1[0] = md5apr1_magic1 >> 16;
+      block0[2] = block0[2]             | md5apr1_magic0 << 16u;
+      block0[3] = md5apr1_magic0 >> 16u | md5apr1_magic1 << 16u;
+      block1[0] = md5apr1_magic1 >> 16u;
       break;
 
     case 11:
-      block0[2] = block0[2]            | md5apr1_magic0 << 24;
-      block0[3] = md5apr1_magic0 >>  8 | md5apr1_magic1 << 24;
-      block1[0] = md5apr1_magic1 >>  8;
+      block0[2] = block0[2]             | md5apr1_magic0 << 24u;
+      block0[3] = md5apr1_magic0 >>  8u | md5apr1_magic1 << 24u;
+      block1[0] = md5apr1_magic1 >>  8u;
       break;
 
     case 12:
@@ -518,21 +516,21 @@ static void append_sign (u32 block0[4], u32 block1[4], const u32 block_len)
       break;
 
     case 13:
-      block0[3] = block0[3]            | md5apr1_magic0 <<  8;
-      block1[0] = md5apr1_magic0 >> 24 | md5apr1_magic1 <<  8;
-      block1[1] = md5apr1_magic1 >> 24;
+      block0[3] = block0[3]             | md5apr1_magic0 <<  8u;
+      block1[0] = md5apr1_magic0 >> 24u | md5apr1_magic1 <<  8u;
+      block1[1] = md5apr1_magic1 >> 24u;
       break;
 
     case 14:
-      block0[3] = block0[3]            | md5apr1_magic0 << 16;
-      block1[0] = md5apr1_magic0 >> 16 | md5apr1_magic1 << 16;
-      block1[1] = md5apr1_magic1 >> 16;
+      block0[3] = block0[3]             | md5apr1_magic0 << 16u;
+      block1[0] = md5apr1_magic0 >> 16u | md5apr1_magic1 << 16u;
+      block1[1] = md5apr1_magic1 >> 16u;
       break;
 
     case 15:
-      block0[3] = block0[3]            | md5apr1_magic0 << 24;
-      block1[0] = md5apr1_magic0 >>  8 | md5apr1_magic1 << 24;
-      block1[1] = md5apr1_magic1 >>  8;
+      block0[3] = block0[3]             | md5apr1_magic0 << 24u;
+      block1[0] = md5apr1_magic0 >>  8u | md5apr1_magic1 << 24u;
+      block1[1] = md5apr1_magic1 >>  8u;
       break;
   }
 }