X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gosthash2012_ref.h;h=f2383ea894985d898b99f444b42fae35efdd65fa;hb=fcca1ab049978ae66a3dfeff5e4704fa8127095e;hp=25f0ed85542b31ac9354b193f6d9ea6d5459ad56;hpb=88a44b67c76ce938f124e22e6a882780a98731fb;p=openssl-gost%2Fengine.git

diff --git a/gosthash2012_ref.h b/gosthash2012_ref.h
index 25f0ed8..f2383ea 100644
--- a/gosthash2012_ref.h
+++ b/gosthash2012_ref.h
@@ -12,8 +12,6 @@
 # error "GOST R 34.11-2012: portable implementation disabled in config.h"
 #endif
 
-# pragma message "Use regular implementation"
-
 #define X(x, y, z) { \
     z->QWORD[0] = x->QWORD[0] ^ y->QWORD[0]; \
     z->QWORD[1] = x->QWORD[1] ^ y->QWORD[1]; \
@@ -25,11 +23,10 @@
     z->QWORD[7] = x->QWORD[7] ^ y->QWORD[7]; \
 }
 
-#ifndef __GOST3411_BIG_ENDIAN__
 # define __XLPS_FOR for (_i = 0; _i <= 7; _i++)
+#ifndef __GOST3411_BIG_ENDIAN__
 # define _datai _i
 #else
-# define __XLPS_FOR for (_i = 7; _i >= 0; _i--)
 # define _datai 7 - _i
 #endif
 
@@ -48,14 +45,22 @@
     \
     \
     __XLPS_FOR {\
-        data->QWORD[_datai]  = Ax[0][(r0 >> (_i << 3)) & 0xFF]; \
-        data->QWORD[_datai] ^= Ax[1][(r1 >> (_i << 3)) & 0xFF]; \
-        data->QWORD[_datai] ^= Ax[2][(r2 >> (_i << 3)) & 0xFF]; \
-        data->QWORD[_datai] ^= Ax[3][(r3 >> (_i << 3)) & 0xFF]; \
-        data->QWORD[_datai] ^= Ax[4][(r4 >> (_i << 3)) & 0xFF]; \
-        data->QWORD[_datai] ^= Ax[5][(r5 >> (_i << 3)) & 0xFF]; \
-        data->QWORD[_datai] ^= Ax[6][(r6 >> (_i << 3)) & 0xFF]; \
-        data->QWORD[_datai] ^= Ax[7][(r7 >> (_i << 3)) & 0xFF]; \
+        data->QWORD[_datai]  = Ax[0][r0 & 0xFF]; \
+        data->QWORD[_datai] ^= Ax[1][r1 & 0xFF]; \
+        data->QWORD[_datai] ^= Ax[2][r2 & 0xFF]; \
+        data->QWORD[_datai] ^= Ax[3][r3 & 0xFF]; \
+        data->QWORD[_datai] ^= Ax[4][r4 & 0xFF]; \
+        data->QWORD[_datai] ^= Ax[5][r5 & 0xFF]; \
+        data->QWORD[_datai] ^= Ax[6][r6 & 0xFF]; \
+        data->QWORD[_datai] ^= Ax[7][r7 & 0xFF]; \
+        r0 >>= 8; \
+        r1 >>= 8; \
+        r2 >>= 8; \
+        r3 >>= 8; \
+        r4 >>= 8; \
+        r5 >>= 8; \
+        r6 >>= 8; \
+        r7 >>= 8; \
     }\
 }