Revert adding make_u32x() for constants to crypto primitives, fails on OpenCL

3 years ago · 92dc57df28
parent bdb7999f07
commit 92dc57df28
6 changed files with 7 additions and 7 deletions
--- a/OpenCL/inc_hash_md4.h
+++ b/OpenCL/inc_hash_md4.h
@ -31,7 +31,7 @@

 #define MD4_STEP(f,a,b,c,d,x,K,s)     \
 {                                     \
-  a += make_u32x (K);                 \
+  a += K;                             \
  a  = hc_add3 (a, x, f (b, c, d));   \
  a  = hc_rotl32 (a, s);              \
 }
--- a/OpenCL/inc_hash_md5.h
+++ b/OpenCL/inc_hash_md5.h
@ -36,7 +36,7 @@

 #define MD5_STEP(f,a,b,c,d,x,K,s)   \
 {                                   \
-  a += make_u32x (K);               \
+  a += K;                           \
  a  = hc_add3 (a, x, f (b, c, d)); \
  a  = hc_rotl32 (a, s);            \
  a += b;                           \
--- a/OpenCL/inc_hash_ripemd160.h
+++ b/OpenCL/inc_hash_ripemd160.h
@ -32,7 +32,7 @@

 #define RIPEMD160_STEP(f,a,b,c,d,e,x,K,s) \
 {                                         \
-  a += make_u32x (K);                     \
+  a += K;                                 \
  a += x;                                 \
  a += f (b, c, d);                       \
  a  = hc_rotl32 (a, s);                  \
@ -54,7 +54,7 @@

 #define RIPEMD160_STEP_WORKAROUND_BUG(f,a,b,c,d,e,x,K,s)  \
 {                                         \
-  a += make_u32x (K);                     \
+  a += K;                                 \
  a += x;                                 \
  a += f (b, c, d);                       \
  a  = ROTATE_LEFT_WORKAROUND_BUG (a, s); \
--- a/OpenCL/inc_hash_sha1.h
+++ b/OpenCL/inc_hash_sha1.h
@ -28,7 +28,7 @@

 #define SHA1_STEP(f,a,b,c,d,e,x)    \
 {                                   \
-  e += make_u32x (K);               \
+  e += K;                           \
  e  = hc_add3 (e, x, f (b, c, d)); \
  e += hc_rotl32 (a,  5u);          \
  b  = hc_rotl32 (b, 30u);          \
--- a/OpenCL/inc_hash_sha384.h
+++ b/OpenCL/inc_hash_sha384.h
@ -44,7 +44,7 @@

 #define SHA384_STEP(F0,F1,a,b,c,d,e,f,g,h,x,K)  \
 {                                               \
-  h += make_u32x (K);                           \
+  h += K;                                       \
  h += x;                                       \
  h += SHA384_S1 (e);                           \
  h += F0 (e, f, g);                            \
--- a/OpenCL/inc_hash_sha512.h
+++ b/OpenCL/inc_hash_sha512.h
@ -44,7 +44,7 @@

 #define SHA512_STEP(F0,F1,a,b,c,d,e,f,g,h,x,K)  \
 {                                               \
-  h += make_u32x (K);                           \
+  h += K;                                       \
  h += x;                                       \
  h += SHA512_S1 (e);                           \
  h += F0 (e, f, g);                            \