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 05352e0..e344808 100644 (file)
--- a/include/kernel_functions.c
+++ b/include/kernel_functions.c
@@ -5,19 +5,19 @@
 
 #if defined _MD4_ || defined _DCC2_ || defined _NETNTLMV2_ || defined _KRB5PA_ || defined _MS_DRSR_
 
+#define MD4_F_S(x,y,z)  (((x) & (y)) | ((~(x)) & (z)))
+#define MD4_G_S(x,y,z)  (((x) & (y)) | ((x) & (z)) | ((y) & (z)))
+#define MD4_H_S(x,y,z)  ((x) ^ (y) ^ (z))
+
 #ifdef IS_NV
 #if CUDA_ARCH >= 500
 #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)))
@@ -27,12 +27,18 @@
 #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
 
+#ifdef IS_GENERIC
+#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_Fo(x,y,z)   (MD4_F((x), (y), (z)))
+#define MD4_Go(x,y,z)   (MD4_G((x), (y), (z)))
+#endif
+
 #define MD4_STEP(f,a,b,c,d,x,K,s)   \
 {                                   \
   a += K;                           \
@@ -52,20 +58,21 @@
 
 #if defined _MD5_ || defined _MD5H_ || defined _SAPB_ || defined _OLDOFFICE01_ || defined _WPA_ || defined _MD5_SHA1_ || defined _SHA1_MD5_ || defined _NETNTLMV2_ || defined _KRB5PA_ || defined _PBKDF2_MD5_
 
+#define MD5_F_S(x,y,z)  ((z) ^ ((x) & ((y) ^ (z))))
+#define MD5_G_S(x,y,z)  ((y) ^ ((z) & ((x) ^ (y))))
+#define MD5_H_S(x,y,z)  ((x) ^ (y) ^ (z))
+#define MD5_I_S(x,y,z)  ((y) ^ ((x) | ~(z)))
+
 #ifdef IS_NV
 #if CUDA_ARCH >= 500
 #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)))
@@ -76,13 +83,20 @@
 #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)))
 #endif
 
+#ifdef IS_GENERIC
+#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_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)))
+#endif
+
 #define MD5_STEP(f,a,b,c,d,x,K,s)   \
 {                                   \
   a += K;                           \
@@ -103,10 +117,6 @@
 
 #if defined _SHA1_ || defined _SAPG_ || defined _OFFICE2007_ || defined _OFFICE2010_ || defined _OLDOFFICE34_ || defined _ANDROIDFDE_ || defined _DCC2_ || defined _WPA_ || defined _MD5_SHA1_ || defined _SHA1_MD5_ || defined _PSAFE2_ || defined _LOTUS8_ || defined _PBKDF2_SHA1_ || defined _RAR3_ || defined _SHA256_SHA1_
 
-/**
- * SHA1 Functions
- */
-
 #ifdef IS_NV
 #if CUDA_ARCH >= 500
 #define SHA1_F0(x,y,z)  lut3_ca ((x), (y), (z))
@@ -129,6 +139,14 @@
 #define SHA1_F2o(x,y,z) (bitselect ((x), (y), ((x) ^ (z))))
 #endif
 
+#ifdef IS_GENERIC
+#define SHA1_F0(x,y,z)  ((z) ^ ((x) & ((y) ^ (z))))
+#define SHA1_F1(x,y,z)  ((x) ^ (y) ^ (z))
+#define SHA1_F2(x,y,z)  (((x) & (y)) | ((z) & ((x) ^ (y))))
+#define SHA1_F0o(x,y,z) (SHA1_F0 ((x), (y), (z)))
+#define SHA1_F2o(x,y,z) (SHA1_F2 ((x), (y), (z)))
+#endif
+
 #define SHA1_STEP(f,a,b,c,d,e,x)    \
 {                                   \
   e += K;                           \
@@ -168,7 +186,7 @@
 }
 #endif
 
-#if defined _SHA256_ || defined _PDF17L8_ || defined _SEVEN_ZIP_ || defined _ANDROIDFDE_ || defined _CLOUDKEY_ || defined _SCRYPT_ || defined _PBKDF2_SHA256_  || defined _SHA256_SHA1_ || defined _MS_DRSR_
+#if defined _SHA256_ || defined _PDF17L8_ || defined _SEVEN_ZIP_ || defined _ANDROIDFDE_ || defined _CLOUDKEY_ || defined _SCRYPT_ || defined _PBKDF2_SHA256_  || defined _SHA256_SHA1_ || defined _MS_DRSR_ || defined _ANDROIDFDE_SAMSUNG_ || defined _RAR5_
 
 #define SHIFT_RIGHT_32(x,n) ((x) >> (n))
 
@@ -196,6 +214,13 @@
 #define SHA256_F1o(x,y,z) (bitselect ((z), (y), (x)))
 #endif
 
+#ifdef IS_GENERIC
+#define SHA256_F0(x,y,z)  (((x) & (y)) | ((z) & ((x) ^ (y))))
+#define SHA256_F1(x,y,z)  ((z) ^ ((x) & ((y) ^ (z))))
+#define SHA256_F0o(x,y,z) (SHA256_F0 ((x), (y), (z)))
+#define SHA256_F1o(x,y,z) (SHA256_F1 ((x), (y), (z)))
+#endif
+
 #define SHA256_STEP(F0,F1,a,b,c,d,e,f,g,h,x,K)  \
 {                                               \
   h += K;                                       \
@@ -233,9 +258,14 @@
 #define SHA384_F1o(x,y,z) (bitselect ((x), (y), ((x) ^ (z))))
 #endif
 
+#ifdef IS_GENERIC
+#define SHA384_F0o(x,y,z) (SHA384_F0 ((x), (y), (z)))
+#define SHA384_F1o(x,y,z) (SHA384_F1 ((x), (y), (z)))
+#endif
+
 #define SHA384_STEP(F0,F1,a,b,c,d,e,f,g,h,x,K)  \
 {                                               \
-  u64   temp0;                                  \
+  u64x  temp0;                                  \
   temp0  = K;                                   \
   temp0 += x;                                   \
   temp0 += h;                                   \
@@ -251,9 +281,6 @@
 #endif
 
 #if defined _SHA512_ || defined _CLOUDKEY_ || defined _OFFICE2013_ || defined _PDF17L8_ || defined _PBKDF2_SHA512_
-/**
- * SHA512 Functions
- */
 
 #define SHIFT_RIGHT_64(x,n) ((x) >> (n))
 
@@ -275,9 +302,14 @@
 #define SHA512_F1o(x,y,z) (bitselect ((x), (y), ((x) ^ (z))))
 #endif
 
+#ifdef IS_GENERIC
+#define SHA512_F0o(x,y,z) (SHA512_F0 ((x), (y), (z)))
+#define SHA512_F1o(x,y,z) (SHA512_F1 ((x), (y), (z)))
+#endif
+
 #define SHA512_STEP(F0,F1,a,b,c,d,e,f,g,h,x,K)  \
 {                                               \
-  u64   temp0;                                  \
+  u64x  temp0;                                  \
   temp0  = K;                                   \
   temp0 += x;                                   \
   temp0 += h;                                   \
@@ -327,6 +359,16 @@
 #define RIPEMD160_Io(x,y,z)   (bitselect ((y), (x), (z)))
 #endif
 
+#ifdef IS_GENERIC
+#define RIPEMD160_F(x,y,z)    ((x) ^ (y) ^ (z))
+#define RIPEMD160_G(x,y,z)    ((z) ^ ((x) & ((y) ^ (z)))) /* x ? y : z */
+#define RIPEMD160_H(x,y,z)    (((x) | ~(y)) ^ (z))
+#define RIPEMD160_I(x,y,z)    ((y) ^ ((z) & ((x) ^ (y)))) /* z ? x : y */
+#define RIPEMD160_J(x,y,z)    ((x) ^ ((y) | ~(z)))
+#define RIPEMD160_Go(x,y,z)   (RIPEMD160_G ((x), (y), (z)))
+#define RIPEMD160_Io(x,y,z)   (RIPEMD160_I ((x), (y), (z)))
+#endif
+
 #define RIPEMD160_STEP(f,a,b,c,d,e,x,K,s) \
 {                                         \
   a += K;                                 \