Merge pull request #392 from unix-ninja/master

Various refactor changes

diff --git a/OpenCL/inc_types.cl b/OpenCL/inc_types.cl
index 44a9f7e..f0f4ad5 100644 (file)
--- a/OpenCL/inc_types.cl
+++ b/OpenCL/inc_types.cl
@@ -665,121 +665,7 @@ inline u32 amd_bytealign_S (const u32 a, const u32 b, const u32 c)
 
 typedef struct
 {
-  #if defined _STDOUT_
-  u32  digest_buf[4];
-  #elif defined _DES_
-  u32  digest_buf[4];
-  #elif defined _MD4_
-  u32  digest_buf[4];
-  #elif defined _MD5_
-  u32  digest_buf[4];
-  #elif defined _MD5H_
-  u32  digest_buf[4];
-  #elif defined _SHA1_
-  u32  digest_buf[5];
-  #elif defined _BCRYPT_
-  u32  digest_buf[6];
-  #elif defined _SHA256_
-  u32  digest_buf[8];
-  #elif defined _SHA384_
-  u32  digest_buf[16];
-  #elif defined _SHA512_
-  u32  digest_buf[16];
-  #elif defined _KECCAK_
-  u32  digest_buf[50];
-  #elif defined _RIPEMD160_
-  u32  digest_buf[5];
-  #elif defined _WHIRLPOOL_
-  u32  digest_buf[16];
-  #elif defined _GOST_
-  u32  digest_buf[8];
-  #elif defined _GOST2012_256_
-  u32  digest_buf[8];
-  #elif defined _GOST2012_512_
-  u32  digest_buf[16];
-  #elif defined _SAPB_
-  u32  digest_buf[4];
-  #elif defined _SAPG_
-  u32  digest_buf[5];
-  #elif defined _MYSQL323_
-  u32  digest_buf[4];
-  #elif defined _LOTUS5_
-  u32  digest_buf[4];
-  #elif defined _LOTUS6_
-  u32  digest_buf[4];
-  #elif defined _SCRYPT_
-  u32  digest_buf[8];
-  #elif defined _LOTUS8_
-  u32  digest_buf[4];
-  #elif defined _OFFICE2007_
-  u32  digest_buf[4];
-  #elif defined _OFFICE2010_
-  u32  digest_buf[4];
-  #elif defined _OFFICE2013_
-  u32  digest_buf[4];
-  #elif defined _OLDOFFICE01_
-  u32  digest_buf[4];
-  #elif defined _OLDOFFICE34_
-  u32  digest_buf[4];
-  #elif defined _SIPHASH_
-  u32  digest_buf[4];
-  #elif defined _PBKDF2_MD5_
-  u32  digest_buf[32];
-  #elif defined _PBKDF2_SHA1_
-  u32  digest_buf[32];
-  #elif defined _PBKDF2_SHA256_
-  u32  digest_buf[32];
-  #elif defined _PBKDF2_SHA512_
-  u32  digest_buf[32];
-  #elif defined _PDF17L8_
-  u32  digest_buf[8];
-  #elif defined _CRC32_
-  u32  digest_buf[4];
-  #elif defined _SEVEN_ZIP_
-  u32  digest_buf[4];
-  #elif defined _ANDROIDFDE_
-  u32  digest_buf[4];
-  #elif defined _DCC2_
-  u32  digest_buf[4];
-  #elif defined _WPA_
-  u32  digest_buf[4];
-  #elif defined _MD5_SHA1_
-  u32  digest_buf[4];
-  #elif defined _SHA1_MD5_
-  u32  digest_buf[5];
-  #elif defined _NETNTLMV2_
-  u32  digest_buf[4];
-  #elif defined _KRB5PA_
-  u32  digest_buf[4];
-  #elif defined _CLOUDKEY_
-  u32  digest_buf[8];
-  #elif defined _SCRYPT_
-  u32  digest_buf[4];
-  #elif defined _PSAFE2_
-  u32  digest_buf[5];
-  #elif defined _LOTUS8_
-  u32  digest_buf[4];
-  #elif defined _RAR3_
-  u32  digest_buf[4];
-  #elif defined _SHA256_SHA1_
-  u32  digest_buf[8];
-  #elif defined _MS_DRSR_
-  u32  digest_buf[8];
-  #elif defined _ANDROIDFDE_SAMSUNG_
-  u32  digest_buf[8];
-  #elif defined _RAR5_
-  u32  digest_buf[4];
-  #elif defined _KRB5TGS_
-  u32  digest_buf[4];
-  #elif defined _AXCRYPT_
-  u32  digest_buf[4];
-  #elif defined _KEEPASS_
-  u32  digest_buf[4];
-  #elif defined _ZIP2_
-  u32  digest_buf[4];
-  #elif defined _AXCRYPT_
-  u32  digest_buf[4];
-  #endif
+  u32 digest_buf[DGST_ELEM];
 
 } digest_t;
 

diff --git a/OpenCL/m00000_a0.cl b/OpenCL/m00000_a0.cl
index cdc550a..4a028e2 100644 (file)
--- a/OpenCL/m00000_a0.cl
+++ b/OpenCL/m00000_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00000_a1.cl b/OpenCL/m00000_a1.cl
index a5df408..f40e18f 100644 (file)
--- a/OpenCL/m00000_a1.cl
+++ b/OpenCL/m00000_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00000_a3.cl b/OpenCL/m00000_a3.cl
index e4d86bd..a566080 100644 (file)
--- a/OpenCL/m00000_a3.cl
+++ b/OpenCL/m00000_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00010_a0.cl b/OpenCL/m00010_a0.cl
index 416dc30..e45a6a1 100644 (file)
--- a/OpenCL/m00010_a0.cl
+++ b/OpenCL/m00010_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00010_a1.cl b/OpenCL/m00010_a1.cl
index e3ffd36..c1c7695 100644 (file)
--- a/OpenCL/m00010_a1.cl
+++ b/OpenCL/m00010_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00010_a3.cl b/OpenCL/m00010_a3.cl
index d923bd3..e61d777 100644 (file)
--- a/OpenCL/m00010_a3.cl
+++ b/OpenCL/m00010_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00020_a0.cl b/OpenCL/m00020_a0.cl
index db3d526..8846ad0 100644 (file)
--- a/OpenCL/m00020_a0.cl
+++ b/OpenCL/m00020_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00020_a1.cl b/OpenCL/m00020_a1.cl
index 8318aa2..91796e8 100644 (file)
--- a/OpenCL/m00020_a1.cl
+++ b/OpenCL/m00020_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00020_a3.cl b/OpenCL/m00020_a3.cl
index d4098f9..d5a95e5 100644 (file)
--- a/OpenCL/m00020_a3.cl
+++ b/OpenCL/m00020_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00030_a0.cl b/OpenCL/m00030_a0.cl
index cd86c4c..f6d479f 100644 (file)
--- a/OpenCL/m00030_a0.cl
+++ b/OpenCL/m00030_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00030_a1.cl b/OpenCL/m00030_a1.cl
index 3ae93f4..be3dc4d 100644 (file)
--- a/OpenCL/m00030_a1.cl
+++ b/OpenCL/m00030_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00030_a3.cl b/OpenCL/m00030_a3.cl
index 4b26384..59de570 100644 (file)
--- a/OpenCL/m00030_a3.cl
+++ b/OpenCL/m00030_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00040_a0.cl b/OpenCL/m00040_a0.cl
index 9521b8d..82aaac5 100644 (file)
--- a/OpenCL/m00040_a0.cl
+++ b/OpenCL/m00040_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00040_a1.cl b/OpenCL/m00040_a1.cl
index 49c6046..5d9cd7c 100644 (file)
--- a/OpenCL/m00040_a1.cl
+++ b/OpenCL/m00040_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00040_a3.cl b/OpenCL/m00040_a3.cl
index abb8c30..d64d038 100644 (file)
--- a/OpenCL/m00040_a3.cl
+++ b/OpenCL/m00040_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00050_a0.cl b/OpenCL/m00050_a0.cl
index 9fc1533..f5200cd 100644 (file)
--- a/OpenCL/m00050_a0.cl
+++ b/OpenCL/m00050_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00050_a1.cl b/OpenCL/m00050_a1.cl
index b269ad0..f40b7a1 100644 (file)
--- a/OpenCL/m00050_a1.cl
+++ b/OpenCL/m00050_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00050_a3.cl b/OpenCL/m00050_a3.cl
index f08226e..0cba567 100644 (file)
--- a/OpenCL/m00050_a3.cl
+++ b/OpenCL/m00050_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00060_a0.cl b/OpenCL/m00060_a0.cl
index e2eeddb..2b7c7ad 100644 (file)
--- a/OpenCL/m00060_a0.cl
+++ b/OpenCL/m00060_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00060_a1.cl b/OpenCL/m00060_a1.cl
index 635b081..8c155d7 100644 (file)
--- a/OpenCL/m00060_a1.cl
+++ b/OpenCL/m00060_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00060_a3.cl b/OpenCL/m00060_a3.cl
index fc636d2..d3244fb 100644 (file)
--- a/OpenCL/m00060_a3.cl
+++ b/OpenCL/m00060_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00100_a0.cl b/OpenCL/m00100_a0.cl
index 7cc5b2b..e36c167 100644 (file)
--- a/OpenCL/m00100_a0.cl
+++ b/OpenCL/m00100_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00100_a1.cl b/OpenCL/m00100_a1.cl
index 39c2177..51a19af 100644 (file)
--- a/OpenCL/m00100_a1.cl
+++ b/OpenCL/m00100_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00100_a3.cl b/OpenCL/m00100_a3.cl
index 455b840..ad7bd9a 100644 (file)
--- a/OpenCL/m00100_a3.cl
+++ b/OpenCL/m00100_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00110_a0.cl b/OpenCL/m00110_a0.cl
index 09dac89..0e2c758 100644 (file)
--- a/OpenCL/m00110_a0.cl
+++ b/OpenCL/m00110_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00110_a1.cl b/OpenCL/m00110_a1.cl
index c92ed52..d14aa12 100644 (file)
--- a/OpenCL/m00110_a1.cl
+++ b/OpenCL/m00110_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00110_a3.cl b/OpenCL/m00110_a3.cl
index b316a68..468ebc3 100644 (file)
--- a/OpenCL/m00110_a3.cl
+++ b/OpenCL/m00110_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00120_a0.cl b/OpenCL/m00120_a0.cl
index 0123ccc..2cd451f 100644 (file)
--- a/OpenCL/m00120_a0.cl
+++ b/OpenCL/m00120_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00120_a1.cl b/OpenCL/m00120_a1.cl
index a31c629..491fdbb 100644 (file)
--- a/OpenCL/m00120_a1.cl
+++ b/OpenCL/m00120_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00120_a3.cl b/OpenCL/m00120_a3.cl
index 080c497..78b5279 100644 (file)
--- a/OpenCL/m00120_a3.cl
+++ b/OpenCL/m00120_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00130_a0.cl b/OpenCL/m00130_a0.cl
index a92db01..642c9ef 100644 (file)
--- a/OpenCL/m00130_a0.cl
+++ b/OpenCL/m00130_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00130_a1.cl b/OpenCL/m00130_a1.cl
index 6f216c5..e35cb3f 100644 (file)
--- a/OpenCL/m00130_a1.cl
+++ b/OpenCL/m00130_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00130_a3.cl b/OpenCL/m00130_a3.cl
index 96fe640..8c8e9bf 100644 (file)
--- a/OpenCL/m00130_a3.cl
+++ b/OpenCL/m00130_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00140_a0.cl b/OpenCL/m00140_a0.cl
index 066f9bf..513519b 100644 (file)
--- a/OpenCL/m00140_a0.cl
+++ b/OpenCL/m00140_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00140_a1.cl b/OpenCL/m00140_a1.cl
index 36a0f92..289814f 100644 (file)
--- a/OpenCL/m00140_a1.cl
+++ b/OpenCL/m00140_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00140_a3.cl b/OpenCL/m00140_a3.cl
index 3439437..812ea51 100644 (file)
--- a/OpenCL/m00140_a3.cl
+++ b/OpenCL/m00140_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00150_a0.cl b/OpenCL/m00150_a0.cl
index 022208a..da02b87 100644 (file)
--- a/OpenCL/m00150_a0.cl
+++ b/OpenCL/m00150_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00150_a1.cl b/OpenCL/m00150_a1.cl
index 9a0e150..06e937c 100644 (file)
--- a/OpenCL/m00150_a1.cl
+++ b/OpenCL/m00150_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00150_a3.cl b/OpenCL/m00150_a3.cl
index 35d1790..4461b1b 100644 (file)
--- a/OpenCL/m00150_a3.cl
+++ b/OpenCL/m00150_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00160_a0.cl b/OpenCL/m00160_a0.cl
index a3c0813..22d0b8e 100644 (file)
--- a/OpenCL/m00160_a0.cl
+++ b/OpenCL/m00160_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00160_a1.cl b/OpenCL/m00160_a1.cl
index 370a7a0..a442772 100644 (file)
--- a/OpenCL/m00160_a1.cl
+++ b/OpenCL/m00160_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00160_a3.cl b/OpenCL/m00160_a3.cl
index 4bb85c7..9d1f5b3 100644 (file)
--- a/OpenCL/m00160_a3.cl
+++ b/OpenCL/m00160_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00200_a0.cl b/OpenCL/m00200_a0.cl
index febb350..84d5788 100644 (file)
--- a/OpenCL/m00200_a0.cl
+++ b/OpenCL/m00200_a0.cl
@@ -8,14 +8,8 @@
 //incompatible
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00200_a1.cl b/OpenCL/m00200_a1.cl
index 390d182..fbbc263 100644 (file)
--- a/OpenCL/m00200_a1.cl
+++ b/OpenCL/m00200_a1.cl
@@ -8,14 +8,8 @@
 //incompatible
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00200_a3.cl b/OpenCL/m00200_a3.cl
index 7605dd8..1eb2071 100644 (file)
--- a/OpenCL/m00200_a3.cl
+++ b/OpenCL/m00200_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00300_a0.cl b/OpenCL/m00300_a0.cl
index c202bbc..c7558a1 100644 (file)
--- a/OpenCL/m00300_a0.cl
+++ b/OpenCL/m00300_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00300_a1.cl b/OpenCL/m00300_a1.cl
index 367751e..a4b4575 100644 (file)
--- a/OpenCL/m00300_a1.cl
+++ b/OpenCL/m00300_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00300_a3.cl b/OpenCL/m00300_a3.cl
index 0f1cfce..e1678af 100644 (file)
--- a/OpenCL/m00300_a3.cl
+++ b/OpenCL/m00300_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00400.cl b/OpenCL/m00400.cl
index c220977..75a89c1 100644 (file)
--- a/OpenCL/m00400.cl
+++ b/OpenCL/m00400.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00500.cl b/OpenCL/m00500.cl
index 462e4ee..67a1f40 100644 (file)
--- a/OpenCL/m00500.cl
+++ b/OpenCL/m00500.cl
@@ -5,14 +5,8 @@
 
 #define _MD5_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00900_a0.cl b/OpenCL/m00900_a0.cl
