QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-28 20:57:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Enable the xmm6int implementation on Visual Studio, too

Browse Source
This commit is contained in:
Frank Denis
2017-02-26 17:48:39 +01:00
parent 0a4418a25f
commit e08843d138
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_stream/salsa20/stream_salsa20.c
+10 -4
View File
@@ -1,13 +1,19 @@
#if defined(HAVE_EMMINTRIN_H) || \
(defined(_MSC_VER) && \
(defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)))
# define INCLUDE_SSE2_IMPL
#endif
#include "crypto_stream_salsa20.h"
#include "stream_salsa20.h"
#include "randombytes.h"
#include "runtime.h"
#include "ref/stream_salsa20_ref.h"
#ifdef HAVE_EMMINTRIN_H
#ifdef INCLUDE_SSE2_IMPL
# include "xmm6int/stream_salsa20_xmm6int.h"
#endif
#if defined(HAVE_EMMINTRIN_H) && defined(__x86_64__)
#if defined(INCLUDE_SSE2_IMPL) && defined(__x86_64__)
static const crypto_stream_salsa20_implementation *implementation =
&crypto_stream_salsa20_xmm6int_implementation;
#else
@@ -60,13 +66,13 @@ crypto_stream_salsa20_keygen(unsigned char k[crypto_stream_salsa20_KEYBYTES])
int
_crypto_stream_salsa20_pick_best_implementation(void)
{
#if defined(HAVE_EMMINTRIN_H) && defined(__x86_64__)
#if defined(INCLUDE_SSE2_IMPL) && defined(__x86_64__)
implementation = &crypto_stream_salsa20_xmm6int_implementation;
#else
implementation = &crypto_stream_salsa20_ref_implementation;
#endif
#ifdef HAVE_EMMINTRIN_H
#ifdef INCLUDE_SSE2_IMPL
if (sodium_runtime_has_sse2()) {
implementation = &crypto_stream_salsa20_xmm6int_implementation;
}
src/libsodium/crypto_stream/salsa20/xmm6int/stream_salsa20_xmm6int.c
+3 -6
View File
@@ -3,16 +3,13 @@
#include <stdlib.h>
#include <string.h>
#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)))
# ifdef __GNUC__
# pragma GCC target("sse2")
# endif
# include <emmintrin.h>
#ifdef __GNUC__
# pragma GCC target("sse2")
#endif
#include <emmintrin.h>
#include "crypto_stream_salsa20.h"
#include "private/common.h"