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

[hashcat.git] / include / kernel_functions.c

diff --git a/include/kernel_functions.c b/include/kernel_functions.c
index 44cf1b9..e344808 100644 (file)
--- a/include/kernel_functions.c
+++ b/include/kernel_functions.c
@@ -14,14 +14,10 @@
 #define MD4_F(x,y,z)    lut3_ca ((x), (y), (z))
 #define MD4_G(x,y,z)    lut3_e8 ((x), (y), (z))
 #define MD4_H(x,y,z)    lut3_96 ((x), (y), (z))
-#define MD4_H1(x,y,z)   lut3_96 ((x), (y), (z))
-#define MD4_H2(x,y,z)   lut3_96 ((x), (y), (z))
 #else
 #define MD4_F(x,y,z)    (((x) & (y)) | ((~(x)) & (z)))
 #define MD4_G(x,y,z)    (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
 #define MD4_H(x,y,z)    ((x) ^ (y) ^ (z))
-#define MD4_H1(x,y,z)   ((tmp2 = (x) ^ (y)) ^ (z))
-#define MD4_H2(x,y,z)   ((x) ^ tmp2)
 #endif
 #define MD4_Fo(x,y,z)   (MD4_F((x), (y), (z)))
 #define MD4_Go(x,y,z)   (MD4_G((x), (y), (z)))
@@ -31,8 +27,6 @@
 #define MD4_F(x,y,z)    (((x) & (y)) | ((~(x)) & (z)))
 #define MD4_G(x,y,z)    (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
 #define MD4_H(x,y,z)    ((x) ^ (y) ^ (z))
-#define MD4_H1(x,y,z)   ((tmp2 = (x) ^ (y)) ^ (z))
-#define MD4_H2(x,y,z)   ((x) ^ tmp2)
 #define MD4_Fo(x,y,z)   (bitselect ((z), (y), (x)))
 #define MD4_Go(x,y,z)   (bitselect ((x), (y), ((x) ^ (z))))
 #endif
@@ -41,8 +35,6 @@
 #define MD4_F(x,y,z)    (((x) & (y)) | ((~(x)) & (z)))
 #define MD4_G(x,y,z)    (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
 #define MD4_H(x,y,z)    ((x) ^ (y) ^ (z))
-#define MD4_H1(x,y,z)   (MD4_H((x), (y), (z)))
-#define MD4_H2(x,y,z)   (MD4_H((x), (y), (z)))
 #define MD4_Fo(x,y,z)   (MD4_F((x), (y), (z)))
 #define MD4_Go(x,y,z)   (MD4_G((x), (y), (z)))
 #endif
@@ -76,15 +68,11 @@
 #define MD5_F(x,y,z)    lut3_ca ((x), (y), (z))
 #define MD5_G(x,y,z)    lut3_e4 ((x), (y), (z))
 #define MD5_H(x,y,z)    lut3_96 ((x), (y), (z))
-#define MD5_H1(x,y,z)   lut3_96 ((x), (y), (z))
-#define MD5_H2(x,y,z)   lut3_96 ((x), (y), (z))
 #define MD5_I(x,y,z)    lut3_39 ((x), (y), (z))
 #else
 #define MD5_F(x,y,z)    ((z) ^ ((x) & ((y) ^ (z))))
 #define MD5_G(x,y,z)    ((y) ^ ((z) & ((x) ^ (y))))
 #define MD5_H(x,y,z)    ((x) ^ (y) ^ (z))
-#define MD5_H1(x,y,z)   ((tmp2 = (x) ^ (y)) ^ (z))
-#define MD5_H2(x,y,z)   ((x) ^ tmp2)
 #define MD5_I(x,y,z)    ((y) ^ ((x) | ~(z)))
 #endif
 #define MD5_Fo(x,y,z)   (MD5_F((x), (y), (z)))
@@ -95,8 +83,6 @@
 #define MD5_F(x,y,z)    ((z) ^ ((x) & ((y) ^ (z))))
 #define MD5_G(x,y,z)    ((y) ^ ((z) & ((x) ^ (y))))
 #define MD5_H(x,y,z)    ((x) ^ (y) ^ (z))
-#define MD5_H1(x,y,z)   ((tmp2 = (x) ^ (y)) ^ (z))
-#define MD5_H2(x,y,z)   ((x) ^ tmp2)
 #define MD5_I(x,y,z)    (bitselect (0xffffffffU, (x), (z)) ^ (y))
 #define MD5_Fo(x,y,z)   (bitselect ((z), (y), (x)))
 #define MD5_Go(x,y,z)   (bitselect ((y), (x), (z)))
@@ -106,8 +92,6 @@
 #define MD5_F(x,y,z)    ((z) ^ ((x) & ((y) ^ (z))))
 #define MD5_G(x,y,z)    ((y) ^ ((z) & ((x) ^ (y))))
 #define MD5_H(x,y,z)    ((x) ^ (y) ^ (z))
-#define MD5_H1(x,y,z)   (MD5_H((x), (y), (z)))
-#define MD5_H2(x,y,z)   (MD5_H((x), (y), (z)))
 #define MD5_I(x,y,z)    ((y) ^ ((x) | ~(z)))
 #define MD5_Fo(x,y,z)   (MD5_F((x), (y), (z)))
 #define MD5_Go(x,y,z)   (MD5_G((x), (y), (z)))