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

Include private/sse2_64_32.h only where SSE2 is required

Browse Source 
Fixes #1074
This commit is contained in:
Frank Denis
2021-06-13 21:46:08 +02:00
parent 355f156ab7
commit 94daa0e15a
13 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c
+6 -6
View File
@@ -14,21 +14,21 @@
#include "crypto_aead_aes256gcm.h"
#include "export.h"
#include "private/common.h"
#include "private/sse2_64_32.h"
#include "randombytes.h"
#include "runtime.h"
#include "utils.h"
#if defined(HAVE_TMMINTRIN_H) && defined(HAVE_WMMINTRIN_H)
# ifdef __GNUC__
# pragma GCC target("ssse3")
# pragma GCC target("aes")
# pragma GCC target("pclmul")
# endif
#ifdef __GNUC__
# pragma GCC target("ssse3")
# pragma GCC target("aes")
# pragma GCC target("pclmul")
#endif
#include <tmmintrin.h>
#include <wmmintrin.h>
#include "private/sse2_64_32.h"
#ifndef ENOSYS
# define ENOSYS ENXIO
src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c
+1 -1
View File
@@ -8,7 +8,6 @@
#include "blake2.h"
#include "private/common.h"
#include "private/sse2_64_32.h"
#if defined(HAVE_AVX2INTRIN_H) && defined(HAVE_EMMINTRIN_H) && \
defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)
@@ -24,6 +23,7 @@
# include <immintrin.h>
# include <smmintrin.h>
# include <tmmintrin.h>
# include "private/sse2_64_32.h"
# include "blake2b-compress-avx2.h"
src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-sse41.c
+1 -1
View File
@@ -7,7 +7,6 @@
#include "blake2.h"
#include "private/common.h"
#include "private/sse2_64_32.h"
#if defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H) && \
defined(HAVE_SMMINTRIN_H)
@@ -21,6 +20,7 @@
# include <emmintrin.h>
# include <smmintrin.h>
# include <tmmintrin.h>
# include "private/sse2_64_32.h"
# include "blake2b-compress-sse41.h"
src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c
+1 -1
View File
@@ -4,7 +4,6 @@
#include "blake2.h"
#include "private/common.h"
#include "private/sse2_64_32.h"
#if defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H)
@@ -15,6 +14,7 @@
# include <emmintrin.h>
# include <tmmintrin.h>
# include "private/sse2_64_32.h"
# include "blake2b-compress-ssse3.h"
src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c
+1 -1
View File
@@ -6,7 +6,6 @@
#include "crypto_verify_16.h"
#include "poly1305_sse2.h"
#include "private/common.h"
#include "private/sse2_64_32.h"
#include "utils.h"
#if defined(HAVE_TI_MODE) && defined(HAVE_EMMINTRIN_H)
@@ -16,6 +15,7 @@
# endif
# include <emmintrin.h>
# include "private/sse2_64_32.h"
typedef __m128i xmmi;
src/libsodium/crypto_pwhash/argon2/argon2-fill-block-avx2.c
+5 -5
View File
@@ -18,7 +18,6 @@
#include "argon2-core.h"
#include "argon2.h"
#include "private/common.h"
#include "private/sse2_64_32.h"
#if defined(HAVE_AVX2INTRIN_H) && defined(HAVE_EMMINTRIN_H) && \
defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)
@@ -33,10 +32,11 @@
# ifdef _MSC_VER
# include <intrin.h> /* for _mm_set_epi64x */
# endif
#include <emmintrin.h>
#include <immintrin.h>
#include <smmintrin.h>
#include <tmmintrin.h>
# include <emmintrin.h>
# include <immintrin.h>
# include <smmintrin.h>
# include <tmmintrin.h>
# include "private/sse2_64_32.h"
# include "blamka-round-avx2.h"
src/libsodium/crypto_pwhash/argon2/argon2-fill-block-avx512f.c
+5 -5
View File
@@ -18,7 +18,6 @@
#include "argon2-core.h"
#include "argon2.h"
#include "private/common.h"
#include "private/sse2_64_32.h"
#if defined(HAVE_AVX512FINTRIN_H) && defined(HAVE_AVX2INTRIN_H) && \
defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)
@@ -34,10 +33,11 @@
# ifdef _MSC_VER
# include <intrin.h> /* for _mm_set_epi64x */
# endif
#include <emmintrin.h>
#include <immintrin.h>
#include <smmintrin.h>
#include <tmmintrin.h>
# include <emmintrin.h>
# include <immintrin.h>
# include <smmintrin.h>
# include <tmmintrin.h>
# include "private/sse2_64_32.h"
# include "blamka-round-avx512f.h"
src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ssse3.c
+1 -1
View File
@@ -18,7 +18,6 @@
#include "argon2-core.h"
#include "argon2.h"
#include "private/common.h"
#include "private/sse2_64_32.h"
#if defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H)
@@ -32,6 +31,7 @@
# endif
# include <emmintrin.h>
# include <tmmintrin.h>
# include "private/sse2_64_32.h"
# include "blamka-round-ssse3.h"
src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c
+1 -1
View File
@@ -35,7 +35,6 @@
#include <string.h>
#include "private/common.h"
#include "private/sse2_64_32.h"
#ifdef HAVE_EMMINTRIN_H
@@ -46,6 +45,7 @@
# if defined(__XOP__) && defined(DISABLED)
# include <x86intrin.h>
# endif
# include "private/sse2_64_32.h"
# include "../crypto_scrypt.h"
# include "../pbkdf2-sha256.h"
src/libsodium/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-avx2.c
+1 -1
View File
@@ -6,7 +6,6 @@
#include "core.h"
#include "crypto_stream_chacha20.h"
#include "private/common.h"
#include "private/sse2_64_32.h"
#include "utils.h"
#if defined(HAVE_AVX2INTRIN_H) && defined(HAVE_EMMINTRIN_H) && \
@@ -23,6 +22,7 @@
# include <immintrin.h>
# include <smmintrin.h>
# include <tmmintrin.h>
# include "private/sse2_64_32.h"
# include "../stream_chacha20.h"
# include "chacha20_dolbeau-avx2.h"
src/libsodium/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-ssse3.c
+1 -1
View File
@@ -6,7 +6,6 @@
#include "core.h"
#include "crypto_stream_chacha20.h"
#include "private/common.h"
#include "private/sse2_64_32.h"
#include "utils.h"
#if defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H)
@@ -18,6 +17,7 @@
# include <emmintrin.h>
# include <tmmintrin.h>
# include "private/sse2_64_32.h"
# include "../stream_chacha20.h"
# include "chacha20_dolbeau-ssse3.h"
src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-avx2.c
+1 -1
View File
@@ -5,7 +5,6 @@
#include "crypto_stream_salsa20.h"
#include "private/common.h"
#include "private/sse2_64_32.h"
#include "utils.h"
#if defined(HAVE_AVX2INTRIN_H) && defined(HAVE_EMMINTRIN_H) && \
@@ -22,6 +21,7 @@
#include <immintrin.h>
#include <smmintrin.h>
#include <tmmintrin.h>
#include "private/sse2_64_32.h"
# include "../stream_salsa20.h"
# include "salsa20_xmm6int-avx2.h"
src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-sse2.c
+1 -1
View File
@@ -5,7 +5,6 @@
#include "crypto_stream_salsa20.h"
#include "private/common.h"
#include "private/sse2_64_32.h"
#include "utils.h"
#ifdef HAVE_EMMINTRIN_H
@@ -14,6 +13,7 @@
# pragma GCC target("sse2")
# endif
# include <emmintrin.h>
# include "private/sse2_64_32.h"
# include "../stream_salsa20.h"
# include "salsa20_xmm6int-sse2.h"