index 2cb123c..3c86b4a 100644 (file)
--- a/OpenCL/m00900_a0.cl
+++ b/OpenCL/m00900_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00900_a1.cl b/OpenCL/m00900_a1.cl
index 26b2119..d8c2882 100644 (file)
--- a/OpenCL/m00900_a1.cl
+++ b/OpenCL/m00900_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m00900_a3.cl b/OpenCL/m00900_a3.cl
index 2bbf306..f9b99c0 100644 (file)
--- a/OpenCL/m00900_a3.cl
+++ b/OpenCL/m00900_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01000_a0.cl b/OpenCL/m01000_a0.cl
index 1355f15..2b6e642 100644 (file)
--- a/OpenCL/m01000_a0.cl
+++ b/OpenCL/m01000_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01000_a1.cl b/OpenCL/m01000_a1.cl
index 2c0fcf0..9e14082 100644 (file)
--- a/OpenCL/m01000_a1.cl
+++ b/OpenCL/m01000_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01000_a3.cl b/OpenCL/m01000_a3.cl
index 02dffee..ab540b9 100644 (file)
--- a/OpenCL/m01000_a3.cl
+++ b/OpenCL/m01000_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01100_a0.cl b/OpenCL/m01100_a0.cl
index 5408b3a..2dc59ae 100644 (file)
--- a/OpenCL/m01100_a0.cl
+++ b/OpenCL/m01100_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01100_a1.cl b/OpenCL/m01100_a1.cl
index 3e3fd65..2e3e7ec 100644 (file)
--- a/OpenCL/m01100_a1.cl
+++ b/OpenCL/m01100_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01100_a3.cl b/OpenCL/m01100_a3.cl
index 0a11010..e4aadf0 100644 (file)
--- a/OpenCL/m01100_a3.cl
+++ b/OpenCL/m01100_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01400_a0.cl b/OpenCL/m01400_a0.cl
index 3c26ad6..bcc4444 100644 (file)
--- a/OpenCL/m01400_a0.cl
+++ b/OpenCL/m01400_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01400_a1.cl b/OpenCL/m01400_a1.cl
index 392ebf3..35903aa 100644 (file)
--- a/OpenCL/m01400_a1.cl
+++ b/OpenCL/m01400_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01400_a3.cl b/OpenCL/m01400_a3.cl
index da17856..b865b74 100644 (file)
--- a/OpenCL/m01400_a3.cl
+++ b/OpenCL/m01400_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01410_a0.cl b/OpenCL/m01410_a0.cl
index 1eb855d..eba6292 100644 (file)
--- a/OpenCL/m01410_a0.cl
+++ b/OpenCL/m01410_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01410_a1.cl b/OpenCL/m01410_a1.cl
index ef9a0ce..3a039b7 100644 (file)
--- a/OpenCL/m01410_a1.cl
+++ b/OpenCL/m01410_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01410_a3.cl b/OpenCL/m01410_a3.cl
index bfbc8ad..eb493cc 100644 (file)
--- a/OpenCL/m01410_a3.cl
+++ b/OpenCL/m01410_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01420_a0.cl b/OpenCL/m01420_a0.cl
index 13406c7..9583749 100644 (file)
--- a/OpenCL/m01420_a0.cl
+++ b/OpenCL/m01420_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01420_a1.cl b/OpenCL/m01420_a1.cl
index 0bfed86..74f868c 100644 (file)
--- a/OpenCL/m01420_a1.cl
+++ b/OpenCL/m01420_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01420_a3.cl b/OpenCL/m01420_a3.cl
index 4f55994..2603aed 100644 (file)
--- a/OpenCL/m01420_a3.cl
+++ b/OpenCL/m01420_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01430_a0.cl b/OpenCL/m01430_a0.cl
index faa387e..b00a560 100644 (file)
--- a/OpenCL/m01430_a0.cl
+++ b/OpenCL/m01430_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01430_a1.cl b/OpenCL/m01430_a1.cl
index d74da25..afdb5ec 100644 (file)
--- a/OpenCL/m01430_a1.cl
+++ b/OpenCL/m01430_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01430_a3.cl b/OpenCL/m01430_a3.cl
index cca9aa6..fd2a3a2 100644 (file)
--- a/OpenCL/m01430_a3.cl
+++ b/OpenCL/m01430_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01440_a0.cl b/OpenCL/m01440_a0.cl
index 30b7c8a..ddfa05c 100644 (file)
--- a/OpenCL/m01440_a0.cl
+++ b/OpenCL/m01440_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01440_a1.cl b/OpenCL/m01440_a1.cl
index 40944ba..a6d5f73 100644 (file)
--- a/OpenCL/m01440_a1.cl
+++ b/OpenCL/m01440_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01440_a3.cl b/OpenCL/m01440_a3.cl
index 3e945af..7edffb6 100644 (file)
--- a/OpenCL/m01440_a3.cl
+++ b/OpenCL/m01440_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01450_a0.cl b/OpenCL/m01450_a0.cl
index 4b5a534..e1d4463 100644 (file)
--- a/OpenCL/m01450_a0.cl
+++ b/OpenCL/m01450_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01450_a1.cl b/OpenCL/m01450_a1.cl
index 207b8e0..c315707 100644 (file)
--- a/OpenCL/m01450_a1.cl
+++ b/OpenCL/m01450_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01450_a3.cl b/OpenCL/m01450_a3.cl
index 2f2ac61..506d599 100644 (file)
--- a/OpenCL/m01450_a3.cl
+++ b/OpenCL/m01450_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01460_a0.cl b/OpenCL/m01460_a0.cl
index 6f973a3..6a4343d 100644 (file)
--- a/OpenCL/m01460_a0.cl
+++ b/OpenCL/m01460_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01460_a1.cl b/OpenCL/m01460_a1.cl
index 042753e..9731562 100644 (file)
--- a/OpenCL/m01460_a1.cl
+++ b/OpenCL/m01460_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01460_a3.cl b/OpenCL/m01460_a3.cl
index 2ddda1b..314d9ec 100644 (file)
--- a/OpenCL/m01460_a3.cl
+++ b/OpenCL/m01460_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01500_a0.cl b/OpenCL/m01500_a0.cl
index 041b35b..816d21f 100644 (file)
--- a/OpenCL/m01500_a0.cl
+++ b/OpenCL/m01500_a0.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01500_a1.cl b/OpenCL/m01500_a1.cl
index 7cdc7fb..a910eab 100644 (file)
--- a/OpenCL/m01500_a1.cl
+++ b/OpenCL/m01500_a1.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01500_a3.cl b/OpenCL/m01500_a3.cl
index 2d2e94e..2a73789 100644 (file)
--- a/OpenCL/m01500_a3.cl
+++ b/OpenCL/m01500_a3.cl
@@ -7,14 +7,8 @@
 
 #define _DES_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01600.cl b/OpenCL/m01600.cl
index 1b33d2a..6f4d377 100644 (file)
--- a/OpenCL/m01600.cl
+++ b/OpenCL/m01600.cl
@@ -5,14 +5,8 @@
 
 #define _MD5_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01700_a0.cl b/OpenCL/m01700_a0.cl
index c37ed85..cb89da5 100644 (file)
--- a/OpenCL/m01700_a0.cl
+++ b/OpenCL/m01700_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01700_a1.cl b/OpenCL/m01700_a1.cl
index 94486f4..9efaa6e 100644 (file)
--- a/OpenCL/m01700_a1.cl
+++ b/OpenCL/m01700_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01700_a3.cl b/OpenCL/m01700_a3.cl
index 55f94f6..cac18b0 100644 (file)
--- a/OpenCL/m01700_a3.cl
+++ b/OpenCL/m01700_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01710_a0.cl b/OpenCL/m01710_a0.cl
index 7bc0941..62287b9 100644 (file)
--- a/OpenCL/m01710_a0.cl
+++ b/OpenCL/m01710_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01710_a1.cl b/OpenCL/m01710_a1.cl
index 6ea7861..406f2a1 100644 (file)
--- a/OpenCL/m01710_a1.cl
+++ b/OpenCL/m01710_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01710_a3.cl b/OpenCL/m01710_a3.cl
index 44309b7..7f4bbdf 100644 (file)
--- a/OpenCL/m01710_a3.cl
+++ b/OpenCL/m01710_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01720_a0.cl b/OpenCL/m01720_a0.cl
index a065011..771a8e4 100644 (file)
--- a/OpenCL/m01720_a0.cl
+++ b/OpenCL/m01720_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01720_a1.cl b/OpenCL/m01720_a1.cl
index 9e721e4..2eedfa8 100644 (file)
--- a/OpenCL/m01720_a1.cl
+++ b/OpenCL/m01720_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01720_a3.cl b/OpenCL/m01720_a3.cl
index b2f5b9d..8e24047 100644 (file)
--- a/OpenCL/m01720_a3.cl
+++ b/OpenCL/m01720_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01730_a0.cl b/OpenCL/m01730_a0.cl
index 7abf875..0f143c3 100644 (file)
--- a/OpenCL/m01730_a0.cl
+++ b/OpenCL/m01730_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01730_a1.cl b/OpenCL/m01730_a1.cl
index d6c8fe5..72aee86 100644 (file)
--- a/OpenCL/m01730_a1.cl
+++ b/OpenCL/m01730_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01730_a3.cl b/OpenCL/m01730_a3.cl
index 0506776..021c471 100644 (file)
--- a/OpenCL/m01730_a3.cl
+++ b/OpenCL/m01730_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01740_a0.cl b/OpenCL/m01740_a0.cl
index 98d49fe..1f0980b 100644 (file)
--- a/OpenCL/m01740_a0.cl
+++ b/OpenCL/m01740_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01740_a1.cl b/OpenCL/m01740_a1.cl
index cd3c8af..dec6be6 100644 (file)
--- a/OpenCL/m01740_a1.cl
+++ b/OpenCL/m01740_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01740_a3.cl b/OpenCL/m01740_a3.cl
index 84d0c72..134e51f 100644 (file)
--- a/OpenCL/m01740_a3.cl
+++ b/OpenCL/m01740_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01750_a0.cl b/OpenCL/m01750_a0.cl
index c72482b..1f9deeb 100644 (file)
--- a/OpenCL/m01750_a0.cl
+++ b/OpenCL/m01750_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01750_a1.cl b/OpenCL/m01750_a1.cl
index b35a789..eff81f2 100644 (file)
--- a/OpenCL/m01750_a1.cl
+++ b/OpenCL/m01750_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01750_a3.cl b/OpenCL/m01750_a3.cl
index 3de7878..165bd7f 100644 (file)
--- a/OpenCL/m01750_a3.cl
+++ b/OpenCL/m01750_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01760_a0.cl b/OpenCL/m01760_a0.cl
index ed2c409..874f616 100644 (file)
--- a/OpenCL/m01760_a0.cl
+++ b/OpenCL/m01760_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01760_a1.cl b/OpenCL/m01760_a1.cl
index eaa8624..3ba0f6f 100644 (file)
--- a/OpenCL/m01760_a1.cl
+++ b/OpenCL/m01760_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01760_a3.cl b/OpenCL/m01760_a3.cl
index 5bf5380..6dfb4e9 100644 (file)
--- a/OpenCL/m01760_a3.cl
+++ b/OpenCL/m01760_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 14
-#define DGST_R1 15
-#define DGST_R2 6
-#define DGST_R3 7
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m01800.cl b/OpenCL/m01800.cl
index 4af9eb6..ed562fd 100644 (file)
--- a/OpenCL/m01800.cl
+++ b/OpenCL/m01800.cl
@@ -5,14 +5,8 @@
 
 #define _SHA512_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02100.cl b/OpenCL/m02100.cl
index 89e45f8..79ec63c 100644 (file)
--- a/OpenCL/m02100.cl
+++ b/OpenCL/m02100.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02400_a0.cl b/OpenCL/m02400_a0.cl
index 592c3e9..699aa1e 100644 (file)
--- a/OpenCL/m02400_a0.cl
+++ b/OpenCL/m02400_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02400_a1.cl b/OpenCL/m02400_a1.cl
index 452ddb7..2f5036b 100644 (file)
--- a/OpenCL/m02400_a1.cl
+++ b/OpenCL/m02400_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02400_a3.cl b/OpenCL/m02400_a3.cl
index 937bd30..5ce2ed2 100644 (file)
--- a/OpenCL/m02400_a3.cl
+++ b/OpenCL/m02400_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02410_a0.cl b/OpenCL/m02410_a0.cl
index c9d37a8..c957886 100644 (file)
--- a/OpenCL/m02410_a0.cl
+++ b/OpenCL/m02410_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02410_a1.cl b/OpenCL/m02410_a1.cl
index 4e3974f..0494d36 100644 (file)
--- a/OpenCL/m02410_a1.cl
+++ b/OpenCL/m02410_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02410_a3.cl b/OpenCL/m02410_a3.cl
index 4aedaef..edb40d9 100644 (file)
--- a/OpenCL/m02410_a3.cl
+++ b/OpenCL/m02410_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02500.cl b/OpenCL/m02500.cl
index 9f90c54..1501034 100644 (file)
--- a/OpenCL/m02500.cl
+++ b/OpenCL/m02500.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02610_a0.cl b/OpenCL/m02610_a0.cl
index ab4eaf1..6d307f7 100644 (file)
--- a/OpenCL/m02610_a0.cl
+++ b/OpenCL/m02610_a0.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02610_a1.cl b/OpenCL/m02610_a1.cl
index eac506d..eac2ec3 100644 (file)
--- a/OpenCL/m02610_a1.cl
+++ b/OpenCL/m02610_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02610_a3.cl b/OpenCL/m02610_a3.cl
index 677d69c..9d5dd34 100644 (file)
--- a/OpenCL/m02610_a3.cl
+++ b/OpenCL/m02610_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02710_a0.cl b/OpenCL/m02710_a0.cl
index 3fbf245..e773080 100644 (file)
--- a/OpenCL/m02710_a0.cl
+++ b/OpenCL/m02710_a0.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02710_a1.cl b/OpenCL/m02710_a1.cl
index 37a617b..de6bbc1 100644 (file)
--- a/OpenCL/m02710_a1.cl
+++ b/OpenCL/m02710_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02710_a3.cl b/OpenCL/m02710_a3.cl
index dd73e7c..5e9c14a 100644 (file)
--- a/OpenCL/m02710_a3.cl
+++ b/OpenCL/m02710_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02810_a0.cl b/OpenCL/m02810_a0.cl
index c9458fe..7cd0292 100644 (file)
--- a/OpenCL/m02810_a0.cl
+++ b/OpenCL/m02810_a0.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02810_a1.cl b/OpenCL/m02810_a1.cl
index 19ea018..e84202f 100644 (file)
--- a/OpenCL/m02810_a1.cl
+++ b/OpenCL/m02810_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m02810_a3.cl b/OpenCL/m02810_a3.cl
index cdcce5e..3124988 100644 (file)
--- a/OpenCL/m02810_a3.cl
+++ b/OpenCL/m02810_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m03000_a0.cl b/OpenCL/m03000_a0.cl
index 10ad91a..37b1554 100644 (file)
--- a/OpenCL/m03000_a0.cl
+++ b/OpenCL/m03000_a0.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m03000_a1.cl b/OpenCL/m03000_a1.cl
index d500e0a..29ce715 100644 (file)
--- a/OpenCL/m03000_a1.cl
+++ b/OpenCL/m03000_a1.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m03000_a3.cl b/OpenCL/m03000_a3.cl
index cf501f1..60875e4 100644 (file)
--- a/OpenCL/m03000_a3.cl
+++ b/OpenCL/m03000_a3.cl
@@ -6,14 +6,8 @@
 
 #define _DES_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m03100_a0.cl b/OpenCL/m03100_a0.cl
index df52606..f66906e 100644 (file)
--- a/OpenCL/m03100_a0.cl
+++ b/OpenCL/m03100_a0.cl
@@ -11,14 +11,8 @@
 //incompatible
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m03100_a1.cl b/OpenCL/m03100_a1.cl
index 18d7741..699eae3 100644 (file)
--- a/OpenCL/m03100_a1.cl
+++ b/OpenCL/m03100_a1.cl
@@ -10,14 +10,8 @@
 //incompatible
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m03100_a3.cl b/OpenCL/m03100_a3.cl
index 5c25677..98d1c42 100644 (file)
--- a/OpenCL/m03100_a3.cl
+++ b/OpenCL/m03100_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m03200.cl b/OpenCL/m03200.cl
index a278122..ccb8acc 100644 (file)
--- a/OpenCL/m03200.cl
+++ b/OpenCL/m03200.cl
@@ -5,14 +5,8 @@
 
 #define _BCRYPT_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m03710_a0.cl b/OpenCL/m03710_a0.cl
index 74aa5e8..4adf73d 100644 (file)
--- a/OpenCL/m03710_a0.cl
+++ b/OpenCL/m03710_a0.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m03710_a1.cl b/OpenCL/m03710_a1.cl
index c164fdf..c69f45a 100644 (file)
--- a/OpenCL/m03710_a1.cl
+++ b/OpenCL/m03710_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m03710_a3.cl b/OpenCL/m03710_a3.cl
index 9e5eacd..c0dd1f5 100644 (file)
--- a/OpenCL/m03710_a3.cl
+++ b/OpenCL/m03710_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m03800_a0.cl b/OpenCL/m03800_a0.cl
index ee926d8..8314015 100644 (file)
--- a/OpenCL/m03800_a0.cl
+++ b/OpenCL/m03800_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m03800_a1.cl b/OpenCL/m03800_a1.cl
index f727a02..189c4e5 100644 (file)
--- a/OpenCL/m03800_a1.cl
+++ b/OpenCL/m03800_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m03800_a3.cl b/OpenCL/m03800_a3.cl
index 79af82b..866a0e8 100644 (file)
--- a/OpenCL/m03800_a3.cl
+++ b/OpenCL/m03800_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04310_a0.cl b/OpenCL/m04310_a0.cl
index 038f50d..140a19c 100644 (file)
--- a/OpenCL/m04310_a0.cl
+++ b/OpenCL/m04310_a0.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04310_a1.cl b/OpenCL/m04310_a1.cl
index 356fd0e..7ec45cf 100644 (file)
--- a/OpenCL/m04310_a1.cl
+++ b/OpenCL/m04310_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04310_a3.cl b/OpenCL/m04310_a3.cl
index 25c2a75..6887ae0 100644 (file)
--- a/OpenCL/m04310_a3.cl
+++ b/OpenCL/m04310_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04400_a0.cl b/OpenCL/m04400_a0.cl
index e6f65a4..3e6762e 100644 (file)
--- a/OpenCL/m04400_a0.cl
+++ b/OpenCL/m04400_a0.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04400_a1.cl b/OpenCL/m04400_a1.cl
index 64a727b..5bc0877 100644 (file)
--- a/OpenCL/m04400_a1.cl
+++ b/OpenCL/m04400_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04400_a3.cl b/OpenCL/m04400_a3.cl
index 3c587c6..ce5731f 100644 (file)
--- a/OpenCL/m04400_a3.cl
+++ b/OpenCL/m04400_a3.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04500_a0.cl b/OpenCL/m04500_a0.cl
index 7e71655..ad6f9e7 100644 (file)
--- a/OpenCL/m04500_a0.cl
+++ b/OpenCL/m04500_a0.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04500_a1.cl b/OpenCL/m04500_a1.cl
index d58956b..25924dc 100644 (file)
--- a/OpenCL/m04500_a1.cl
+++ b/OpenCL/m04500_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04500_a3.cl b/OpenCL/m04500_a3.cl
index f2c59f2..338dc62 100644 (file)
--- a/OpenCL/m04500_a3.cl
+++ b/OpenCL/m04500_a3.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04700_a0.cl b/OpenCL/m04700_a0.cl
index 3d06321..3cfb76f 100644 (file)
--- a/OpenCL/m04700_a0.cl
+++ b/OpenCL/m04700_a0.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04700_a1.cl b/OpenCL/m04700_a1.cl
index 3f572d3..18408cb 100644 (file)
--- a/OpenCL/m04700_a1.cl
+++ b/OpenCL/m04700_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04700_a3.cl b/OpenCL/m04700_a3.cl
index a5f28cb..10a6a51 100644 (file)
--- a/OpenCL/m04700_a3.cl
+++ b/OpenCL/m04700_a3.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04800_a0.cl b/OpenCL/m04800_a0.cl
index 72183d0..b7aaa70 100644 (file)
--- a/OpenCL/m04800_a0.cl
+++ b/OpenCL/m04800_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04800_a1.cl b/OpenCL/m04800_a1.cl
index 4258491..84d42fb 100644 (file)
--- a/OpenCL/m04800_a1.cl
+++ b/OpenCL/m04800_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04800_a3.cl b/OpenCL/m04800_a3.cl
index 52445bc..e10bb20 100644 (file)
--- a/OpenCL/m04800_a3.cl
+++ b/OpenCL/m04800_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04900_a0.cl b/OpenCL/m04900_a0.cl
index 6ad2453..b021b4e 100644 (file)
--- a/OpenCL/m04900_a0.cl
+++ b/OpenCL/m04900_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04900_a1.cl b/OpenCL/m04900_a1.cl
index 79be593..ae92f48 100644 (file)
--- a/OpenCL/m04900_a1.cl
+++ b/OpenCL/m04900_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m04900_a3.cl b/OpenCL/m04900_a3.cl
index b7b75b8..8459bfb 100644 (file)
--- a/OpenCL/m04900_a3.cl
+++ b/OpenCL/m04900_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05000_a0.cl b/OpenCL/m05000_a0.cl
index 8d53020..7efc42d 100644 (file)
--- a/OpenCL/m05000_a0.cl
+++ b/OpenCL/m05000_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 2
-#define DGST_R1 3
-#define DGST_R2 4
-#define DGST_R3 5
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05000_a1.cl b/OpenCL/m05000_a1.cl
index b6ef979..00b9c0b 100644 (file)
--- a/OpenCL/m05000_a1.cl
+++ b/OpenCL/m05000_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 2
-#define DGST_R1 3
-#define DGST_R2 4
-#define DGST_R3 5
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05000_a3.cl b/OpenCL/m05000_a3.cl
index 30c4ea1..13ddab7 100644 (file)
--- a/OpenCL/m05000_a3.cl
+++ b/OpenCL/m05000_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 2
-#define DGST_R1 3
-#define DGST_R2 4
-#define DGST_R3 5
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05100_a0.cl b/OpenCL/m05100_a0.cl
index e3625a0..3d75ad2 100644 (file)
--- a/OpenCL/m05100_a0.cl
+++ b/OpenCL/m05100_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05100_a1.cl b/OpenCL/m05100_a1.cl
index 7b0f470..3ac0d1f 100644 (file)
--- a/OpenCL/m05100_a1.cl
+++ b/OpenCL/m05100_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05100_a3.cl b/OpenCL/m05100_a3.cl
index 7aa9226..422abb2 100644 (file)
--- a/OpenCL/m05100_a3.cl
+++ b/OpenCL/m05100_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05200.cl b/OpenCL/m05200.cl
index 2fb4547..d956d9e 100644 (file)
--- a/OpenCL/m05200.cl
+++ b/OpenCL/m05200.cl
@@ -5,14 +5,8 @@
 
 #define _SHA256_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05300_a0.cl b/OpenCL/m05300_a0.cl
