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

[hashcat.git] / OpenCL / m00040_a3.cl

diff --git a/OpenCL/m00040_a3.cl b/OpenCL/m00040_a3.cl
index 937de71..3ea81d9 100644 (file)
--- a/OpenCL/m00040_a3.cl
+++ b/OpenCL/m00040_a3.cl
@@ -169,8 +169,6 @@ static void m00040m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
      * md5
      */
 
-    u32x tmp2;
-
     u32x a = MD5M_A;
     u32x b = MD5M_B;
     u32x c = MD5M_C;
@@ -210,22 +208,22 @@ static void m00040m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
     MD5_STEP (MD5_Go, c, d, a, b, w1_t[3], MD5C1e, MD5S12);
     MD5_STEP (MD5_Go, b, c, d, a, w3_t[0], MD5C1f, MD5S13);
 
-    MD5_STEP (MD5_H1, a, b, c, d, w1_t[1], MD5C20, MD5S20);
-    MD5_STEP (MD5_H2, d, a, b, c, w2_t[0], MD5C21, MD5S21);
-    MD5_STEP (MD5_H1, c, d, a, b, w2_t[3], MD5C22, MD5S22);
-    MD5_STEP (MD5_H2, b, c, d, a, w3_t[2], MD5C23, MD5S23);
-    MD5_STEP (MD5_H1, a, b, c, d, w0_t[1], MD5C24, MD5S20);
-    MD5_STEP (MD5_H2, d, a, b, c, w1_t[0], MD5C25, MD5S21);
-    MD5_STEP (MD5_H1, c, d, a, b, w1_t[3], MD5C26, MD5S22);
-    MD5_STEP (MD5_H2, b, c, d, a, w2_t[2], MD5C27, MD5S23);
-    MD5_STEP (MD5_H1, a, b, c, d, w3_t[1], MD5C28, MD5S20);
-    MD5_STEP (MD5_H2, d, a, b, c, w0_t[0], MD5C29, MD5S21);
-    MD5_STEP (MD5_H1, c, d, a, b, w0_t[3], MD5C2a, MD5S22);
-    MD5_STEP (MD5_H2, b, c, d, a, w1_t[2], MD5C2b, MD5S23);
-    MD5_STEP (MD5_H1, a, b, c, d, w2_t[1], MD5C2c, MD5S20);
-    MD5_STEP (MD5_H2, d, a, b, c, w3_t[0], MD5C2d, MD5S21);
-    MD5_STEP (MD5_H1, c, d, a, b, w3_t[3], MD5C2e, MD5S22);
-    MD5_STEP (MD5_H2, b, c, d, a, w0_t[2], MD5C2f, MD5S23);
+    MD5_STEP (MD5_H , a, b, c, d, w1_t[1], MD5C20, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, w2_t[0], MD5C21, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, w2_t[3], MD5C22, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, w3_t[2], MD5C23, MD5S23);
+    MD5_STEP (MD5_H , a, b, c, d, w0_t[1], MD5C24, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, w1_t[0], MD5C25, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, w1_t[3], MD5C26, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, w2_t[2], MD5C27, MD5S23);
+    MD5_STEP (MD5_H , a, b, c, d, w3_t[1], MD5C28, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, w0_t[0], MD5C29, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, w0_t[3], MD5C2a, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, w1_t[2], MD5C2b, MD5S23);
+    MD5_STEP (MD5_H , a, b, c, d, w2_t[1], MD5C2c, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, w3_t[0], MD5C2d, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, w3_t[3], MD5C2e, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, w0_t[2], MD5C2f, MD5S23);
 
     MD5_STEP (MD5_I , a, b, c, d, w0_t[0], MD5C30, MD5S30);
     MD5_STEP (MD5_I , d, a, b, c, w1_t[3], MD5C31, MD5S31);
@@ -409,8 +407,6 @@ static void m00040s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
      * md5
      */
 
-    u32x tmp2;
-
     u32x a = MD5M_A;
     u32x b = MD5M_B;
     u32x c = MD5M_C;
@@ -450,22 +446,22 @@ static void m00040s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
     MD5_STEP (MD5_Go, c, d, a, b, w1_t[3], MD5C1e, MD5S12);
     MD5_STEP (MD5_Go, b, c, d, a, w3_t[0], MD5C1f, MD5S13);
 
-    MD5_STEP (MD5_H1, a, b, c, d, w1_t[1], MD5C20, MD5S20);
-    MD5_STEP (MD5_H2, d, a, b, c, w2_t[0], MD5C21, MD5S21);
-    MD5_STEP (MD5_H1, c, d, a, b, w2_t[3], MD5C22, MD5S22);
-    MD5_STEP (MD5_H2, b, c, d, a, w3_t[2], MD5C23, MD5S23);
-    MD5_STEP (MD5_H1, a, b, c, d, w0_t[1], MD5C24, MD5S20);
-    MD5_STEP (MD5_H2, d, a, b, c, w1_t[0], MD5C25, MD5S21);
-    MD5_STEP (MD5_H1, c, d, a, b, w1_t[3], MD5C26, MD5S22);
-    MD5_STEP (MD5_H2, b, c, d, a, w2_t[2], MD5C27, MD5S23);
-    MD5_STEP (MD5_H1, a, b, c, d, w3_t[1], MD5C28, MD5S20);
-    MD5_STEP (MD5_H2, d, a, b, c, w0_t[0], MD5C29, MD5S21);
-    MD5_STEP (MD5_H1, c, d, a, b, w0_t[3], MD5C2a, MD5S22);
-    MD5_STEP (MD5_H2, b, c, d, a, w1_t[2], MD5C2b, MD5S23);
-    MD5_STEP (MD5_H1, a, b, c, d, w2_t[1], MD5C2c, MD5S20);
-    MD5_STEP (MD5_H2, d, a, b, c, w3_t[0], MD5C2d, MD5S21);
-    MD5_STEP (MD5_H1, c, d, a, b, w3_t[3], MD5C2e, MD5S22);
-    MD5_STEP (MD5_H2, b, c, d, a, w0_t[2], MD5C2f, MD5S23);
+    MD5_STEP (MD5_H , a, b, c, d, w1_t[1], MD5C20, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, w2_t[0], MD5C21, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, w2_t[3], MD5C22, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, w3_t[2], MD5C23, MD5S23);
+    MD5_STEP (MD5_H , a, b, c, d, w0_t[1], MD5C24, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, w1_t[0], MD5C25, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, w1_t[3], MD5C26, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, w2_t[2], MD5C27, MD5S23);
+    MD5_STEP (MD5_H , a, b, c, d, w3_t[1], MD5C28, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, w0_t[0], MD5C29, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, w0_t[3], MD5C2a, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, w1_t[2], MD5C2b, MD5S23);
+    MD5_STEP (MD5_H , a, b, c, d, w2_t[1], MD5C2c, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, w3_t[0], MD5C2d, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, w3_t[3], MD5C2e, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, w0_t[2], MD5C2f, MD5S23);
 
     MD5_STEP (MD5_I , a, b, c, d, w0_t[0], MD5C30, MD5S30);
     MD5_STEP (MD5_I , d, a, b, c, w1_t[3], MD5C31, MD5S31);