gosthash2012: Enable building with SIMD implementation

[openssl-gost/engine.git] / gosthash2012.h

diff --git a/gosthash2012.h b/gosthash2012.h
index 021b7d4cee8effd71fe790ebc161a7ccdda27789..5b1cd9f1f5c61677d31156447543f0fd49cd0c75 100644 (file)
--- a/gosthash2012.h
+++ b/gosthash2012.h
@@ -10,12 +10,8 @@
 
 #include <string.h>
 
-#ifdef OPENSSL_IA32_SSE2
-# ifdef __MMX__
-#  ifdef __SSE2__
-#   define __GOST3411_HAS_SSE2__
-#  endif
-# endif
+#ifdef __SSE2__
+# define __GOST3411_HAS_SSE2__
 #endif
 
 #ifdef __GOST3411_HAS_SSE2__
@@ -27,12 +23,19 @@
 #ifndef L_ENDIAN
 # define __GOST3411_BIG_ENDIAN__
 #endif
+
 #if defined __GOST3411_HAS_SSE2__
 # include "gosthash2012_sse2.h"
 #else
 # include "gosthash2012_ref.h"
 #endif
 
+# if defined(__GNUC__) || defined(__clang__)
+#  define RESTRICT __restrict__
+# else
+#  define RESTRICT
+# endif
+
 #ifdef _MSC_VER
 # define ALIGN(x) __declspec(align(x))
 #else
@@ -42,16 +45,15 @@
 ALIGN(16)
 typedef union uint512_u {
     unsigned long long QWORD[8];
+    unsigned char B[64];
 } uint512_u;
 
 #include "gosthash2012_const.h"
 #include "gosthash2012_precalc.h"
 
 /* GOST R 34.11-2012 hash context */
-ALIGN(16)
 typedef struct gost2012_hash_ctx {
-    ALIGN(16) unsigned char buffer[64];
-    union uint512_u hash;
+    union uint512_u buffer;
     union uint512_u h;
     union uint512_u N;
     union uint512_u Sigma;