index 0fc2f1a..170ce54 100644 (file)
--- a/OpenCL/m05300_a0.cl
+++ b/OpenCL/m05300_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05300_a1.cl b/OpenCL/m05300_a1.cl
index 7c53c3b..dc0876b 100644 (file)
--- a/OpenCL/m05300_a1.cl
+++ b/OpenCL/m05300_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05300_a3.cl b/OpenCL/m05300_a3.cl
index 276c2a3..6ff90cf 100644 (file)
--- a/OpenCL/m05300_a3.cl
+++ b/OpenCL/m05300_a3.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05400_a0.cl b/OpenCL/m05400_a0.cl
index a722c53..cf0ce44 100644 (file)
--- a/OpenCL/m05400_a0.cl
+++ b/OpenCL/m05400_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05400_a1.cl b/OpenCL/m05400_a1.cl
index ec2955d..5f93236 100644 (file)
--- a/OpenCL/m05400_a1.cl
+++ b/OpenCL/m05400_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05400_a3.cl b/OpenCL/m05400_a3.cl
index f76af43..e8244d0 100644 (file)
--- a/OpenCL/m05400_a3.cl
+++ b/OpenCL/m05400_a3.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05500_a0.cl b/OpenCL/m05500_a0.cl
index 90b7ad6..9cf6e8f 100644 (file)
--- a/OpenCL/m05500_a0.cl
+++ b/OpenCL/m05500_a0.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05500_a1.cl b/OpenCL/m05500_a1.cl
index 12d2d48..a5aebfb 100644 (file)
--- a/OpenCL/m05500_a1.cl
+++ b/OpenCL/m05500_a1.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05500_a3.cl b/OpenCL/m05500_a3.cl
index d77bb3b..55c8e08 100644 (file)
--- a/OpenCL/m05500_a3.cl
+++ b/OpenCL/m05500_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05600_a0.cl b/OpenCL/m05600_a0.cl
index 678cca8..6b2d903 100644 (file)
--- a/OpenCL/m05600_a0.cl
+++ b/OpenCL/m05600_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05600_a1.cl b/OpenCL/m05600_a1.cl
index 8ce3e69..9a59059 100644 (file)
--- a/OpenCL/m05600_a1.cl
+++ b/OpenCL/m05600_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05600_a3.cl b/OpenCL/m05600_a3.cl
index 90b28a5..bfe3f2d 100644 (file)
--- a/OpenCL/m05600_a3.cl
+++ b/OpenCL/m05600_a3.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m05800.cl b/OpenCL/m05800.cl
index fda4748..6440949 100644 (file)
--- a/OpenCL/m05800.cl
+++ b/OpenCL/m05800.cl
@@ -5,14 +5,8 @@
 
 #define _SHA1_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06000_a0.cl b/OpenCL/m06000_a0.cl
index a9b4310..0dd1c54 100644 (file)
--- a/OpenCL/m06000_a0.cl
+++ b/OpenCL/m06000_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06000_a1.cl b/OpenCL/m06000_a1.cl
index 77d832e..4c3270a 100644 (file)
--- a/OpenCL/m06000_a1.cl
+++ b/OpenCL/m06000_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06000_a3.cl b/OpenCL/m06000_a3.cl
index c9222cd..12a62ad 100644 (file)
--- a/OpenCL/m06000_a3.cl
+++ b/OpenCL/m06000_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06100_a0.cl b/OpenCL/m06100_a0.cl
index 085f790..1179d99 100644 (file)
--- a/OpenCL/m06100_a0.cl
+++ b/OpenCL/m06100_a0.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06100_a1.cl b/OpenCL/m06100_a1.cl
index 2280f21..578f02e 100644 (file)
--- a/OpenCL/m06100_a1.cl
+++ b/OpenCL/m06100_a1.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06100_a3.cl b/OpenCL/m06100_a3.cl
index c26d3fb..af2bd71 100644 (file)
--- a/OpenCL/m06100_a3.cl
+++ b/OpenCL/m06100_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06211.cl b/OpenCL/m06211.cl
index f3895da..79b5e64 100644 (file)
--- a/OpenCL/m06211.cl
+++ b/OpenCL/m06211.cl
@@ -5,14 +5,8 @@
 
 #define _RIPEMD160_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06212.cl b/OpenCL/m06212.cl
index d06cfd8..4dbee3b 100644 (file)
--- a/OpenCL/m06212.cl
+++ b/OpenCL/m06212.cl
@@ -5,14 +5,8 @@
 
 #define _RIPEMD160_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06213.cl b/OpenCL/m06213.cl
index 61a85c1..847de37 100644 (file)
--- a/OpenCL/m06213.cl
+++ b/OpenCL/m06213.cl
@@ -5,14 +5,8 @@
 
 #define _RIPEMD160_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06221.cl b/OpenCL/m06221.cl
index be8041f..dae0817 100644 (file)
--- a/OpenCL/m06221.cl
+++ b/OpenCL/m06221.cl
@@ -5,14 +5,8 @@
 
 #define _SHA512_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06222.cl b/OpenCL/m06222.cl
index 1c09496..538d98c 100644 (file)
--- a/OpenCL/m06222.cl
+++ b/OpenCL/m06222.cl
@@ -5,14 +5,8 @@
 
 #define _SHA512_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06223.cl b/OpenCL/m06223.cl
index 3e7aa8d..cb32195 100644 (file)
--- a/OpenCL/m06223.cl
+++ b/OpenCL/m06223.cl
@@ -5,14 +5,8 @@
 
 #define _SHA512_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06231.cl b/OpenCL/m06231.cl
index 2ead1ea..23479c9 100644 (file)
--- a/OpenCL/m06231.cl
+++ b/OpenCL/m06231.cl
@@ -7,14 +7,8 @@
 
 #define _WHIRLPOOL_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06232.cl b/OpenCL/m06232.cl
index b10280e..6b61960 100644 (file)
--- a/OpenCL/m06232.cl
+++ b/OpenCL/m06232.cl
@@ -7,14 +7,8 @@
 
 #define _WHIRLPOOL_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06233.cl b/OpenCL/m06233.cl
index 0235544..9d711bf 100644 (file)
--- a/OpenCL/m06233.cl
+++ b/OpenCL/m06233.cl
@@ -7,14 +7,8 @@
 
 #define _WHIRLPOOL_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06300.cl b/OpenCL/m06300.cl
index cfdba3b..a4e3dd9 100644 (file)
--- a/OpenCL/m06300.cl
+++ b/OpenCL/m06300.cl
@@ -5,14 +5,8 @@
 
 #define _MD5_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06400.cl b/OpenCL/m06400.cl
index 8c632a5..2e58108 100644 (file)
--- a/OpenCL/m06400.cl
+++ b/OpenCL/m06400.cl
@@ -5,14 +5,8 @@
 
 #define _SHA256_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06500.cl b/OpenCL/m06500.cl
index bacf1a0..31f94f0 100644 (file)
--- a/OpenCL/m06500.cl
+++ b/OpenCL/m06500.cl
@@ -5,14 +5,8 @@
 
 #define _SHA512_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06600.cl b/OpenCL/m06600.cl
index ca2f14e..8b13e9c 100644 (file)
--- a/OpenCL/m06600.cl
+++ b/OpenCL/m06600.cl
@@ -7,14 +7,8 @@
 
 #define _SHA1_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06700.cl b/OpenCL/m06700.cl
index f8b5ff8..e43d6eb 100644 (file)
--- a/OpenCL/m06700.cl
+++ b/OpenCL/m06700.cl
@@ -5,14 +5,8 @@
 
 #define _SHA1_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06800.cl b/OpenCL/m06800.cl
index 6744d6a..dfedd0f 100644 (file)
--- a/OpenCL/m06800.cl
+++ b/OpenCL/m06800.cl
@@ -7,14 +7,8 @@
 
 #define _SHA256_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06900_a0.cl b/OpenCL/m06900_a0.cl
index bbefaff..9953568 100644 (file)
--- a/OpenCL/m06900_a0.cl
+++ b/OpenCL/m06900_a0.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06900_a1.cl b/OpenCL/m06900_a1.cl
index fedc7fa..7cd4d91 100644 (file)
--- a/OpenCL/m06900_a1.cl
+++ b/OpenCL/m06900_a1.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m06900_a3.cl b/OpenCL/m06900_a3.cl
index 66f6f82..c12be5c 100644 (file)
--- a/OpenCL/m06900_a3.cl
+++ b/OpenCL/m06900_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07100.cl b/OpenCL/m07100.cl
index a455e59..901115f 100644 (file)
--- a/OpenCL/m07100.cl
+++ b/OpenCL/m07100.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07300_a0.cl b/OpenCL/m07300_a0.cl
index 27c7a4f..0d3ff0b 100644 (file)
--- a/OpenCL/m07300_a0.cl
+++ b/OpenCL/m07300_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07300_a1.cl b/OpenCL/m07300_a1.cl
index b78560c..67c15df 100644 (file)
--- a/OpenCL/m07300_a1.cl
+++ b/OpenCL/m07300_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07300_a3.cl b/OpenCL/m07300_a3.cl
index 25a0495..b8200b1 100644 (file)
--- a/OpenCL/m07300_a3.cl
+++ b/OpenCL/m07300_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07400.cl b/OpenCL/m07400.cl
index 3fc4600..06fa06e 100644 (file)
--- a/OpenCL/m07400.cl
+++ b/OpenCL/m07400.cl
@@ -5,14 +5,8 @@
 
 #define _SHA256_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07500_a0.cl b/OpenCL/m07500_a0.cl
index ea2e219..22454c7 100644 (file)
--- a/OpenCL/m07500_a0.cl
+++ b/OpenCL/m07500_a0.cl
@@ -8,14 +8,8 @@
 //shared mem too small
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07500_a1.cl b/OpenCL/m07500_a1.cl
index 673df0a..b41b30c 100644 (file)
--- a/OpenCL/m07500_a1.cl
+++ b/OpenCL/m07500_a1.cl
@@ -8,14 +8,8 @@
 //shared mem too small
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07500_a3.cl b/OpenCL/m07500_a3.cl
index dd57cce..781a397 100644 (file)
--- a/OpenCL/m07500_a3.cl
+++ b/OpenCL/m07500_a3.cl
@@ -10,14 +10,8 @@
 //shared mem too small
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07600_a0.cl b/OpenCL/m07600_a0.cl
index 15d1ed1..ef12fac 100644 (file)
--- a/OpenCL/m07600_a0.cl
+++ b/OpenCL/m07600_a0.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07600_a1.cl b/OpenCL/m07600_a1.cl
index b904ed4..f23eddc 100644 (file)
--- a/OpenCL/m07600_a1.cl
+++ b/OpenCL/m07600_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07600_a3.cl b/OpenCL/m07600_a3.cl
index 717d7de..6e1ac1e 100644 (file)
--- a/OpenCL/m07600_a3.cl
+++ b/OpenCL/m07600_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07700_a0.cl b/OpenCL/m07700_a0.cl
index 671d02d..e3ba6b1 100644 (file)
--- a/OpenCL/m07700_a0.cl
+++ b/OpenCL/m07700_a0.cl
@@ -8,14 +8,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07700_a1.cl b/OpenCL/m07700_a1.cl
index bf98509..6a27bf8 100644 (file)
--- a/OpenCL/m07700_a1.cl
+++ b/OpenCL/m07700_a1.cl
@@ -8,14 +8,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07700_a3.cl b/OpenCL/m07700_a3.cl
index 293cc49..4f8e18c 100644 (file)
--- a/OpenCL/m07700_a3.cl
+++ b/OpenCL/m07700_a3.cl
@@ -8,14 +8,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07800_a0.cl b/OpenCL/m07800_a0.cl
index 308b582..5f68e52 100644 (file)
--- a/OpenCL/m07800_a0.cl
+++ b/OpenCL/m07800_a0.cl
@@ -8,14 +8,8 @@
 //incompatible data-dependant code
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07800_a1.cl b/OpenCL/m07800_a1.cl
index 4fd07eb..cae9ffb 100644 (file)
--- a/OpenCL/m07800_a1.cl
+++ b/OpenCL/m07800_a1.cl
@@ -8,14 +8,8 @@
 //incompatible data-dependant code
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07800_a3.cl b/OpenCL/m07800_a3.cl
index 7d1ce5a..20f8361 100644 (file)
--- a/OpenCL/m07800_a3.cl
+++ b/OpenCL/m07800_a3.cl
@@ -8,14 +8,8 @@
 //incompatible data-dependant code
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m07900.cl b/OpenCL/m07900.cl
index 49389d8..3b5ffd1 100644 (file)
--- a/OpenCL/m07900.cl
+++ b/OpenCL/m07900.cl
@@ -5,14 +5,8 @@
 
 #define _SHA512_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08000_a0.cl b/OpenCL/m08000_a0.cl
index 046b84e..cbe1584 100644 (file)
--- a/OpenCL/m08000_a0.cl
+++ b/OpenCL/m08000_a0.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08000_a1.cl b/OpenCL/m08000_a1.cl
index 9ac3580..6d05aa0 100644 (file)
--- a/OpenCL/m08000_a1.cl
+++ b/OpenCL/m08000_a1.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08000_a3.cl b/OpenCL/m08000_a3.cl
index 01f66fb..3ebff33 100644 (file)
--- a/OpenCL/m08000_a3.cl
+++ b/OpenCL/m08000_a3.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08100_a0.cl b/OpenCL/m08100_a0.cl
index 32c8a61..d1f0919 100644 (file)
--- a/OpenCL/m08100_a0.cl
+++ b/OpenCL/m08100_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08100_a1.cl b/OpenCL/m08100_a1.cl
index a7c2d8d..767033f 100644 (file)
--- a/OpenCL/m08100_a1.cl
+++ b/OpenCL/m08100_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08100_a3.cl b/OpenCL/m08100_a3.cl
index 58240d1..8567c4d 100644 (file)
--- a/OpenCL/m08100_a3.cl
+++ b/OpenCL/m08100_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08200.cl b/OpenCL/m08200.cl
index cf1bd15..6358274 100644 (file)
--- a/OpenCL/m08200.cl
+++ b/OpenCL/m08200.cl
@@ -5,14 +5,8 @@
 
 #define _CLOUDKEY_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08300_a0.cl b/OpenCL/m08300_a0.cl
