feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Adds option --enable-chacha=noasm to allow disabling the Intel AVX/AVX2 speedups when used with --enable-intelasm.

Browse Source
This commit is contained in:
David Garske
2017-08-03 13:39:46 -07:00
parent 4d6cb66bc1
commit 3be4e0823e
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -1934,11 +1934,18 @@ fi
# CHACHA # CHACHA
AC_ARG_ENABLE([chacha], AC_ARG_ENABLE([chacha],
[AS_HELP_STRING([--enable-chacha],[Enable CHACHA (default: enabled)])], [AS_HELP_STRING([--enable-chacha],[Enable CHACHA (default: enabled). Use `=noasm` to disable Intel AVX/AVX2 speedups])],
[ ENABLED_CHACHA=$enableval ], [ ENABLED_CHACHA=$enableval ],
[ ENABLED_CHACHA=$CHACHA_DEFAULT] [ ENABLED_CHACHA=$CHACHA_DEFAULT]
) )
if test "$ENABLED_AESNI" = "noasm"
then
AM_CFLAGS="$AM_CFLAGS -DNO_CHACHA_ASM"
ENABLED_AESNI=yes
fi
# leanpsk and leantls don't need chacha # leanpsk and leantls don't need chacha
if test "$ENABLED_LEANPSK" = "yes" || test "$ENABLED_LEANTLS" = "yes" if test "$ENABLED_LEANPSK" = "yes" || test "$ENABLED_LEANTLS" = "yes"
then then

26
wolfcrypt/src/chacha.c
View File

@ -49,9 +49,17 @@
#include <stdio.h> #include <stdio.h>
#endif #endif
#ifdef USE_INTEL_SPEEDUP #ifdef WOLFSSL_X86_64_BUILD
#include <emmintrin.h> #if defined(USE_INTEL_SPEEDUP) && !defined(NO_CHACHA_ASM)
#include <immintrin.h> #define USE_INTEL_CHACHA_SPEEDUP
#endif
#endif
#ifdef USE_INTEL_CHACHA_SPEEDUP
#include <emmintrin.h>
#include <immintrin.h>
#define HAVE_INTEL_AVX1
#define HAVE_INTEL_AVX2
#endif #endif
#ifdef BIG_ENDIAN_ORDER #ifdef BIG_ENDIAN_ORDER
@ -389,11 +397,7 @@ static INLINE void wc_Chacha_wordtobyte(word32 output[CHACHA_CHUNK_WORDS],
} }
#ifdef WOLFSSL_X86_64_BUILD #ifdef USE_INTEL_CHACHA_SPEEDUP
#ifdef USE_INTEL_SPEEDUP
#define HAVE_INTEL_AVX1
#define HAVE_INTEL_AVX2
#endif
#ifdef HAVE_INTEL_AVX1 #ifdef HAVE_INTEL_AVX1
static void chacha_encrypt_avx(ChaCha* ctx, const byte* m, byte* c, static void chacha_encrypt_avx(ChaCha* ctx, const byte* m, byte* c,
@ -949,7 +953,7 @@ static void chacha_encrypt_avx2(ChaCha* ctx, const byte* m, byte* c,
} }
} }
#endif /* HAVE_INTEL_AVX2 */ #endif /* HAVE_INTEL_AVX2 */
#endif /* WOLFSSL_X86_64_BUILD */ #endif /* USE_INTEL_CHACHA_SPEEDUP */
/** /**
* Encrypt a stream of bytes * Encrypt a stream of bytes
@ -990,8 +994,7 @@ int wc_Chacha_Process(ChaCha* ctx, byte* output, const byte* input,
if (ctx == NULL) if (ctx == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#ifdef WOLFSSL_X86_64_BUILD #ifdef USE_INTEL_CHACHA_SPEEDUP
#ifdef USE_INTEL_SPEEDUP
#ifdef HAVE_INTEL_AVX2 #ifdef HAVE_INTEL_AVX2
if (IS_INTEL_AVX2(cpuid_get_flags())) if (IS_INTEL_AVX2(cpuid_get_flags()))
chacha_encrypt_avx2(ctx, input, output, msglen); chacha_encrypt_avx2(ctx, input, output, msglen);
@ -999,7 +1002,6 @@ int wc_Chacha_Process(ChaCha* ctx, byte* output, const byte* input,
#endif #endif
chacha_encrypt_avx(ctx, input, output, msglen); chacha_encrypt_avx(ctx, input, output, msglen);
return 0; return 0;
#endif
#endif #endif
wc_Chacha_encrypt_bytes(ctx, input, output, msglen); wc_Chacha_encrypt_bytes(ctx, input, output, msglen);