From 18ac566f483672d503ee9e8e27fcf762cd35943d Mon Sep 17 00:00:00 2001 From: Sean Parkinson Date: Fri, 14 Jun 2019 10:22:27 +1000 Subject: [PATCH] Fix AVX2 ChaCha20 assembly --- wolfcrypt/src/chacha_asm.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wolfcrypt/src/chacha_asm.S b/wolfcrypt/src/chacha_asm.S index 5c6c4fd38..86e6bea5d 100644 --- a/wolfcrypt/src/chacha_asm.S +++ b/wolfcrypt/src/chacha_asm.S @@ -22,9 +22,9 @@ #ifndef HAVE_INTEL_AVX1 #define HAVE_INTEL_AVX1 #endif /* HAVE_INTEL_AVX1 */ -#ifndef HAVE_INTEL_AVX2 +#ifndef NO_AVX2_SUPPORT #define HAVE_INTEL_AVX2 -#endif /* HAVE_INTEL_AVX2 */ +#endif /* NO_AVX2_SUPPORT */ #ifndef __APPLE__ .text @@ -1293,7 +1293,7 @@ L_chacha20_avx2_loop256: vperm2i128 $32, %ymm1, %ymm0, %ymm8 vperm2i128 $32, %ymm3, %ymm2, %ymm9 vperm2i128 $49, %ymm1, %ymm0, %ymm12 - vperm2i128 $49, %ymm3, %ymm2, %ymm14 + vperm2i128 $49, %ymm3, %ymm2, %ymm13 vperm2i128 $32, %ymm5, %ymm4, %ymm10 vperm2i128 $32, %ymm7, %ymm6, %ymm11 vperm2i128 $49, %ymm5, %ymm4, %ymm14 @@ -1349,7 +1349,7 @@ L_chacha20_avx2_loop256: vperm2i128 $32, %ymm1, %ymm0, %ymm8 vperm2i128 $32, %ymm3, %ymm2, %ymm9 vperm2i128 $49, %ymm1, %ymm0, %ymm12 - vperm2i128 $49, %ymm3, %ymm2, %ymm14 + vperm2i128 $49, %ymm3, %ymm2, %ymm13 vperm2i128 $32, %ymm5, %ymm4, %ymm10 vperm2i128 $32, %ymm7, %ymm6, %ymm11 vperm2i128 $49, %ymm5, %ymm4, %ymm14