index 84dfa7f..f48546f 100644 (file)
--- a/OpenCL/m08300_a0.cl
+++ b/OpenCL/m08300_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08300_a1.cl b/OpenCL/m08300_a1.cl
index b22986f..e2b040d 100644 (file)
--- a/OpenCL/m08300_a1.cl
+++ b/OpenCL/m08300_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08300_a3.cl b/OpenCL/m08300_a3.cl
index b0e73e1..9ee3cc2 100644 (file)
--- a/OpenCL/m08300_a3.cl
+++ b/OpenCL/m08300_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08400_a0.cl b/OpenCL/m08400_a0.cl
index 06df81f..f614c65 100644 (file)
--- a/OpenCL/m08400_a0.cl
+++ b/OpenCL/m08400_a0.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08400_a1.cl b/OpenCL/m08400_a1.cl
index e408c05..568d4e5 100644 (file)
--- a/OpenCL/m08400_a1.cl
+++ b/OpenCL/m08400_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08400_a3.cl b/OpenCL/m08400_a3.cl
index ce4c926..9968e50 100644 (file)
--- a/OpenCL/m08400_a3.cl
+++ b/OpenCL/m08400_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08500_a0.cl b/OpenCL/m08500_a0.cl
index 6874a7e..b74f372 100644 (file)
--- a/OpenCL/m08500_a0.cl
+++ b/OpenCL/m08500_a0.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08500_a1.cl b/OpenCL/m08500_a1.cl
index d007a1c..41cf5cc 100644 (file)
--- a/OpenCL/m08500_a1.cl
+++ b/OpenCL/m08500_a1.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08500_a3.cl b/OpenCL/m08500_a3.cl
index 6e5058a..1705ac1 100644 (file)
--- a/OpenCL/m08500_a3.cl
+++ b/OpenCL/m08500_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08600_a0.cl b/OpenCL/m08600_a0.cl
index 0d3a671..498899a 100644 (file)
--- a/OpenCL/m08600_a0.cl
+++ b/OpenCL/m08600_a0.cl
@@ -11,14 +11,8 @@
 //incompatible
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08600_a1.cl b/OpenCL/m08600_a1.cl
index 91546bb..c9f8d30 100644 (file)
--- a/OpenCL/m08600_a1.cl
+++ b/OpenCL/m08600_a1.cl
@@ -10,14 +10,8 @@
 //incompatible
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08600_a3.cl b/OpenCL/m08600_a3.cl
index c77019c..20b9985 100644 (file)
--- a/OpenCL/m08600_a3.cl
+++ b/OpenCL/m08600_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08700_a0.cl b/OpenCL/m08700_a0.cl
index 973a797..277ff2c 100644 (file)
--- a/OpenCL/m08700_a0.cl
+++ b/OpenCL/m08700_a0.cl
@@ -11,14 +11,8 @@
 //incompatible
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08700_a1.cl b/OpenCL/m08700_a1.cl
index c7031bd..6c43e57 100644 (file)
--- a/OpenCL/m08700_a1.cl
+++ b/OpenCL/m08700_a1.cl
@@ -10,14 +10,8 @@
 //incompatible
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08700_a3.cl b/OpenCL/m08700_a3.cl
index 9694a84..fc57c9d 100644 (file)
--- a/OpenCL/m08700_a3.cl
+++ b/OpenCL/m08700_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08800.cl b/OpenCL/m08800.cl
index 50c5ca1..fc3c2b5 100644 (file)
--- a/OpenCL/m08800.cl
+++ b/OpenCL/m08800.cl
@@ -7,14 +7,8 @@
 
 #define _ANDROIDFDE_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m08900.cl b/OpenCL/m08900.cl
index 59e5bd8..6b50d19 100644 (file)
--- a/OpenCL/m08900.cl
+++ b/OpenCL/m08900.cl
@@ -5,14 +5,8 @@
 
 #define _SCRYPT_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"
@@ -683,9 +677,11 @@ void scrypt_smix (uint4 *X, uint4 *T, const u32 phy, __global uint4 *V)
   const u32 ySIZE = SCRYPT_N / SCRYPT_TMTO;
   const u32 zSIZE = STATE_CNT4;
 
-  const u32 gid = get_global_id (0);
+  const u32 lid = get_local_id (0);
+  const u32 lsz = get_local_size (0);
+  const u32 rid = get_group_id (0);
 
-  const u32 x = gid % xSIZE;
+  const u32 x = (rid * lsz) + lid;
 
   #ifdef _unroll
   #pragma unroll

diff --git a/OpenCL/m09000.cl b/OpenCL/m09000.cl
index 7b1166b..7bbbeb4 100644 (file)
--- a/OpenCL/m09000.cl
+++ b/OpenCL/m09000.cl
@@ -5,14 +5,8 @@
 
 #define _PSAFE2_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09100.cl b/OpenCL/m09100.cl
index 0204ecd..fd7ab11 100644 (file)
--- a/OpenCL/m09100.cl
+++ b/OpenCL/m09100.cl
@@ -7,14 +7,8 @@
 
 #define _LOTUS8_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 
 #undef _SHA1_

diff --git a/OpenCL/m09400.cl b/OpenCL/m09400.cl
index d28c6b2..f45b7c7 100644 (file)
--- a/OpenCL/m09400.cl
+++ b/OpenCL/m09400.cl
@@ -7,14 +7,8 @@
 
 #define _OFFICE2007_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09500.cl b/OpenCL/m09500.cl
index a51d1fc..d58b5bb 100644 (file)
--- a/OpenCL/m09500.cl
+++ b/OpenCL/m09500.cl
@@ -7,14 +7,8 @@
 
 #define _OFFICE2010_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09600.cl b/OpenCL/m09600.cl
index 18acd46..6ad34b6 100644 (file)
--- a/OpenCL/m09600.cl
+++ b/OpenCL/m09600.cl
@@ -7,14 +7,8 @@
 
 #define _OFFICE2013_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09700_a0.cl b/OpenCL/m09700_a0.cl
index 0c71129..ca7b691 100644 (file)
--- a/OpenCL/m09700_a0.cl
+++ b/OpenCL/m09700_a0.cl
@@ -8,14 +8,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09700_a1.cl b/OpenCL/m09700_a1.cl
index 1fcb15e..3eb3817 100644 (file)
--- a/OpenCL/m09700_a1.cl
+++ b/OpenCL/m09700_a1.cl
@@ -8,14 +8,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09700_a3.cl b/OpenCL/m09700_a3.cl
index d9a4cf9..e256a40 100644 (file)
--- a/OpenCL/m09700_a3.cl
+++ b/OpenCL/m09700_a3.cl
@@ -7,14 +7,8 @@
 
 #define _OLDOFFICE01_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09710_a0.cl b/OpenCL/m09710_a0.cl
index 040abd5..927aa9b 100644 (file)
--- a/OpenCL/m09710_a0.cl
+++ b/OpenCL/m09710_a0.cl
@@ -8,14 +8,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09710_a1.cl b/OpenCL/m09710_a1.cl
index 74e119e..9a92a8d 100644 (file)
--- a/OpenCL/m09710_a1.cl
+++ b/OpenCL/m09710_a1.cl
@@ -8,14 +8,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09710_a3.cl b/OpenCL/m09710_a3.cl
index 17b4adf..df182ef 100644 (file)
--- a/OpenCL/m09710_a3.cl
+++ b/OpenCL/m09710_a3.cl
@@ -10,14 +10,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09720_a0.cl b/OpenCL/m09720_a0.cl
index 8aeb1e2..c83fe9f 100644 (file)
--- a/OpenCL/m09720_a0.cl
+++ b/OpenCL/m09720_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09720_a1.cl b/OpenCL/m09720_a1.cl
index b0c6bba..b7532fd 100644 (file)
--- a/OpenCL/m09720_a1.cl
+++ b/OpenCL/m09720_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09720_a3.cl b/OpenCL/m09720_a3.cl
index 66b5ccd..dd5fd51 100644 (file)
--- a/OpenCL/m09720_a3.cl
+++ b/OpenCL/m09720_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09800_a0.cl b/OpenCL/m09800_a0.cl
index 2267b1a..fd0d5ba 100644 (file)
--- a/OpenCL/m09800_a0.cl
+++ b/OpenCL/m09800_a0.cl
@@ -8,14 +8,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09800_a1.cl b/OpenCL/m09800_a1.cl
index 48cc909..bfb53b6 100644 (file)
--- a/OpenCL/m09800_a1.cl
+++ b/OpenCL/m09800_a1.cl
@@ -8,14 +8,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09800_a3.cl b/OpenCL/m09800_a3.cl
index eaf1fa8..4a04231 100644 (file)
--- a/OpenCL/m09800_a3.cl
+++ b/OpenCL/m09800_a3.cl
@@ -7,14 +7,8 @@
 
 #define _OLDOFFICE34_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09810_a0.cl b/OpenCL/m09810_a0.cl
index b27ee74..6cbdac4 100644 (file)
--- a/OpenCL/m09810_a0.cl
+++ b/OpenCL/m09810_a0.cl
@@ -8,14 +8,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09810_a1.cl b/OpenCL/m09810_a1.cl
index bf1ae52..e3d2e8d 100644 (file)
--- a/OpenCL/m09810_a1.cl
+++ b/OpenCL/m09810_a1.cl
@@ -8,14 +8,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09810_a3.cl b/OpenCL/m09810_a3.cl
index 56cf7c7..8cf9473 100644 (file)
--- a/OpenCL/m09810_a3.cl
+++ b/OpenCL/m09810_a3.cl
@@ -10,14 +10,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09820_a0.cl b/OpenCL/m09820_a0.cl
index 89dda1a..207b0c2 100644 (file)
--- a/OpenCL/m09820_a0.cl
+++ b/OpenCL/m09820_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09820_a1.cl b/OpenCL/m09820_a1.cl
index b8075b3..532a847 100644 (file)
--- a/OpenCL/m09820_a1.cl
+++ b/OpenCL/m09820_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09820_a3.cl b/OpenCL/m09820_a3.cl
index 0b9fc57..47ccc84 100644 (file)
--- a/OpenCL/m09820_a3.cl
+++ b/OpenCL/m09820_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09900_a0.cl b/OpenCL/m09900_a0.cl
index fddcef8..e9a36c4 100644 (file)
--- a/OpenCL/m09900_a0.cl
+++ b/OpenCL/m09900_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09900_a1.cl b/OpenCL/m09900_a1.cl
index 0e63e55..799509c 100644 (file)
--- a/OpenCL/m09900_a1.cl
+++ b/OpenCL/m09900_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m09900_a3.cl b/OpenCL/m09900_a3.cl
index 30bae9b..5dac9c4 100644 (file)
--- a/OpenCL/m09900_a3.cl
+++ b/OpenCL/m09900_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10100_a0.cl b/OpenCL/m10100_a0.cl
index ad82fb4..40b26b0 100644 (file)
--- a/OpenCL/m10100_a0.cl
+++ b/OpenCL/m10100_a0.cl
@@ -8,14 +8,8 @@
 //incompatible to simd
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10100_a1.cl b/OpenCL/m10100_a1.cl
index b797008..beb6141 100644 (file)
--- a/OpenCL/m10100_a1.cl
+++ b/OpenCL/m10100_a1.cl
@@ -8,14 +8,8 @@
 //incompatible to simd
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10100_a3.cl b/OpenCL/m10100_a3.cl
index ded29d3..e7916db 100644 (file)
--- a/OpenCL/m10100_a3.cl
+++ b/OpenCL/m10100_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10300.cl b/OpenCL/m10300.cl
index 2dc8a99..a940fba 100644 (file)
--- a/OpenCL/m10300.cl
+++ b/OpenCL/m10300.cl
@@ -5,14 +5,8 @@
 
 #define _SHA1_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10400_a0.cl b/OpenCL/m10400_a0.cl
index 9094a96..9e764a9 100644 (file)
--- a/OpenCL/m10400_a0.cl
+++ b/OpenCL/m10400_a0.cl
@@ -10,14 +10,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10400_a1.cl b/OpenCL/m10400_a1.cl
index df58488..140bdce 100644 (file)
--- a/OpenCL/m10400_a1.cl
+++ b/OpenCL/m10400_a1.cl
@@ -10,14 +10,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10400_a3.cl b/OpenCL/m10400_a3.cl
index b26f455..ad17652 100644 (file)
--- a/OpenCL/m10400_a3.cl
+++ b/OpenCL/m10400_a3.cl
@@ -10,14 +10,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10410_a0.cl b/OpenCL/m10410_a0.cl
index 51b1d74..3a0f439 100644 (file)
--- a/OpenCL/m10410_a0.cl
+++ b/OpenCL/m10410_a0.cl
@@ -10,14 +10,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10410_a1.cl b/OpenCL/m10410_a1.cl
index c5933ef..3c7c91b 100644 (file)
--- a/OpenCL/m10410_a1.cl
+++ b/OpenCL/m10410_a1.cl
@@ -10,14 +10,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10410_a3.cl b/OpenCL/m10410_a3.cl
index b56c678..d57e215 100644 (file)
--- a/OpenCL/m10410_a3.cl
+++ b/OpenCL/m10410_a3.cl
@@ -10,14 +10,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10420_a0.cl b/OpenCL/m10420_a0.cl
index f9d295b..dc9f8a0 100644 (file)
--- a/OpenCL/m10420_a0.cl
+++ b/OpenCL/m10420_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10420_a1.cl b/OpenCL/m10420_a1.cl
index 9126e2c..2d4d388 100644 (file)
--- a/OpenCL/m10420_a1.cl
+++ b/OpenCL/m10420_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10420_a3.cl b/OpenCL/m10420_a3.cl
index a7abb23..a5ccf82 100644 (file)
--- a/OpenCL/m10420_a3.cl
+++ b/OpenCL/m10420_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10500.cl b/OpenCL/m10500.cl
index 721bfc5..3142741 100644 (file)
--- a/OpenCL/m10500.cl
+++ b/OpenCL/m10500.cl
@@ -5,14 +5,8 @@
 
 #define _MD5_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10700.cl b/OpenCL/m10700.cl
index e0a7389..0853af2 100644 (file)
--- a/OpenCL/m10700.cl
+++ b/OpenCL/m10700.cl
@@ -7,14 +7,8 @@
 
 #define _PDF17L8_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10800_a0.cl b/OpenCL/m10800_a0.cl
index c7de147..f32f934 100644 (file)
--- a/OpenCL/m10800_a0.cl
+++ b/OpenCL/m10800_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 6
-#define DGST_R1 7
-#define DGST_R2 4
-#define DGST_R3 5
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10800_a1.cl b/OpenCL/m10800_a1.cl
index a3897b7..4e07e5c 100644 (file)
--- a/OpenCL/m10800_a1.cl
+++ b/OpenCL/m10800_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 6
-#define DGST_R1 7
-#define DGST_R2 4
-#define DGST_R3 5
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10800_a3.cl b/OpenCL/m10800_a3.cl
index fae6a72..e6bdf19 100644 (file)
--- a/OpenCL/m10800_a3.cl
+++ b/OpenCL/m10800_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 6
-#define DGST_R1 7
-#define DGST_R2 4
-#define DGST_R3 5
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m10900.cl b/OpenCL/m10900.cl
index 275b049..e44797b 100644 (file)
--- a/OpenCL/m10900.cl
+++ b/OpenCL/m10900.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11000_a0.cl b/OpenCL/m11000_a0.cl
index 2b5970d..78140a3 100644 (file)
--- a/OpenCL/m11000_a0.cl
+++ b/OpenCL/m11000_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11000_a1.cl b/OpenCL/m11000_a1.cl
index 808914e..7449d6d 100644 (file)
--- a/OpenCL/m11000_a1.cl
+++ b/OpenCL/m11000_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11000_a3.cl b/OpenCL/m11000_a3.cl
index 569d149..1962123 100644 (file)
--- a/OpenCL/m11000_a3.cl
+++ b/OpenCL/m11000_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11100_a0.cl b/OpenCL/m11100_a0.cl
index ec1f0fc..dec18c0 100644 (file)
--- a/OpenCL/m11100_a0.cl
+++ b/OpenCL/m11100_a0.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11100_a1.cl b/OpenCL/m11100_a1.cl
index 50ec905..53f86d4 100644 (file)
--- a/OpenCL/m11100_a1.cl
+++ b/OpenCL/m11100_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11100_a3.cl b/OpenCL/m11100_a3.cl
index a5d860c..a267e48 100644 (file)
--- a/OpenCL/m11100_a3.cl
+++ b/OpenCL/m11100_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11200_a0.cl b/OpenCL/m11200_a0.cl
index f63ec3b..3d4b477 100644 (file)
--- a/OpenCL/m11200_a0.cl
+++ b/OpenCL/m11200_a0.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11200_a1.cl b/OpenCL/m11200_a1.cl
index 0790a46..5d1613c 100644 (file)
--- a/OpenCL/m11200_a1.cl
+++ b/OpenCL/m11200_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11200_a3.cl b/OpenCL/m11200_a3.cl
index 4d1ecfb..d40db29 100644 (file)
--- a/OpenCL/m11200_a3.cl
+++ b/OpenCL/m11200_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11300.cl b/OpenCL/m11300.cl
index df9fdd5..8aa53ca 100644 (file)
--- a/OpenCL/m11300.cl
+++ b/OpenCL/m11300.cl
@@ -7,14 +7,8 @@
 
 #define _SHA512_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11400_a0.cl b/OpenCL/m11400_a0.cl
index 2d3981b..6611370 100644 (file)
--- a/OpenCL/m11400_a0.cl
+++ b/OpenCL/m11400_a0.cl
@@ -10,14 +10,8 @@
 //incompatible because of brances
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11400_a1.cl b/OpenCL/m11400_a1.cl
index c15333d..8b78dbe 100644 (file)
--- a/OpenCL/m11400_a1.cl
+++ b/OpenCL/m11400_a1.cl
@@ -8,14 +8,8 @@
 //incompatible because of brances
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11400_a3.cl b/OpenCL/m11400_a3.cl
index 4caa348..d3441b8 100644 (file)
--- a/OpenCL/m11400_a3.cl
+++ b/OpenCL/m11400_a3.cl
@@ -11,14 +11,8 @@
 //incompatible because of brances
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 3
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11500_a0.cl b/OpenCL/m11500_a0.cl
index 088881e..02b0bd0 100644 (file)
--- a/OpenCL/m11500_a0.cl
+++ b/OpenCL/m11500_a0.cl
@@ -10,14 +10,8 @@
 //incompatible because of branches
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11500_a1.cl b/OpenCL/m11500_a1.cl
index 6d3bb7f..b627527 100644 (file)
--- a/OpenCL/m11500_a1.cl
+++ b/OpenCL/m11500_a1.cl
@@ -8,14 +8,8 @@
 //incompatible because of branches
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11500_a3.cl b/OpenCL/m11500_a3.cl
index 4af75ed..230f101 100644 (file)
--- a/OpenCL/m11500_a3.cl
+++ b/OpenCL/m11500_a3.cl
@@ -10,14 +10,8 @@
 //incompatible because of branches
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11600.cl b/OpenCL/m11600.cl
index 00ae013..4106b77 100644 (file)
--- a/OpenCL/m11600.cl
+++ b/OpenCL/m11600.cl
@@ -7,14 +7,8 @@
 
 #define _SEVEN_ZIP_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11700_a0.cl b/OpenCL/m11700_a0.cl
