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

pull/2888/head
Jens Steube 3 years ago
parent bdb7999f07
commit 92dc57df28

@ -31,7 +31,7 @@
#define MD4_STEP(f,a,b,c,d,x,K,s) \ #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_add3 (a, x, f (b, c, d)); \
a = hc_rotl32 (a, s); \ a = hc_rotl32 (a, s); \
} }

@ -36,7 +36,7 @@
#define MD5_STEP(f,a,b,c,d,x,K,s) \ #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_add3 (a, x, f (b, c, d)); \
a = hc_rotl32 (a, s); \ a = hc_rotl32 (a, s); \
a += b; \ a += b; \

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

@ -28,7 +28,7 @@
#define SHA1_STEP(f,a,b,c,d,e,x) \ #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_add3 (e, x, f (b, c, d)); \
e += hc_rotl32 (a, 5u); \ e += hc_rotl32 (a, 5u); \
b = hc_rotl32 (b, 30u); \ b = hc_rotl32 (b, 30u); \

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

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

Loading…
Cancel
Save