From 2d3ed421b68c08e8a1906c9c9c4aa3614515b140 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sun, 1 Nov 2015 17:27:40 +0100 Subject: [PATCH] The SSE4.1 implementation is fine on MSVC/x86, reenable it --- .../crypto_generichash/blake2/ref/blake2b-compress-sse41.c | 2 +- src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-sse41.c b/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-sse41.c index 9426db7f..48424e6b 100644 --- a/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-sse41.c +++ b/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-sse41.c @@ -6,7 +6,7 @@ #include #if (defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)) || \ - (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64))) + (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86))) #pragma GCC target("sse2") #pragma GCC target("ssse3") diff --git a/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c b/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c index d29e7125..f2e87c09 100644 --- a/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c +++ b/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c @@ -406,7 +406,7 @@ int blake2b_pick_best_implementation(void) { #if (defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)) || \ - (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64))) + (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86))) if (sodium_runtime_has_sse41()) { blake2b_compress = blake2b_compress_sse41; return 0;