shithub: blake2

Info  •  Files  •  Log  •  Branches

fix issues reported by Yutaka Sawada

--- a/sse/blake2b-round.h

+++ b/sse/blake2b-round.h

@@ -33,7 +33,7 @@

     : (-(c) == 63) ? _mm_xor_si128(_mm_srli_epi64((x), -(c)), _mm_add_epi64((x), (x)))  \

     : _mm_xor_si128(_mm_srli_epi64((x), -(c)), _mm_slli_epi64((x), 64-(-(c))))

 #else

-#define _mm_roti_epi64(r, c) _mm_xor_si128(_mm_srli_epi64( (r), -(c) ),_mm_slli_epi64( (r), 64-(-c) ))

+#define _mm_roti_epi64(r, c) _mm_xor_si128(_mm_srli_epi64( (r), -(c) ),_mm_slli_epi64( (r), 64-(-(c)) ))

 #endif

 #else

 /* ... */

--- a/sse/blake2b.c

+++ b/sse/blake2b.c

@@ -20,7 +20,9 @@

 #include "blake2-config.h"

-

+#ifdef _MSC_VER

+#include <intrin.h> /* for _mm_set_epi64x */

+#endif

 #include <emmintrin.h>

 #if defined(HAVE_SSSE3)

 #include <tmmintrin.h>

--- a/sse/blake2s-round.h

+++ b/sse/blake2s-round.h

@@ -31,7 +31,7 @@

               : (16==-(c)) ? _mm_shuffle_epi8(r,r16) \

               : _mm_xor_si128(_mm_srli_epi32( (r), -(c) ),_mm_slli_epi32( (r), 32-(-(c)) )) )

 #else

-#define _mm_roti_epi32(r, c) _mm_xor_si128(_mm_srli_epi32( (r), -(c) ),_mm_slli_epi32( (r), 32-(-c) ))

+#define _mm_roti_epi32(r, c) _mm_xor_si128(_mm_srli_epi32( (r), -(c) ),_mm_slli_epi32( (r), 32-(-(c)) ))

 #endif

 #else

 /* ... */

-- 

⑨