From 0a4418a25fc2a984654f4591b733c56cd7a8dc9d Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sun, 26 Feb 2017 17:41:03 +0100 Subject: [PATCH] Compile salsa20-xmm6int only if HAVE_EMMINTRIN_H is defined This is redundant with the next check, and needs to be adjusted for Visual Studio --- .../crypto_stream/salsa20/xmm6int/stream_salsa20_xmm6int.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libsodium/crypto_stream/salsa20/xmm6int/stream_salsa20_xmm6int.c b/src/libsodium/crypto_stream/salsa20/xmm6int/stream_salsa20_xmm6int.c index c3ae9d35..93efdef3 100644 --- a/src/libsodium/crypto_stream/salsa20/xmm6int/stream_salsa20_xmm6int.c +++ b/src/libsodium/crypto_stream/salsa20/xmm6int/stream_salsa20_xmm6int.c @@ -3,6 +3,8 @@ #include #include +#if defined(HAVE_EMMINTRIN_H) && defined(__x86_64__) + #if defined(HAVE_EMMINTRIN_H) || \ (defined(_MSC_VER) && \ (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86))) @@ -19,7 +21,6 @@ #include "../stream_salsa20.h" #include "stream_salsa20_xmm6int.h" - #define ROUNDS 20 typedef struct salsa_ctx { @@ -183,3 +184,5 @@ struct crypto_stream_salsa20_implementation SODIUM_C99(.stream =) stream_ref, SODIUM_C99(.stream_xor_ic =) stream_ref_xor_ic }; + +#endif