From 92dc57df28cfd9b67894b2fa304d78331070d75f Mon Sep 17 00:00:00 2001
From: Jens Steube <jens.steube@gmail.com>
Date: Tue, 20 Jul 2021 10:34:34 +0200
Subject: [PATCH] Revert adding make_u32x() for constants to crypto primitives,
 fails on OpenCL

---
 OpenCL/inc_hash_md4.h       | 2 +-
 OpenCL/inc_hash_md5.h       | 2 +-
 OpenCL/inc_hash_ripemd160.h | 4 ++--
 OpenCL/inc_hash_sha1.h      | 2 +-
 OpenCL/inc_hash_sha384.h    | 2 +-
 OpenCL/inc_hash_sha512.h    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/OpenCL/inc_hash_md4.h b/OpenCL/inc_hash_md4.h
index 466c9249d..7c3b31894 100644
--- 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);              \
 }
diff --git a/OpenCL/inc_hash_md5.h b/OpenCL/inc_hash_md5.h
index 0d2db5c65..1e6eaaf93 100644
--- 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;                           \
diff --git a/OpenCL/inc_hash_ripemd160.h b/OpenCL/inc_hash_ripemd160.h
index 0266b7033..25a69ed56 100644
--- 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); \
diff --git a/OpenCL/inc_hash_sha1.h b/OpenCL/inc_hash_sha1.h
index 199983c90..2ff36fdad 100644
--- 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);          \
diff --git a/OpenCL/inc_hash_sha384.h b/OpenCL/inc_hash_sha384.h
index 6aa5893bd..92266b24a 100644
--- 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);                            \
diff --git a/OpenCL/inc_hash_sha512.h b/OpenCL/inc_hash_sha512.h
index e38f63c93..c66aa1fb9 100644
--- 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);                            \