wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 03:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Curve25519 FE math build error with Intel Speedups enabled and no AVX2. Fixes to allow forcing NO_AVX2_SUPPORT. Reproducible with ./configure --enable-curve25519 --enable-ed25519 --enable-intelasm CFLAGS="-DNO_AVX2_SUPPORT".

Browse Source
This commit is contained in:
David Garske
2018-12-05 13:04:30 -08:00
parent dfcfbc885d
commit 8355dd29cb
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/chacha.c
View File

@@ -55,10 +55,12 @@
#if defined(__GNUC__) && ((__GNUC__ < 4) || \
(__GNUC__ == 4 && __GNUC_MINOR__ <= 8))
#undef NO_AVX2_SUPPORT
#define NO_AVX2_SUPPORT
#endif
#if defined(__clang__) && ((__clang_major__ < 3) || \
(__clang_major__ == 3 && __clang_minor__ <= 5))
#undef NO_AVX2_SUPPORT
#define NO_AVX2_SUPPORT
#elif defined(__clang__) && defined(NO_AVX2_SUPPORT)
#undef NO_AVX2_SUPPORT

1
wolfcrypt/src/fe_x25519_x64.i
View File

@@ -24,6 +24,7 @@
#if defined(__GNUC__) && ((__GNUC__ < 4) || \
(__GNUC__ == 4 && __GNUC_MINOR__ <= 8))
#undef NO_AVX2_SUPPORT
#define NO_AVX2_SUPPORT
#endif
#if defined(__clang__) && ((__clang_major__ < 3) || \

1
wolfcrypt/src/poly1305.c
View File

@@ -56,6 +56,7 @@
#if defined(__GNUC__) && ((__GNUC__ < 4) || \
(__GNUC__ == 4 && __GNUC_MINOR__ <= 8))
#undef NO_AVX2_SUPPORT
#define NO_AVX2_SUPPORT
#endif
#if defined(__clang__) && ((__clang_major__ < 3) || \

11
wolfcrypt/src/sha256.c
View File

@@ -115,10 +115,9 @@
#if defined(USE_INTEL_SPEEDUP)
#define HAVE_INTEL_AVX1
#if defined(__GNUC__) && ((__GNUC__ < 4) || \
(__GNUC__ == 4 && __GNUC_MINOR__ <= 8))
#undef NO_AVX2_SUPPORT
#define NO_AVX2_SUPPORT
#endif
#if defined(__clang__) && ((__clang_major__ < 3) || \
@@ -1192,7 +1191,7 @@ static int InitSha256(wc_Sha256* sha256)
"xorl %" #e ", " L1 "\n\t" \
/* L2 = (f ^ g) & e */ \
"andl %" #e ", " L2 "\n\t" \
#define RND_STEP_0_4(a,b,c,d,e,f,g,h,i) \
/* L1 = ((e>>>14) ^ e) >>> 5 */ \
"rorl $5, " L1 "\n\t" \
@@ -1244,7 +1243,7 @@ static int InitSha256(wc_Sha256* sha256)
#define RND_STEP_1_1(a,b,c,d,e,f,g,h,i) \
/* L1 = e>>>14 */ \
"rorl $14, " L1 "\n\t" \
#define RND_STEP_1_2(a,b,c,d,e,f,g,h,i) \
/* L3 = b */ \
"movl %" #b ", " L4 "\n\t" \
@@ -1254,13 +1253,13 @@ static int InitSha256(wc_Sha256* sha256)
"addl (" #i ")*4(" WK "), %" #h "\n\t" \
/* L2 = f ^ g */ \
"xorl %" #g ", " L2 "\n\t" \
#define RND_STEP_1_3(a,b,c,d,e,f,g,h,i) \
/* L1 = (e>>>14) ^ e */ \
"xorl %" #e ", " L1 "\n\t" \
/* L2 = (f ^ g) & e */ \
"andl %" #e ", " L2 "\n\t" \
#define RND_STEP_1_4(a,b,c,d,e,f,g,h,i) \
/* L1 = ((e>>>14) ^ e) >>> 5 */ \
"rorl $5, " L1 "\n\t" \

3
wolfcrypt/src/sha512.c
View File

@@ -146,10 +146,9 @@
#if defined(USE_INTEL_SPEEDUP)
#define HAVE_INTEL_AVX1
#if defined(__GNUC__) && ((__GNUC__ < 4) || \
(__GNUC__ == 4 && __GNUC_MINOR__ <= 8))
#undef NO_AVX2_SUPPORT
#define NO_AVX2_SUPPORT
#endif
#if defined(__clang__) && ((__clang_major__ < 3) || \