index db98b14..5e3e4f8 100644 (file)
--- a/OpenCL/m11700_a0.cl
+++ b/OpenCL/m11700_a0.cl
@@ -11,14 +11,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11700_a1.cl b/OpenCL/m11700_a1.cl
index e0320dd..bb750d6 100644 (file)
--- a/OpenCL/m11700_a1.cl
+++ b/OpenCL/m11700_a1.cl
@@ -10,14 +10,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11700_a3.cl b/OpenCL/m11700_a3.cl
index a62ad73..e8dd7db 100644 (file)
--- a/OpenCL/m11700_a3.cl
+++ b/OpenCL/m11700_a3.cl
@@ -11,14 +11,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11800_a0.cl b/OpenCL/m11800_a0.cl
index 87e63b5..522f6fb 100644 (file)
--- a/OpenCL/m11800_a0.cl
+++ b/OpenCL/m11800_a0.cl
@@ -11,14 +11,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11800_a1.cl b/OpenCL/m11800_a1.cl
index 0cd6cf8..0ccef4f 100644 (file)
--- a/OpenCL/m11800_a1.cl
+++ b/OpenCL/m11800_a1.cl
@@ -10,14 +10,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11800_a3.cl b/OpenCL/m11800_a3.cl
index 5dd6c99..dd3e7d4 100644 (file)
--- a/OpenCL/m11800_a3.cl
+++ b/OpenCL/m11800_a3.cl
@@ -11,14 +11,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m11900.cl b/OpenCL/m11900.cl
index ffa0f6c..daafdb4 100644 (file)
--- a/OpenCL/m11900.cl
+++ b/OpenCL/m11900.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m12000.cl b/OpenCL/m12000.cl
index 0619bcd..e39bd2f 100644 (file)
--- a/OpenCL/m12000.cl
+++ b/OpenCL/m12000.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m12200.cl b/OpenCL/m12200.cl
index 13af738..b9c5b19 100644 (file)
--- a/OpenCL/m12200.cl
+++ b/OpenCL/m12200.cl
@@ -5,14 +5,8 @@
 
 #define _SHA512_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m12300.cl b/OpenCL/m12300.cl
index a66e086..36936de 100644 (file)
--- a/OpenCL/m12300.cl
+++ b/OpenCL/m12300.cl
@@ -5,14 +5,8 @@
 
 #define _PBKDF2_SHA512_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m12400.cl b/OpenCL/m12400.cl
index d32f9b0..4dac260 100644 (file)
--- a/OpenCL/m12400.cl
+++ b/OpenCL/m12400.cl
@@ -7,14 +7,8 @@
 
 #define _DES_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m12500.cl b/OpenCL/m12500.cl
index 403acd3..2f00e56 100644 (file)
--- a/OpenCL/m12500.cl
+++ b/OpenCL/m12500.cl
@@ -7,14 +7,8 @@
 
 #define _RAR3_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 
 #include "inc_types.cl"

diff --git a/OpenCL/m12600_a0.cl b/OpenCL/m12600_a0.cl
index a6368f4..406bcb7 100644 (file)
--- a/OpenCL/m12600_a0.cl
+++ b/OpenCL/m12600_a0.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m12600_a1.cl b/OpenCL/m12600_a1.cl
index 14f9018..ed739ae 100644 (file)
--- a/OpenCL/m12600_a1.cl
+++ b/OpenCL/m12600_a1.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m12600_a3.cl b/OpenCL/m12600_a3.cl
index dd6c899..f8e11ae 100644 (file)
--- a/OpenCL/m12600_a3.cl
+++ b/OpenCL/m12600_a3.cl
@@ -10,14 +10,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m12700.cl b/OpenCL/m12700.cl
index 4175979..96aad5d 100644 (file)
--- a/OpenCL/m12700.cl
+++ b/OpenCL/m12700.cl
@@ -7,14 +7,8 @@
 
 #define _SHA1_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m12800.cl b/OpenCL/m12800.cl
index d138fc7..89d74e4 100644 (file)
--- a/OpenCL/m12800.cl
+++ b/OpenCL/m12800.cl
@@ -5,14 +5,8 @@
 
 #define _MS_DRSR_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 
 #include "inc_types.cl"

diff --git a/OpenCL/m12900.cl b/OpenCL/m12900.cl
index 589c170..fa187d9 100644 (file)
--- a/OpenCL/m12900.cl
+++ b/OpenCL/m12900.cl
@@ -5,14 +5,8 @@
 
 #define _ANDROIDFDE_SAMSUNG_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 
 #include "inc_types.cl"

diff --git a/OpenCL/m13000.cl b/OpenCL/m13000.cl
index c07d8da..77474a1 100644 (file)
--- a/OpenCL/m13000.cl
+++ b/OpenCL/m13000.cl
@@ -5,14 +5,8 @@
 
 #define _RAR5_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 
 #include "inc_types.cl"

diff --git a/OpenCL/m13100_a0.cl b/OpenCL/m13100_a0.cl
index 3544eaa..39bafb8 100644 (file)
--- a/OpenCL/m13100_a0.cl
+++ b/OpenCL/m13100_a0.cl
@@ -11,14 +11,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13100_a1.cl b/OpenCL/m13100_a1.cl
index 2aba9d2..50849d9 100644 (file)
--- a/OpenCL/m13100_a1.cl
+++ b/OpenCL/m13100_a1.cl
@@ -11,14 +11,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13100_a3.cl b/OpenCL/m13100_a3.cl
index 6113ae1..81ef740 100644 (file)
--- a/OpenCL/m13100_a3.cl
+++ b/OpenCL/m13100_a3.cl
@@ -11,14 +11,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13200.cl b/OpenCL/m13200.cl
index a84810d..4036921 100644 (file)
--- a/OpenCL/m13200.cl
+++ b/OpenCL/m13200.cl
@@ -7,14 +7,8 @@
 
 #define _AXCRYPT_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13300_a0.cl b/OpenCL/m13300_a0.cl
index bd45d38..a163128 100644 (file)
--- a/OpenCL/m13300_a0.cl
+++ b/OpenCL/m13300_a0.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 4
-#define DGST_R2 3
-#define DGST_R3 2
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13300_a1.cl b/OpenCL/m13300_a1.cl
index 8f1ec30..677c5c5 100644 (file)
--- a/OpenCL/m13300_a1.cl
+++ b/OpenCL/m13300_a1.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 4
-#define DGST_R2 3
-#define DGST_R3 2
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13300_a3.cl b/OpenCL/m13300_a3.cl
index 7109f7b..cc23569 100644 (file)
--- a/OpenCL/m13300_a3.cl
+++ b/OpenCL/m13300_a3.cl
@@ -9,14 +9,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 4
-#define DGST_R2 3
-#define DGST_R3 2
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13400.cl b/OpenCL/m13400.cl
index 6079f55..fb13731 100644 (file)
--- a/OpenCL/m13400.cl
+++ b/OpenCL/m13400.cl
@@ -7,14 +7,8 @@
 
 #define _KEEPASS_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13500_a0.cl b/OpenCL/m13500_a0.cl
index 9339212..d7995da 100644 (file)
--- a/OpenCL/m13500_a0.cl
+++ b/OpenCL/m13500_a0.cl
@@ -8,14 +8,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13500_a1.cl b/OpenCL/m13500_a1.cl
index b07279b..2615d91 100644 (file)
--- a/OpenCL/m13500_a1.cl
+++ b/OpenCL/m13500_a1.cl
@@ -8,14 +8,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13500_a3.cl b/OpenCL/m13500_a3.cl
index 28d7427..7f3b3c7 100644 (file)
--- a/OpenCL/m13500_a3.cl
+++ b/OpenCL/m13500_a3.cl
@@ -8,14 +8,8 @@
 //too much register pressure
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13600.cl b/OpenCL/m13600.cl
index 5cd9c6d..e68eec5 100644 (file)
--- a/OpenCL/m13600.cl
+++ b/OpenCL/m13600.cl
@@ -5,14 +5,8 @@
 
 #define _ZIP2_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 
 #include "inc_types.cl"

diff --git a/OpenCL/m13751.cl b/OpenCL/m13751.cl
index f375323..e498be6 100644 (file)
--- a/OpenCL/m13751.cl
+++ b/OpenCL/m13751.cl
@@ -5,14 +5,8 @@
 
 #define _SHA256_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13752.cl b/OpenCL/m13752.cl
index 2f7a9a5..069e83c 100644 (file)
--- a/OpenCL/m13752.cl
+++ b/OpenCL/m13752.cl
@@ -5,14 +5,8 @@
 
 #define _SHA256_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13753.cl b/OpenCL/m13753.cl
index 489901c..6164ad2 100644 (file)
--- a/OpenCL/m13753.cl
+++ b/OpenCL/m13753.cl
@@ -5,14 +5,8 @@
 
 #define _SHA256_
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13800_a0.cl b/OpenCL/m13800_a0.cl
index 2ae3c92..a4d111b 100644 (file)
--- a/OpenCL/m13800_a0.cl
+++ b/OpenCL/m13800_a0.cl
@@ -8,14 +8,8 @@
 //not compatible
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13800_a1.cl b/OpenCL/m13800_a1.cl
index e8d763e..dfe7507 100644 (file)
--- a/OpenCL/m13800_a1.cl
+++ b/OpenCL/m13800_a1.cl
@@ -8,14 +8,8 @@
 //not compatible
 //#define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/OpenCL/m13800_a3.cl b/OpenCL/m13800_a3.cl
index b87c792..1e354e0 100644 (file)
--- a/OpenCL/m13800_a3.cl
+++ b/OpenCL/m13800_a3.cl
@@ -7,14 +7,8 @@
 
 #define NEW_SIMD_CODE
 
-#include "inc_hash_constants.h"
 #include "inc_vendor.cl"
-
-#define DGST_R0 3
-#define DGST_R1 7
-#define DGST_R2 2
-#define DGST_R3 6
-
+#include "inc_hash_constants.h"
 #include "inc_hash_functions.cl"
 #include "inc_types.cl"
 #include "inc_common.cl"

diff --git a/include/ext_ADL.h b/include/ext_ADL.h
index 9a80628..6a2b001 100644 (file)
--- a/include/ext_ADL.h
+++ b/include/ext_ADL.h
@@ -306,6 +306,7 @@ typedef int (ADL_API_CALL *ADL_OVERDRIVE6_STATE_SET) (int, int, ADLOD6StateInfo
 typedef int (ADL_API_CALL *ADL_OVERDRIVE6_POWERCONTROL_CAPS) (int, int *);
 typedef int (ADL_API_CALL *ADL_OVERDRIVE6_TARGETTEMPERATUREDATA_GET) (int, int *, int *);
 typedef int (ADL_API_CALL *ADL_OVERDRIVE6_TARGETTEMPERATURERANGEINFO_GET) (int, ADLOD6ParameterRange *);
+typedef int (ADL_API_CALL *ADL_OVERDRIVE6_FANSPEED_RESET) (int);
 
 typedef struct
 {
@@ -344,6 +345,7 @@ typedef struct
   ADL_OVERDRIVE6_STATE_SET ADL_Overdrive6_State_Set;
   ADL_OVERDRIVE6_TARGETTEMPERATUREDATA_GET ADL_Overdrive6_TargetTemperatureData_Get;
   ADL_OVERDRIVE6_TARGETTEMPERATURERANGEINFO_GET ADL_Overdrive6_TargetTemperatureRangeInfo_Get;
+  ADL_OVERDRIVE6_FANSPEED_RESET ADL_Overdrive6_FanSpeed_Reset;
 
 } hm_adl_lib_t;
 
@@ -385,6 +387,7 @@ int hm_ADL_Overdrive_State_Set (ADL_PTR *adl, int iAdapterIndex, int type, ADLOD
 int hm_ADL_Overdrive6_PowerControl_Caps (ADL_PTR *adl, int iAdapterIndex, int *lpSupported);
 int hm_ADL_Overdrive6_TargetTemperatureData_Get (ADL_PTR *adl, int iAdapterIndex, int *cur_temp, int *default_temp);
 int hm_ADL_Overdrive6_TargetTemperatureRangeInfo_Get (ADL_PTR *adl, int iAdapterIndex, ADLOD6ParameterRange *lpTargetTemperatureInfo);
+int hm_ADL_Overdrive6_FanSpeed_Reset (ADL_PTR *adl, int iAdapterIndex);
 
 #endif // HAVE_HWMON
 

diff --git a/include/ext_nvapi.h b/include/ext_nvapi.h
index 1b6b6a8..0258dad 100644 (file)
--- a/include/ext_nvapi.h
+++ b/include/ext_nvapi.h
@@ -213,6 +213,7 @@ NVAPI_INTERFACE NvAPI_EnumPhysicalGPUs (NvPhysicalGpuHandle nvGPUHandle[NVAPI_MA
 NVAPI_INTERFACE NvAPI_GPU_GetPerfPoliciesInfo (NvPhysicalGpuHandle hPhysicalGpu, NV_GPU_PERF_POLICIES_INFO_PARAMS_V1 *perfPolicies_info);
 NVAPI_INTERFACE NvAPI_GPU_GetPerfPoliciesStatus (NvPhysicalGpuHandle hPhysicalGpu, NV_GPU_PERF_POLICIES_STATUS_PARAMS_V1 *perfPolicies_status);
 NVAPI_INTERFACE NvAPI_GPU_SetCoolerLevels (NvPhysicalGpuHandle hPhysicalGpu, NvU32 coolerIndex, NV_GPU_COOLER_LEVELS *pCoolerLevels);
+NVAPI_INTERFACE NvAPI_GPU_RestoreCoolerSettings (NvPhysicalGpuHandle hPhysicalGpu, NvU32 coolerIndex);
 
 /*
  * End of declarations from nvapi.h and subheaders
@@ -236,6 +237,7 @@ typedef int (*NVAPI_API_CALL NVAPI_ENUMPHYSICALGPUS) (NvPhysicalGpuHandle nvGPUH
 typedef int (*NVAPI_API_CALL NVAPI_GPU_GETPERFPOLICIESINFO) (NvPhysicalGpuHandle, NV_GPU_PERF_POLICIES_INFO_PARAMS_V1 *);
 typedef int (*NVAPI_API_CALL NVAPI_GPU_GETPERFPOLICIESSTATUS) (NvPhysicalGpuHandle, NV_GPU_PERF_POLICIES_STATUS_PARAMS_V1 *);
 typedef int (*NVAPI_API_CALL NVAPI_GPU_SETCOOLERLEVELS) (NvPhysicalGpuHandle, NvU32, NV_GPU_COOLER_LEVELS *);
+typedef int (*NVAPI_API_CALL NVAPI_GPU_RESTORECOOLERSETTINGS) (NvPhysicalGpuHandle, NvU32);
 
 typedef struct
 {
@@ -249,6 +251,7 @@ typedef struct
   NVAPI_GPU_GETPERFPOLICIESINFO NvAPI_GPU_GetPerfPoliciesInfo;
   NVAPI_GPU_GETPERFPOLICIESSTATUS NvAPI_GPU_GetPerfPoliciesStatus;
   NVAPI_GPU_SETCOOLERLEVELS NvAPI_GPU_SetCoolerLevels;
+  NVAPI_GPU_RESTORECOOLERSETTINGS NvAPI_GPU_RestoreCoolerSettings;
 
 } hm_nvapi_lib_t;
 
@@ -265,6 +268,7 @@ int hm_NvAPI_EnumPhysicalGPUs (NVAPI_PTR *nvapi, NvPhysicalGpuHandle nvGPUHandle
 int hm_NvAPI_GPU_GetPerfPoliciesInfo (NVAPI_PTR *nvapi, NvPhysicalGpuHandle hPhysicalGpu, NV_GPU_PERF_POLICIES_INFO_PARAMS_V1 *perfPolicies_info);
 int hm_NvAPI_GPU_GetPerfPoliciesStatus (NVAPI_PTR *nvapi, NvPhysicalGpuHandle hPhysicalGpu, NV_GPU_PERF_POLICIES_STATUS_PARAMS_V1 *perfPolicies_status);
 int hm_NvAPI_GPU_SetCoolerLevels (NVAPI_PTR *nvapi, NvPhysicalGpuHandle hPhysicalGpu, NvU32 coolerIndex, NV_GPU_COOLER_LEVELS *pCoolerLevels);
+int hm_NvAPI_GPU_RestoreCoolerSettings (NVAPI_PTR *nvapi, NvPhysicalGpuHandle hPhysicalGpu, NvU32 coolerIndex);
 
 #endif // HAVE_HWMON
 

diff --git a/include/shared.h b/include/shared.h
index 985c54a..b0b3565 100644 (file)
--- a/include/shared.h
+++ b/include/shared.h
@@ -1668,7 +1668,8 @@ int veracrypt_parse_hash_327661   (char *input_buf, uint input_len, hash_t *hash
 int veracrypt_parse_hash_655331   (char *input_buf, uint input_len, hash_t *hash_buf);
 int win8phone_parse_hash          (char *input_buf, uint input_len, hash_t *hash_buf);
 
-void naive_escape (const char *cpath_real, char *cpath_escaped, const size_t cpath_escaped_len);
+void naive_replace (char *s, const u8 key_char, const u8 replace_char);
+void naive_escape (char *s, size_t s_max, const u8 key_char, const u8 escape_char);
 void load_kernel (const char *kernel_file, int num_devices, size_t *kernel_lengths, const u8 **kernel_sources);
 void writeProgramBin (char *dst, u8 *binary, size_t binary_size);
 

diff --git a/include/types.h b/include/types.h
index 67a91b1..f1eca83 100644 (file)
--- a/include/types.h
+++ b/include/types.h
@@ -942,7 +942,6 @@ struct __hc_device_param
   uint    kernel_exec_timeout;
 
   uint    device_processors;
-  uint    device_processor_cores;
   u64     device_maxmem_alloc;
   u64     device_global_mem;
   u32     device_maxclock_frequency;
@@ -1130,6 +1129,9 @@ typedef struct
 
   hc_device_param_t *devices_param;
 
+  uint    shutdown_inner;
+  uint    shutdown_outer;
+
   /**
    * workload specific
    */

diff --git a/src/ext_ADL.c b/src/ext_ADL.c
index b99721f..8bddcbd 100644 (file)
--- a/src/ext_ADL.c
+++ b/src/ext_ADL.c
@@ -63,6 +63,7 @@ int adl_init (ADL_PTR *adl)
   HC_LOAD_FUNC(adl, ADL_Overdrive6_State_Set, ADL_OVERDRIVE6_STATE_SET, ADL, 0)
   HC_LOAD_FUNC(adl, ADL_Overdrive6_TargetTemperatureData_Get, ADL_OVERDRIVE6_TARGETTEMPERATUREDATA_GET, ADL, 0)
   HC_LOAD_FUNC(adl, ADL_Overdrive6_TargetTemperatureRangeInfo_Get, ADL_OVERDRIVE6_TARGETTEMPERATURERANGEINFO_GET, ADL, 0)
+  HC_LOAD_FUNC(adl, ADL_Overdrive6_FanSpeed_Reset, ADL_OVERDRIVE6_FANSPEED_RESET, ADL, 0)
 
   return 0;
 }
@@ -594,3 +595,12 @@ int hm_ADL_Overdrive6_TargetTemperatureRangeInfo_Get (ADL_PTR *adl, int iAdapter
 
   return (ADL_rc);
 }
+
+int hm_ADL_Overdrive6_FanSpeed_Reset (ADL_PTR *adl, int iAdapterIndex)
+{
+  if (!adl) return (-1);
+
+  int ADL_rc = adl->ADL_Overdrive6_FanSpeed_Reset (iAdapterIndex);
+
+  return (ADL_rc);
+}

diff --git a/src/ext_nvapi.c b/src/ext_nvapi.c
index 671cb55..3e47152 100644 (file)
--- a/src/ext_nvapi.c
+++ b/src/ext_nvapi.c
@@ -39,6 +39,7 @@ int nvapi_init (NVAPI_PTR *nvapi)
   HC_LOAD_ADDR(nvapi, NvAPI_GPU_GetPerfPoliciesInfo,    NVAPI_GPU_GETPERFPOLICIESINFO,    nvapi_QueryInterface, 0x409D9841, NVAPI, 0)
   HC_LOAD_ADDR(nvapi, NvAPI_GPU_GetPerfPoliciesStatus,  NVAPI_GPU_GETPERFPOLICIESSTATUS,  nvapi_QueryInterface, 0x3D358A0C, NVAPI, 0)
   HC_LOAD_ADDR(nvapi, NvAPI_GPU_SetCoolerLevels,        NVAPI_GPU_SETCOOLERLEVELS,        nvapi_QueryInterface, 0x891FA0AE, NVAPI, 0)
+  HC_LOAD_ADDR(nvapi, NvAPI_GPU_RestoreCoolerSettings,  NVAPI_GPU_RESTORECOOLERSETTINGS,  nvapi_QueryInterface, 0x8F6ED0FB, NVAPI, 0)
 
   return 0;
 }
@@ -171,6 +172,24 @@ int hm_NvAPI_GPU_SetCoolerLevels (NVAPI_PTR *nvapi, NvPhysicalGpuHandle hPhysica
   return NvAPI_rc;
 }
 
+int hm_NvAPI_GPU_RestoreCoolerSettings (NVAPI_PTR *nvapi, NvPhysicalGpuHandle hPhysicalGpu, NvU32 coolerIndex)
+{
+  if (!nvapi) return (-1);
+
+  NvAPI_Status NvAPI_rc = nvapi->NvAPI_GPU_RestoreCoolerSettings (hPhysicalGpu, coolerIndex);
+
+  if (NvAPI_rc != NVAPI_OK)
+  {
+    NvAPI_ShortString string = { 0 };
+
+    hm_NvAPI_GetErrorMessage (nvapi, NvAPI_rc, string);
+
+    log_info ("WARN: %s %d %s\n", "NvAPI_GPU_RestoreCoolerSettings()", NvAPI_rc, string);
+  }
+
+  return NvAPI_rc;
+}
+
 #ifdef __MINGW64__
 
 void __security_check_cookie (uintptr_t _StackCookie)

diff --git a/src/hashcat.c b/src/hashcat.c
index 1799224..8d78174 100644 (file)
--- a/src/hashcat.c
+++ b/src/hashcat.c
@@ -1,4 +1,4 @@
- /**
+/**
  * Authors.....: Jens Steube <jens.steube@gmail.com>
  *               Gabriele Gristina <matrix@hashcat.net>
  *               magnum <john.magnum@hushmail.com>
@@ -78,7 +78,7 @@ double TARGET_MS_PROFILE[4]     = { 2, 12, 96, 480 };
 #define NVIDIA_SPIN_DAMP        100
 #define GPU_TEMP_DISABLE        0
 #define GPU_TEMP_ABORT          90
-#define GPU_TEMP_RETAIN         65
+#define GPU_TEMP_RETAIN         75
 #define WORKLOAD_PROFILE        2
 #define KERNEL_ACCEL            0
 #define KERNEL_LOOPS            0
@@ -362,7 +362,7 @@ const char *USAGE_BIG[] =
   "- [ Options ] -",
   "",
   " Options Short / Long          | Type | Description                                          | Example",
-  "===============================|======|======================================================|=======================",
+  "===============================+======+======================================================+=======================",
   " -m, --hash-type               | Num  | Hash-type, see references below                      | -m 1000",
   " -a, --attack-mode             | Num  | Attack-mode, see references below                    | -a 3",
   " -V, --version                 |      | Print version                                        |",
@@ -391,8 +391,8 @@ const char *USAGE_BIG[] =
   "     --outfile-check-timer     | Num  | Sets seconds between outfile checks to X             | --outfile-check=30",
   " -p, --separator               | Char | Separator char for hashlists and outfile             | -p :",
   "     --stdout                  |      | Do not crack a hash, instead print candidates only   |",
-  "     --show                    |      | Show cracked passwords only                          |",
-  "     --left                    |      | Show un-cracked passwords only                       |",
+  "     --show                    |      | Compare hashlist with potfile; Show cracked hashes   |",
+  "     --left                    |      | Compare hashlist with potfile; Show uncracked hashes |",
   "     --username                |      | Enable ignoring of usernames in hashfile             |",
   "     --remove                  |      | Enable remove of hash once it is cracked             |",
   "     --remove-timer            | Num  | Update input hash file each X seconds                | --remove-timer=30",
@@ -429,9 +429,9 @@ const char *USAGE_BIG[] =
   " -s, --skip                    | Num  | Skip X words from the start                          | -s 1000000",
   " -l, --limit                   | Num  | Limit X words from the start + skipped words         | -l 1000000",
   "     --keyspace                |      | Show keyspace base:mod values and quit               |",
-  " -j, --rule-left               | Rule | Single Rule applied to each word from left wordlist  | -j 'c'",
-  " -k, --rule-right              | Rule | Single Rule applied to each word from right wordlist | -k '^-'",
-  " -r, --rules-file              | File | Multiple Rules applied to each word from wordlists   | -r rules/best64.rule",
+  " -j, --rule-left               | Rule | Single rule applied to each word from left wordlist  | -j 'c'",
+  " -k, --rule-right              | Rule | Single rule applied to each word from right wordlist | -k '^-'",
+  " -r, --rules-file              | File | Multiple rules applied to each word from wordlists   | -r rules/best64.rule",
   " -g, --generate-rules          | Num  | Generate X random rules                              | -g 10000",
   "     --generate-rules-func-min | Num  | Force min X funcs per rule                           |",
   "     --generate-rules-func-max | Num  | Force max X funcs per rule                           |",
@@ -728,11 +728,20 @@ const char *USAGE_BIG[] =
   "  3 | High        |  96 ms  | High              | Unresponsive",
   "  4 | Nightmare   | 480 ms  | Insane            | Headless",
   "",
-  "If you have no idea what just happened then visit the following pages:",
+  "- [ Basic Examples ] -",
+  "",
+  "  Attack-          | Hash- |",
+  "  Mode             | Type  | Example command",
+  " ==================+=======+==================================================================",
+  "  Wordlist         | $P$   | %s -a 0 -m 400 example400.hash example.dict",
+  "  Wordlist + Rules | MD5   | %s -a 0 -m 0 example0.hash example.dict -r rules/best64.rule",
+  "  Brute-Force      | MD5   | %s -a 3 -m 0 example0.hash ?a?a?a?a?a?a",
+  "  Combinator       | MD5   | %s -a 1 -m 0 example0.hash example.dict example.dict",
+  "",
+  "If you still have no idea what just happened try following pages:",
   "",
   "* https://hashcat.net/wiki/#howtos_videos_papers_articles_etc_in_the_wild",
   "* https://hashcat.net/wiki/#frequently_asked_questions",
-  "",
   NULL
 };
 
@@ -915,7 +924,6 @@ void status_display ()
 {
   if (data.devices_status == STATUS_INIT)     return;
   if (data.devices_status == STATUS_STARTING) return;
-  if (data.devices_status == STATUS_BYPASS)   return;
 
   if (data.machine_readable == 1)
   {
@@ -1674,7 +1682,6 @@ static void status_benchmark ()
 {
   if (data.devices_status == STATUS_INIT)     return;
   if (data.devices_status == STATUS_STARTING) return;
-  if (data.devices_status == STATUS_BYPASS)   return;
 
   if (data.machine_readable == 1)
   {
@@ -3030,6 +3037,7 @@ static void choose_kernel (hc_device_param_t *device_param, const uint attack_ex
       if (data.devices_status == STATUS_CRACKED) break;
       if (data.devices_status == STATUS_ABORTED) break;
       if (data.devices_status == STATUS_QUIT)    break;
+      if (data.devices_status == STATUS_BYPASS)  break;
 
       /**
        * speed
@@ -3686,6 +3694,7 @@ static void run_cracker (hc_device_param_t *device_param, const uint pws_cnt)
       if (data.devices_status == STATUS_CRACKED) break;
       if (data.devices_status == STATUS_ABORTED) break;
       if (data.devices_status == STATUS_QUIT)    break;
+      if (data.devices_status == STATUS_BYPASS)  break;
 
       /**
        * result
@@ -4148,7 +4157,7 @@ static void *thread_monitor (void *p)
     return (p);
   }
 
-  while ((data.devices_status != STATUS_EXHAUSTED) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
+  while (data.shutdown_inner == 0)
   {
     hc_sleep (sleep_time);
 
@@ -4334,7 +4343,7 @@ static void *thread_monitor (void *p)
 
       time (&runtime_cur);
 
-      int runtime_left = data.runtime_start + data.runtime - runtime_cur;
+      int runtime_left = data.proc_start + data.runtime - runtime_cur;
 
       if (runtime_left <= 0)
       {
@@ -4370,7 +4379,7 @@ static void *thread_monitor (void *p)
 
       if (status_left == 0)
       {
-        //hc_thread_mutex_lock (mux_display);
+        hc_thread_mutex_lock (mux_display);
 
         if (data.quiet == 0) clear_prompt ();
 
@@ -4380,7 +4389,7 @@ static void *thread_monitor (void *p)
 
         if (data.quiet == 0) log_info ("");
 
-        //hc_thread_mutex_unlock (mux_display);
+        hc_thread_mutex_unlock (mux_display);
 
         status_left = data.status_timer;
       }
@@ -4437,7 +4446,7 @@ static void *thread_outfile_remove (void *p)
 
   uint check_left = outfile_check_timer; // or 1 if we want to check it at startup
 
-  while ((data.devices_status != STATUS_EXHAUSTED) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
+  while (data.shutdown_inner == 0)
   {
     hc_sleep (1);
 
@@ -4765,7 +4774,7 @@ static uint get_work (hc_device_param_t *device_param, const u64 max)
   hc_thread_mutex_lock (mux_dispatcher);
 
   const u64 words_cur  = data.words_cur;
-  const u64 words_base = (data.limit == 0) ? data.words_base : data.limit;
+  const u64 words_base = (data.limit == 0) ? data.words_base : MIN (data.limit, data.words_base);
 
   device_param->words_off = words_cur;
 
@@ -4815,7 +4824,7 @@ static void *thread_calc_stdin (void *p)
 
   const uint attack_kern = data.attack_kern;
 
-  while ((data.devices_status != STATUS_EXHAUSTED) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
+  while ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
   {
     hc_thread_mutex_lock (mux_dispatcher);
 
@@ -4943,7 +4952,7 @@ static void *thread_calc (void *p)
 
   if (attack_mode == ATTACK_MODE_BF)
   {
-    while ((data.devices_status != STATUS_EXHAUSTED) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
+    while ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
     {
       const uint work = get_work (device_param, -1);
 
@@ -5055,7 +5064,7 @@ static void *thread_calc (void *p)
 
     u64 words_cur = 0;
 
-    while ((data.devices_status != STATUS_EXHAUSTED) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
+    while ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
     {
       u64 words_off = 0;
       u64 words_fin = 0;
@@ -6414,6 +6423,10 @@ int main (int argc, char **argv)
     {
       // do nothing
     }
+    else if (keyspace == 1)
+    {
+      // do nothing
+    }
     else
     {
       log_info ("%s (%s) starting...", PROGNAME, VERSION_TAG);
@@ -7324,6 +7337,37 @@ int main (int argc, char **argv)
     }
   }
 
+  /**
+   * status, monitor and outfile remove threads
+   */
+
+  uint wordlist_mode = ((optind + 1) < myargc) ? WL_MODE_FILE : WL_MODE_STDIN;
+
+  data.wordlist_mode = wordlist_mode;
+
+  if (wordlist_mode == WL_MODE_STDIN)
+  {
+    status = 1;
+
+    data.status = status;
+  }
+
+  uint outer_threads_cnt = 0;
+
+  hc_thread_t *outer_threads = (hc_thread_t *) mycalloc (10, sizeof (hc_thread_t));
+
+  data.shutdown_outer = 0;
+
+  if (keyspace == 0 && benchmark == 0 && stdout_flag == 0)
+  {
+    if ((data.wordlist_mode == WL_MODE_FILE) || (data.wordlist_mode == WL_MODE_MASK))
+    {
+      hc_thread_create (outer_threads[outer_threads_cnt], thread_keypress, NULL);
+
+      outer_threads_cnt++;
+    }
+  }
+
   /**
    * config
    */
@@ -13486,7 +13530,7 @@ int main (int argc, char **argv)
 
         if (cpu_rule_to_kernel_rule (rule_buf, rule_len, &kernel_rules_buf[kernel_rules_cnt]) == -1)
         {
-          log_info ("WARNING: Cannot convert rule for use on device in file %s on line %u: %s", rp_file, rule_line, rule_buf);
+          log_info ("WARNING: Cannot convert rule for use on OpenCL device in file %s on line %u: %s", rp_file, rule_line, rule_buf);
 
           memset (&kernel_rules_buf[kernel_rules_cnt], 0, sizeof (kernel_rule_t)); // needs to be cleared otherwise we could have some remaining data
 
@@ -13496,7 +13540,7 @@ int main (int argc, char **argv)
         /* its so slow
         if (rulefind (&kernel_rules_buf[kernel_rules_cnt], kernel_rules_buf, kernel_rules_cnt, sizeof (kernel_rule_t), sort_by_kernel_rule))
         {
-          log_info ("Duplicate rule for use on device in file %s in line %u: %s", rp_file, rule_line, rule_buf);
+          log_info ("Duplicate rule for use on OpenCL device in file %s in line %u: %s", rp_file, rule_line, rule_buf);
 
           continue;
         }
@@ -13600,7 +13644,7 @@ int main (int argc, char **argv)
      * generate NOP rules
      */
 
-    if (kernel_rules_cnt == 0)
+    if ((rp_files_cnt == 0) && (rp_gen == 0))
     {
       kernel_rules_buf = (kernel_rule_t *) mymalloc (sizeof (kernel_rule_t));
 
@@ -13612,6 +13656,13 @@ int main (int argc, char **argv)
     data.kernel_rules_cnt = kernel_rules_cnt;
     data.kernel_rules_buf = kernel_rules_buf;
 
+    if (kernel_rules_cnt == 0)
+    {
+      log_error ("ERROR: No valid rules left");
+
+      return (-1);
+    }
+
     /**
      * OpenCL platforms: detect
      */
@@ -14129,7 +14180,7 @@ int main (int argc, char **argv)
 
         device_param->device_name_chksum = device_name_chksum;
 
-        // device_processor_cores
+        // vendor specific
 
         if (device_param->device_type & CL_DEVICE_TYPE_GPU)
         {
@@ -14152,28 +14203,9 @@ int main (int argc, char **argv)
           }
         }
 
-        // device_processor_cores
-
-        if (device_type & CL_DEVICE_TYPE_CPU)
-        {
-          cl_uint device_processor_cores = 1;
-
-          device_param->device_processor_cores = device_processor_cores;
-        }
-
         if (device_type & CL_DEVICE_TYPE_GPU)
         {
-          if (device_vendor_id == VENDOR_ID_AMD)
-          {
-            cl_uint device_processor_cores = 0;
-
-            #define CL_DEVICE_WAVEFRONT_WIDTH_AMD               0x4043
-
-            hc_clGetDeviceInfo (data.ocl, device_param->device, CL_DEVICE_WAVEFRONT_WIDTH_AMD, sizeof (device_processor_cores), &device_processor_cores, NULL);
-
-            device_param->device_processor_cores = device_processor_cores;
-          }
-          else if (device_vendor_id == VENDOR_ID_NV)
+          if (device_vendor_id == VENDOR_ID_NV)
           {
             cl_uint kernel_exec_timeout = 0;
 
@@ -14183,14 +14215,6 @@ int main (int argc, char **argv)
 
             device_param->kernel_exec_timeout = kernel_exec_timeout;
 
-            cl_uint device_processor_cores = 0;
-
-            #define CL_DEVICE_WARP_SIZE_NV                      0x4003
-
-            hc_clGetDeviceInfo (data.ocl, device_param->device, CL_DEVICE_WARP_SIZE_NV, sizeof (device_processor_cores), &device_processor_cores, NULL);
-
-            device_param->device_processor_cores = device_processor_cores;
-
             cl_uint sm_minor = 0;
             cl_uint sm_major = 0;
 
@@ -14226,12 +14250,6 @@ int main (int argc, char **argv)
 
             device_param->nvidia_spin_damp /= 100;
           }
-          else
-          {
-            cl_uint device_processor_cores = 1;
-
-            device_param->device_processor_cores = device_processor_cores;
-          }
         }
 
         // display results
@@ -14489,9 +14507,9 @@ int main (int argc, char **argv)
 
             if (hm_NVML_nvmlDeviceGetFanSpeed (data.hm_nvml, 0, hm_adapters_nvml[i].nvml, &speed) == NVML_SUCCESS) hm_adapters_nvml[i].fan_get_supported = 1;
 
-            hm_NVML_nvmlDeviceSetComputeMode (data.hm_nvml, 1, hm_adapters_nvml[i].nvml, NVML_COMPUTEMODE_EXCLUSIVE_PROCESS);
-
-            hm_NVML_nvmlDeviceSetGpuOperationMode (data.hm_nvml, 1, hm_adapters_nvml[i].nvml, NVML_GOM_ALL_ON);
+            // doesn't seem to create any advantages
+            //hm_NVML_nvmlDeviceSetComputeMode (data.hm_nvml, 1, hm_adapters_nvml[i].nvml, NVML_COMPUTEMODE_EXCLUSIVE_PROCESS);
+            //hm_NVML_nvmlDeviceSetGpuOperationMode (data.hm_nvml, 1, hm_adapters_nvml[i].nvml, NVML_GOM_ALL_ON);
           }
         }
       }
@@ -14598,9 +14616,6 @@ int main (int argc, char **argv)
      * OpenCL devices: allocate buffer for device specific information
      */
 
-    int *temp_retain_fanspeed_value  = (int *) mycalloc (data.devices_cnt, sizeof (int));
-    int *temp_retain_fanpolicy_value = (int *) mycalloc (data.devices_cnt, sizeof (int));
-
     ADLOD6MemClockState *od_clock_mem_status = (ADLOD6MemClockState *) mycalloc (data.devices_cnt, sizeof (ADLOD6MemClockState));
 
     int *od_power_control_status = (int *) mycalloc (data.devices_cnt, sizeof (int));
@@ -14963,7 +14978,6 @@ int main (int argc, char **argv)
 
       const char *device_name_chksum      = device_param->device_name_chksum;
       const u32   device_processors       = device_param->device_processors;
-      const u32   device_processor_cores  = device_param->device_processor_cores;
 
       /**
        * create context for each device
@@ -14997,7 +15011,9 @@ int main (int argc, char **argv)
       if (hash_mode ==  3000) kernel_threads = 64; // DES
       if (hash_mode ==  3200) kernel_threads = 8;  // Blowfish
       if (hash_mode ==  7500) kernel_threads = 64; // RC4
+      if (hash_mode ==  8900) kernel_threads = 32; // scrypt
       if (hash_mode ==  9000) kernel_threads = 8;  // Blowfish
+      if (hash_mode ==  9300) kernel_threads = 32; // scrypt
       if (hash_mode ==  9700) kernel_threads = 64; // RC4
       if (hash_mode ==  9710) kernel_threads = 64; // RC4
       if (hash_mode ==  9800) kernel_threads = 64; // RC4
@@ -15084,6 +15100,9 @@ int main (int argc, char **argv)
           }
         }
 
+        device_param->kernel_accel_min = 1;
+        device_param->kernel_accel_max = 8;
+
         for (uint tmto = tmto_start; tmto < tmto_stop; tmto++)
         {
           // TODO: in theory the following calculation needs to be done per salt, not global
@@ -15093,7 +15112,7 @@ int main (int argc, char **argv)
 
           size_scryptV /= 1 << tmto;
 
-          size_scryptV *= device_processors * device_processor_cores;
+          size_scryptV *= device_param->device_processors * device_param->kernel_threads * device_param->kernel_accel_max;
 
           if (size_scryptV > device_param->device_maxmem_alloc)
           {
@@ -15105,7 +15124,7 @@ int main (int argc, char **argv)
           for (uint salts_pos = 0; salts_pos < data.salts_cnt; salts_pos++)
           {
             data.salts_buf[salts_pos].scrypt_tmto = tmto;
-            data.salts_buf[salts_pos].scrypt_phy  = device_processors * device_processor_cores;
+            data.salts_buf[salts_pos].scrypt_phy  = device_param->device_processors * device_param->kernel_threads * device_param->kernel_accel_max;
           }
 
           break;
@@ -15402,6 +15421,10 @@ int main (int argc, char **argv)
         return -1;
       }
 
+      naive_replace (cpath_real, '\\', '/');
+
+      // not escaping here, windows has quotes
+
       snprintf (build_opts, sizeof (build_opts) - 1, "-I \"%s\"", cpath_real);
 
       myfree (cpath_real);
@@ -15419,21 +15442,19 @@ int main (int argc, char **argv)
         return -1;
       }
 
-      char cpath_escaped[1024] = { 0 };
+      naive_escape (cpath_real, PATH_MAX,  ' ', '\\');
 
-      naive_escape (cpath_real, cpath_escaped, sizeof (cpath_escaped));
+      snprintf (build_opts, sizeof (build_opts) - 1, "-I %s", cpath_real);
 
       myfree (cpath_real);
 
-      snprintf (build_opts, sizeof (build_opts) - 1, "-I %s", cpath_escaped);
-
       #endif
 
       // we don't have sm_* on vendors not NV but it doesn't matter
 
       char build_opts_new[1024] = { 0 };
 
-      snprintf (build_opts_new, sizeof (build_opts_new) - 1, "%s -D VENDOR_ID=%u -D CUDA_ARCH=%d -D VECT_SIZE=%u -D DEVICE_TYPE=%u -D KERN_TYPE=%u -D _unroll -cl-std=CL1.1", build_opts, device_param->device_vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->vector_width, (u32) device_param->device_type, kern_type);
+      snprintf (build_opts_new, sizeof (build_opts_new) - 1, "%s -D VENDOR_ID=%u -D CUDA_ARCH=%d -D VECT_SIZE=%u -D DEVICE_TYPE=%u -D DGST_R0=%u -D DGST_R1=%u -D DGST_R2=%u -D DGST_R3=%u -D DGST_ELEM=%u -D KERN_TYPE=%u -D _unroll -cl-std=CL1.1", build_opts, device_param->device_vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->vector_width, (u32) device_param->device_type, data.dgst_pos0, data.dgst_pos1, data.dgst_pos2, data.dgst_pos3, data.dgst_size / 4, kern_type);
 
       strncpy (build_opts, build_opts_new, sizeof (build_opts));
 
@@ -16262,9 +16283,6 @@ int main (int argc, char **argv)
             const int fanspeed  = hm_get_fanspeed_with_device_id  (device_id);
             const int fanpolicy = hm_get_fanpolicy_with_device_id (device_id);
 
-            temp_retain_fanspeed_value[device_id]  = fanspeed;
-            temp_retain_fanpolicy_value[device_id] = fanpolicy;
-
             // we also set it to tell the OS we take control over the fan and it's automatic controller
             // if it was set to automatic. we do not control user-defined fanspeeds.
 
@@ -16385,10 +16403,6 @@ int main (int argc, char **argv)
     wl_data->cnt   = 0;
     wl_data->pos   = 0;
 
-    uint wordlist_mode = ((optind + 1) < myargc) ? WL_MODE_FILE : WL_MODE_STDIN;
-
-    data.wordlist_mode = wordlist_mode;
-
     cs_t  *css_buf   = NULL;
     uint   css_cnt   = 0;
     uint   dictcnt   = 0;
@@ -17181,41 +17195,27 @@ int main (int argc, char **argv)
      * status and monitor threads
      */
 
-    if (data.devices_status != STATUS_CRACKED) data.devices_status = STATUS_STARTING;
-
-    uint i_threads_cnt = 0;
-
-    hc_thread_t *i_threads = (hc_thread_t *) mycalloc (10, sizeof (hc_thread_t));
-
-    if ((data.wordlist_mode == WL_MODE_FILE) || (data.wordlist_mode == WL_MODE_MASK))
+    if ((data.devices_status != STATUS_BYPASS) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
     {
-      if (stdout_flag == 0)
-      {
-        hc_thread_create (i_threads[i_threads_cnt], thread_keypress, &benchmark);
-
-        i_threads_cnt++;
-      }
+      data.devices_status = STATUS_STARTING;
     }
 
-    if (wordlist_mode == WL_MODE_STDIN) data.status = 1;
-
-    uint ni_threads_cnt = 0;
+    uint inner_threads_cnt = 0;
 
-    hc_thread_t *ni_threads = (hc_thread_t *) mycalloc (10, sizeof (hc_thread_t));
+    hc_thread_t *inner_threads = (hc_thread_t *) mycalloc (10, sizeof (hc_thread_t));
 
-    if (stdout_flag == 0)
-    {
-      hc_thread_create (ni_threads[ni_threads_cnt], thread_monitor, NULL);
-
-      ni_threads_cnt++;
-    }
+    data.shutdown_inner = 0;
 
     /**
       * Outfile remove
       */
 
-    if (keyspace == 0)
+    if (keyspace == 0 && benchmark == 0 && stdout_flag == 0)
     {
+      hc_thread_create (inner_threads[inner_threads_cnt], thread_monitor, NULL);
+
+      inner_threads_cnt++;
+
       if (outfile_check_timer != 0)
       {
         if (data.outfile_check_directory != NULL)
@@ -17225,9 +17225,9 @@ int main (int argc, char **argv)
               !((hash_mode >= 13700) && (hash_mode <= 13799)) &&
               (hash_mode != 9000))
           {
-            hc_thread_create (ni_threads[ni_threads_cnt], thread_outfile_remove, NULL);
+            hc_thread_create (inner_threads[inner_threads_cnt], thread_outfile_remove, NULL);
 
-            ni_threads_cnt++;
+            inner_threads_cnt++;
           }
           else
           {
@@ -17273,9 +17273,9 @@ int main (int argc, char **argv)
 
     for (uint maskpos = rd->maskpos; maskpos < maskcnt; maskpos++)
     {
-      if (data.devices_status == STATUS_CRACKED) break;
-
-      data.devices_status = STATUS_INIT;
+      if (data.devices_status == STATUS_CRACKED) continue;
+      if (data.devices_status == STATUS_ABORTED) continue;
+      if (data.devices_status == STATUS_QUIT)    continue;
 
       if (maskpos > rd->maskpos)
       {
@@ -17514,15 +17514,24 @@ int main (int argc, char **argv)
         }
       }
 
-      for (uint dictpos = rd->dictpos; dictpos < dictcnt; )
+      for (uint dictpos = rd->dictpos; dictpos < dictcnt; dictpos++)
       {
+        if (data.devices_status == STATUS_CRACKED) continue;
+        if (data.devices_status == STATUS_ABORTED) continue;
+        if (data.devices_status == STATUS_QUIT)    continue;
+
+        rd->dictpos = dictpos;
+
         char *subid = logfile_generate_subid ();
 
         data.subid = subid;
 
         logfile_sub_msg ("START");
 
-        data.devices_status = STATUS_INIT;
+        if ((data.devices_status != STATUS_BYPASS) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
+        {
+          data.devices_status = STATUS_INIT;
+        }
 
         memset (data.words_progress_done,     0, data.salts_cnt * sizeof (u64));
         memset (data.words_progress_rejected, 0, data.salts_cnt * sizeof (u64));
@@ -17622,10 +17631,7 @@ int main (int argc, char **argv)
 
             if (data.words_cnt == 0)
             {
-              if (data.devices_status == STATUS_CRACKED) break;
-              if (data.devices_status == STATUS_ABORTED) break;
-
-              dictpos++;
+              logfile_sub_msg ("STOP");
 
               continue;
             }
@@ -17672,10 +17678,7 @@ int main (int argc, char **argv)
 
           if (data.words_cnt == 0)
           {
-            if (data.devices_status == STATUS_CRACKED) break;
-            if (data.devices_status == STATUS_ABORTED) break;
-
-            dictpos++;
+            logfile_sub_msg ("STOP");
 
             continue;
           }
@@ -17715,10 +17718,7 @@ int main (int argc, char **argv)
 
           if (data.words_cnt == 0)
           {
-            if (data.devices_status == STATUS_CRACKED) break;
-            if (data.devices_status == STATUS_ABORTED) break;
-
-            dictpos++;
+            logfile_sub_msg ("STOP");
 
             continue;
           }
@@ -17782,10 +17782,6 @@ int main (int argc, char **argv)
 
             // skip to next mask
 
-            dictpos++;
-
-            rd->dictpos = dictpos;
-
             logfile_sub_msg ("STOP");
 
             continue;
@@ -18063,7 +18059,10 @@ int main (int argc, char **argv)
 
         hc_thread_t *c_threads = (hc_thread_t *) mycalloc (data.devices_cnt, sizeof (hc_thread_t));
 
-        data.devices_status = STATUS_AUTOTUNE;
+        if ((data.devices_status != STATUS_BYPASS) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
+        {
+          data.devices_status = STATUS_AUTOTUNE;
+        }
 
         for (uint device_id = 0; device_id < data.devices_cnt; device_id++)
         {
@@ -18117,7 +18116,10 @@ int main (int argc, char **argv)
          * create cracker threads
          */
 
-        data.devices_status = STATUS_RUNNING;
+        if ((data.devices_status != STATUS_BYPASS) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
+        {
+          data.devices_status = STATUS_RUNNING;
+        }
 
         if (initial_restore_done == 0)
         {
@@ -18166,21 +18168,14 @@ int main (int argc, char **argv)
 
         local_free (c_threads);
 
-        data.restore = 0;
-
-        // finalize task
+        if ((data.devices_status != STATUS_BYPASS) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
+        {
+          data.devices_status = STATUS_EXHAUSTED;
+        }
 
         logfile_sub_var_uint ("status-after-work", data.devices_status);
 
-        if (data.devices_status == STATUS_STOP_AT_CHECKPOINT) check_checkpoint ();
-
-        if (data.devices_status == STATUS_CRACKED) break;
-        if (data.devices_status == STATUS_ABORTED) break;
-
-        if (data.devices_status == STATUS_BYPASS)
-        {
-          data.devices_status = STATUS_RUNNING;
-        }
+        data.restore = 0;
 
         if (induction_dictionaries_cnt)
         {
@@ -18196,47 +18191,34 @@ int main (int argc, char **argv)
           induction_dictionaries_cnt = count_dictionaries (induction_dictionaries);
         }
 
-        if (benchmark == 0)
+        if (benchmark == 1)
         {
-          if (((dictpos + 1) < dictcnt) || ((maskpos + 1) < maskcnt) || induction_dictionaries_cnt)
-          {
-            if (quiet == 0) clear_prompt ();
+          status_benchmark ();
 
-            if (quiet == 0) log_info ("");
-
-            if (status == 1)
-            {
-              status_display ();
-            }
-            else
-            {
-              if (quiet == 0) status_display ();
-            }
-
-            if (quiet == 0) log_info ("");
+          if (machine_readable == 0)
+          {
+            log_info ("");
           }
         }
-
-        if (attack_mode == ATTACK_MODE_BF)
-        {
-          dictpos++;
-
-          rd->dictpos = dictpos;
-        }
         else
         {
-          if (induction_dictionaries_cnt)
-          {
-            qsort (induction_dictionaries, induction_dictionaries_cnt, sizeof (char *), sort_by_mtime);
-          }
-          else
+          if (quiet == 0)
           {
-            dictpos++;
+            clear_prompt ();
+
+            log_info ("");
+
+            if (stdout_flag == 0) status_display ();
 
-            rd->dictpos = dictpos;
+            log_info ("");
           }
         }
 
+        if (induction_dictionaries_cnt)
+        {
+          qsort (induction_dictionaries, induction_dictionaries_cnt, sizeof (char *), sort_by_mtime);
+        }
+
         time_t runtime_stop;
 
         time (&runtime_stop);
@@ -18249,22 +18231,37 @@ int main (int argc, char **argv)
         logfile_sub_msg ("STOP");
 
         global_free (subid);
-      }
 
-      if (data.devices_status == STATUS_STOP_AT_CHECKPOINT) check_checkpoint ();
+        // from this point we handle bypass as running
+
+        if (data.devices_status == STATUS_BYPASS)
+        {
+          data.devices_status = STATUS_RUNNING;
+        }
+
+        // and overwrite benchmark aborts as well
+
+        if (data.benchmark == 1)
+        {
+          if (data.devices_status == STATUS_ABORTED)
+          {
+            data.devices_status = STATUS_RUNNING;
+          }
+        }
+
+        // finalize task
+
+        if (data.devices_status == STATUS_CRACKED) break;
+        if (data.devices_status == STATUS_ABORTED) break;
+        if (data.devices_status == STATUS_QUIT)    break;
+      }
 
       if (data.devices_status == STATUS_CRACKED) break;
       if (data.devices_status == STATUS_ABORTED) break;
       if (data.devices_status == STATUS_QUIT)    break;
-
-      if (data.devices_status == STATUS_BYPASS)
-      {
-        data.devices_status = STATUS_RUNNING;
-      }
     }
 
     // problems could occur if already at startup everything was cracked (because of .pot file reading etc), we must set some variables here to avoid NULL pointers
-
     if (attack_mode == ATTACK_MODE_STRAIGHT)
     {
       if (data.wordlist_mode == WL_MODE_FILE)
@@ -18303,11 +18300,6 @@ int main (int argc, char **argv)
       }
     }
 
-    if ((data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
-    {
-      data.devices_status = STATUS_EXHAUSTED;
-    }
-
     // if cracked / aborted remove last induction dictionary
 
     for (int file_pos = 0; file_pos < induction_dictionaries_cnt; file_pos++)
@@ -18320,23 +18312,16 @@ int main (int argc, char **argv)
       }
     }
 
-    // wait for non-interactive threads
-
-    for (uint thread_idx = 0; thread_idx < ni_threads_cnt; thread_idx++)
-    {
-      hc_thread_wait (1, &ni_threads[thread_idx]);
-    }
+    // wait for inner threads
 
-    local_free (ni_threads);
+    data.shutdown_inner = 1;
 
-    // wait for interactive threads
-
-    for (uint thread_idx = 0; thread_idx < i_threads_cnt; thread_idx++)
+    for (uint thread_idx = 0; thread_idx < inner_threads_cnt; thread_idx++)
     {
-      hc_thread_wait (1, &i_threads[thread_idx]);
+      hc_thread_wait (1, &inner_threads[thread_idx]);
     }
 
-    local_free (i_threads);
+    local_free (inner_threads);
 
     // we dont need restore file anymore
     if (data.restore_disable == 0)
@@ -18363,33 +18348,6 @@ int main (int argc, char **argv)
      * Clean up
      */
 
-    if (benchmark == 1)
-    {
-      status_benchmark ();
-
-      if (machine_readable == 0)
-      {
-        log_info ("");
-      }
-    }
-    else
-    {
-      if (quiet == 0) clear_prompt ();
-
-      if (quiet == 0) log_info ("");
-
-      if (status == 1)
-      {
-        status_display ();
-      }
-      else
-      {
-        if (quiet == 0) status_display ();
-      }
-
-      if (quiet == 0) log_info ("");
-    }
-
     for (uint device_id = 0; device_id < data.devices_cnt; device_id++)
     {
       hc_device_param_t *device_param = &data.devices_param[device_id];
@@ -18397,15 +18355,10 @@ int main (int argc, char **argv)
       if (device_param->skipped) continue;
 
       local_free (device_param->combs_buf);
-
       local_free (device_param->hooks_buf);
-
       local_free (device_param->device_name);
-
       local_free (device_param->device_name_chksum);
-
       local_free (device_param->device_version);
-
       local_free (device_param->driver_version);
 
       if (device_param->pws_buf)            myfree                    (device_param->pws_buf);
@@ -18463,7 +18416,7 @@ int main (int argc, char **argv)
     #ifdef HAVE_HWMON
     if (gpu_temp_disable == 0)
     {
-      if (gpu_temp_retain != 0) // VENDOR_ID_AMD is implied here
+      if (gpu_temp_retain != 0)
       {
         hc_thread_mutex_lock (mux_adl);
 
@@ -18475,30 +18428,24 @@ int main (int argc, char **argv)
 
           if (data.hm_device[device_id].fan_set_supported == 1)
           {
-            int fanspeed  = temp_retain_fanspeed_value[device_id];
-            int fanpolicy = temp_retain_fanpolicy_value[device_id];
+            int rc = -1;
 
-            if (fanpolicy == 1)
+            if (device_param->device_vendor_id == VENDOR_ID_AMD)
             {
-              int rc = -1;
-
-              if (device_param->device_vendor_id == VENDOR_ID_AMD)
-              {
-                rc = hm_set_fanspeed_with_device_id_adl (device_id, fanspeed, 0);
-              }
-              else if (device_param->device_vendor_id == VENDOR_ID_NV)
-              {
-                #ifdef LINUX
-                rc = set_fan_control (data.hm_xnvctrl, data.hm_device[device_id].xnvctrl, NV_CTRL_GPU_COOLER_MANUAL_CONTROL_FALSE);
-                #endif
-
-                #ifdef WIN
-                rc = hm_set_fanspeed_with_device_id_nvapi (device_id, fanspeed, fanpolicy);
-                #endif
-              }
+              rc = hm_set_fanspeed_with_device_id_adl (device_id, 100, 0);
+            }
+            else if (device_param->device_vendor_id == VENDOR_ID_NV)
+            {
+              #ifdef LINUX
+              rc = set_fan_control (data.hm_xnvctrl, data.hm_device[device_id].xnvctrl, NV_CTRL_GPU_COOLER_MANUAL_CONTROL_FALSE);
+              #endif
 
-              if (rc == -1) log_info ("WARNING: Failed to restore default fan speed and policy for device #%", device_id + 1);
+              #ifdef WIN
+              rc = hm_set_fanspeed_with_device_id_nvapi (device_id, 100, 0);
+              #endif
             }
+
+            if (rc == -1) log_info ("WARNING: Failed to restore default fan speed and policy for device #%", device_id + 1);
           }
         }
 
@@ -18508,7 +18455,7 @@ int main (int argc, char **argv)
 
     // reset power tuning
 
-    if (powertune_enable == 1) // VENDOR_ID_AMD is implied here
+    if (powertune_enable == 1)
     {
       hc_thread_mutex_lock (mux_adl);
 
@@ -18659,7 +18606,6 @@ int main (int argc, char **argv)
     local_free (bitmap_s2_d);
 
     #ifdef HAVE_HWMON
-    local_free (temp_retain_fanspeed_value);
     local_free (od_clock_mem_status);
     local_free (od_power_control_status);
     local_free (nvml_power_limit);
@@ -18690,6 +18636,17 @@ int main (int argc, char **argv)
     if (data.devices_status == STATUS_QUIT) break;
   }
 
+  // wait for outer threads
+
+  data.shutdown_outer = 1;
+
+  for (uint thread_idx = 0; thread_idx < outer_threads_cnt; thread_idx++)
+  {
+    hc_thread_wait (1, &outer_threads[thread_idx]);
+  }
+
+  local_free (outer_threads);
+
   // destroy others mutex
 
   hc_thread_mutex_delete (mux_dispatcher);

diff --git a/src/shared.c b/src/shared.c
index 9e16c02..2cc6d9f 100644 (file)
--- a/src/shared.c
+++ b/src/shared.c
@@ -3402,11 +3402,17 @@ int hm_get_throttle_with_device_id (const uint device_id)
     if (hm_NVML_nvmlDeviceGetCurrentClocksThrottleReasons   (data.hm_nvml, 1, data.hm_device[device_id].nvml, &clocksThrottleReasons)    != NVML_SUCCESS) return -1;
     if (hm_NVML_nvmlDeviceGetSupportedClocksThrottleReasons (data.hm_nvml, 1, data.hm_device[device_id].nvml, &supportedThrottleReasons) != NVML_SUCCESS) return -1;
 
-    clocksThrottleReasons &= supportedThrottleReasons;
-
+    clocksThrottleReasons &=  supportedThrottleReasons;
+    clocksThrottleReasons &= ~nvmlClocksThrottleReasonGpuIdle;
+    clocksThrottleReasons &= ~nvmlClocksThrottleReasonApplicationsClocksSetting;
     clocksThrottleReasons &= ~nvmlClocksThrottleReasonUnknown;
 
-    return (clocksThrottleReasons > 0);
+    if (data.kernel_power_final)
+    {
+      clocksThrottleReasons &= ~nvmlClocksThrottleReasonHwSlowdown;
+    }
+
+    return (clocksThrottleReasons != nvmlClocksThrottleReasonNone);
   }
 
   return -1;
@@ -3418,33 +3424,51 @@ int hm_set_fanspeed_with_device_id_adl (const uint device_id, const int fanspeed
   {
     if (data.hm_adl)
     {
-      if (data.hm_device[device_id].od_version == 5)
+      if (fanpolicy == 1)
       {
-        ADLFanSpeedValue lpFanSpeedValue;
+        if (data.hm_device[device_id].od_version == 5)
+        {
+          ADLFanSpeedValue lpFanSpeedValue;
 
-        memset (&lpFanSpeedValue, 0, sizeof (lpFanSpeedValue));
+          memset (&lpFanSpeedValue, 0, sizeof (lpFanSpeedValue));
 
-        lpFanSpeedValue.iSize      = sizeof (lpFanSpeedValue);
-        lpFanSpeedValue.iSpeedType = ADL_DL_FANCTRL_SPEED_TYPE_PERCENT;
-        lpFanSpeedValue.iFlags     = (fanpolicy == 1) ? ADL_DL_FANCTRL_FLAG_USER_DEFINED_SPEED : 0;
-        lpFanSpeedValue.iFanSpeed  = fanspeed;
+          lpFanSpeedValue.iSize      = sizeof (lpFanSpeedValue);
+          lpFanSpeedValue.iSpeedType = ADL_DL_FANCTRL_SPEED_TYPE_PERCENT;
+          lpFanSpeedValue.iFlags     = ADL_DL_FANCTRL_FLAG_USER_DEFINED_SPEED;
+          lpFanSpeedValue.iFanSpeed  = fanspeed;
 
-        if (hm_ADL_Overdrive5_FanSpeed_Set (data.hm_adl, data.hm_device[device_id].adl, 0, &lpFanSpeedValue) != ADL_OK) return -1;
+          if (hm_ADL_Overdrive5_FanSpeed_Set (data.hm_adl, data.hm_device[device_id].adl, 0, &lpFanSpeedValue) != ADL_OK) return -1;
 
-        return 0;
-      }
-      else // od_version == 6
-      {
-        ADLOD6FanSpeedValue fan_speed_value;
+          return 0;
+        }
+        else // od_version == 6
+        {
+          ADLOD6FanSpeedValue fan_speed_value;
 
-        memset (&fan_speed_value, 0, sizeof (fan_speed_value));
+          memset (&fan_speed_value, 0, sizeof (fan_speed_value));
 
-        fan_speed_value.iSpeedType = ADL_OD6_FANSPEED_TYPE_PERCENT;
-        fan_speed_value.iFanSpeed  = fanspeed;
+          fan_speed_value.iSpeedType = ADL_OD6_FANSPEED_TYPE_PERCENT;
+          fan_speed_value.iFanSpeed  = fanspeed;
 
-        if (hm_ADL_Overdrive6_FanSpeed_Set (data.hm_adl, data.hm_device[device_id].adl, &fan_speed_value) != ADL_OK) return -1;
+          if (hm_ADL_Overdrive6_FanSpeed_Set (data.hm_adl, data.hm_device[device_id].adl, &fan_speed_value) != ADL_OK) return -1;
 
-        return 0;
+          return 0;
+        }
+      }
+      else
+      {
+        if (data.hm_device[device_id].od_version == 5)
+        {
+          if (hm_ADL_Overdrive5_FanSpeedToDefault_Set (data.hm_adl, data.hm_device[device_id].adl, 0) != ADL_OK) return -1;
+
+          return 0;
+        }
+        else // od_version == 6
+        {
+          if (hm_ADL_Overdrive6_FanSpeed_Reset (data.hm_adl, data.hm_device[device_id].adl) != ADL_OK) return -1;
+
+          return 0;
+        }
       }
     }
   }
@@ -3458,16 +3482,25 @@ int hm_set_fanspeed_with_device_id_nvapi (const uint device_id, const int fanspe
   {
     if (data.hm_nvapi)
     {
-      NV_GPU_COOLER_LEVELS CoolerLevels = { 0 };
+      if (fanpolicy == 1)
+      {
+        NV_GPU_COOLER_LEVELS CoolerLevels = { 0 };
 
-      CoolerLevels.Version = GPU_COOLER_LEVELS_VER | sizeof (NV_GPU_COOLER_LEVELS);
+        CoolerLevels.Version = GPU_COOLER_LEVELS_VER | sizeof (NV_GPU_COOLER_LEVELS);
 
-      CoolerLevels.Levels[0].Level  = fanspeed;
-      CoolerLevels.Levels[0].Policy = fanpolicy;
+        CoolerLevels.Levels[0].Level  = fanspeed;
+        CoolerLevels.Levels[0].Policy = 1;
 
-      if (hm_NvAPI_GPU_SetCoolerLevels (data.hm_nvapi, data.hm_device[device_id].nvapi, 0, &CoolerLevels) != NVAPI_OK) return -1;
+        if (hm_NvAPI_GPU_SetCoolerLevels (data.hm_nvapi, data.hm_device[device_id].nvapi, 0, &CoolerLevels) != NVAPI_OK) return -1;
 
-      return 0;
+        return 0;
+      }
+      else
+      {
+        if (hm_NvAPI_GPU_RestoreCoolerSettings (data.hm_nvapi, data.hm_device[device_id].nvapi, 0) != NVAPI_OK) return -1;
+
+        return 0;
+      }
     }
   }
 
@@ -9129,36 +9162,32 @@ void to_hccap_t (hccap_t *hccap, uint salt_pos, uint digest_pos)
 
 void SuspendThreads ()
 {
-  if (data.devices_status == STATUS_RUNNING)
-  {
-    hc_timer_set (&data.timer_paused);
+  if (data.devices_status != STATUS_RUNNING) return;
 
-    data.devices_status = STATUS_PAUSED;
+  hc_timer_set (&data.timer_paused);
 
-    log_info ("Paused");
-  }
+  data.devices_status = STATUS_PAUSED;
+
+  log_info ("Paused");
 }
 
 void ResumeThreads ()
 {
-  if (data.devices_status == STATUS_PAUSED)
-  {
-    double ms_paused;
+  if (data.devices_status != STATUS_PAUSED) return;
 
-    hc_timer_get (data.timer_paused, ms_paused);
+  double ms_paused;
 
-    data.ms_paused += ms_paused;
+  hc_timer_get (data.timer_paused, ms_paused);
 
-    data.devices_status = STATUS_RUNNING;
+  data.ms_paused += ms_paused;
 
-    log_info ("Resumed");
-  }
+  data.devices_status = STATUS_RUNNING;
+
+  log_info ("Resumed");
 }
 
 void bypass ()
 {
-  if (data.devices_status != STATUS_RUNNING) return;
-
   data.devices_status = STATUS_BYPASS;
 
   log_info ("Next dictionary / mask in queue selected, bypassing current one");
@@ -9206,39 +9235,54 @@ void stop_at_checkpoint ()
 
 void myabort ()
 {
-  if (data.devices_status == STATUS_INIT)     return;
-  if (data.devices_status == STATUS_STARTING) return;
-
   data.devices_status = STATUS_ABORTED;
 }
 
 void myquit ()
 {
-  if (data.devices_status == STATUS_INIT)     return;
-  if (data.devices_status == STATUS_STARTING) return;
-
   data.devices_status = STATUS_QUIT;
 }
 
-void naive_escape (const char *cpath_real, char *cpath_escaped, const size_t cpath_escaped_len)
+void naive_replace (char *s, const u8 key_char, const u8 replace_char)
 {
-  const size_t len = strlen (cpath_real);
+  const size_t len = strlen (s);
+
+  for (size_t in = 0; in < len; in++)
+  {
+    const u8 c = s[in];
+
+    if (c == key_char)
+    {
+      s[in] = replace_char;
+    }
+  }
+}
+
+void naive_escape (char *s, size_t s_max, const u8 key_char, const u8 escape_char)
+{
+  char s_escaped[1024] = { 0 };
+
+  size_t s_escaped_max = sizeof (s_escaped);
+
+  const size_t len = strlen (s);
 
   for (size_t in = 0, out = 0; in < len; in++, out++)
   {
-    const u8 c = cpath_real[in];
+    const u8 c = s[in];
 
-    if (c == ' ')
+    if (c == key_char)
     {
-      cpath_escaped[out] = '\\';
+      s_escaped[out] = escape_char;
 
       out++;
     }
 
-    if (out == cpath_escaped_len) break;
+    if (out == s_escaped_max - 2) break;
 
-    cpath_escaped[out] = c;
+    s_escaped[out] = c;
   }
+
+  strncpy (s, s_escaped, s_max - 1);
 }
 
 void load_kernel (const char *kernel_file, int num_devices, size_t *kernel_lengths, const u8 **kernel_sources)
@@ -20683,7 +20727,7 @@ BOOL WINAPI sigHandler_benchmark (DWORD sig)
   {
     case CTRL_CLOSE_EVENT:
 
-      myabort ();
+      myquit ();
 
       SetConsoleCtrlHandler (NULL, TRUE);
 
@@ -20748,13 +20792,11 @@ void status_display ();
 
 void *thread_keypress (void *p)
 {
-  int benchmark = *((int *) p);
-
   uint quiet = data.quiet;
 
   tty_break();
 
-  while ((data.devices_status != STATUS_EXHAUSTED) && (data.devices_status != STATUS_CRACKED) && (data.devices_status != STATUS_ABORTED) && (data.devices_status != STATUS_QUIT))
+  while (data.shutdown_outer == 0)
   {
     int ch = tty_getchar();
 
@@ -20831,8 +20873,6 @@ void *thread_keypress (void *p)
 
         log_info ("");
 
-        if (benchmark == 1) break;
-
         stop_at_checkpoint ();
 
         log_info ("");
@@ -20846,14 +20886,7 @@ void *thread_keypress (void *p)
 
         log_info ("");
 
-        if (benchmark == 1)
-        {
-          myquit ();
-        }
-        else
-        {
-          myabort ();
-        }
+        myabort ();
 
         break;
     }