Merge branch 'master' of https://github.com/weidai11/cryptopp

weidai11 · May 17, 2019 · 0418daf · 0418daf
2 parents b979a94 + b25b6f0
commit 0418daf
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 22 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -275,9 +275,7 @@ ifeq ($(DETECT_FEATURES),1)
     KECCAK_FLAG = $(SSSE3_FLAG)
     LEA_FLAG = $(SSSE3_FLAG)
     SIMECK_FLAG = $(SSSE3_FLAG)
-    SIMON64_FLAG = $(SSSE3_FLAG)
     SIMON128_FLAG = $(SSSE3_FLAG)
-    SPECK64_FLAG = $(SSSE3_FLAG)
     SPECK128_FLAG = $(SSSE3_FLAG)
     SUN_LDFLAGS += $(SSSE3_FLAG)
   else

diff --git a/GNUmakefile-cross b/GNUmakefile-cross
@@ -227,9 +227,7 @@ ifeq ($(DETECT_FEATURES),1)
     CHAM_FLAG = $(SSSE3_FLAG)
     LEA_FLAG = $(SSSE3_FLAG)
     SIMECK_FLAG = $(SSSE3_FLAG)
-    SIMON64_FLAG = $(SSSE3_FLAG)
     SIMON128_FLAG = $(SSSE3_FLAG)
-    SPECK64_FLAG = $(SSSE3_FLAG)
     SPECK128_FLAG = $(SSSE3_FLAG)
   else
     SSSE3_FLAG =

diff --git a/simon64_simd.cpp b/simon64_simd.cpp
@@ -16,25 +16,17 @@
 // #undef CRYPTOPP_SSE41_AVAILABLE
 // #undef CRYPTOPP_ARM_NEON_AVAILABLE
 
-#if (CRYPTOPP_SSSE3_AVAILABLE)
+#if (CRYPTOPP_SSE41_AVAILABLE)
 # include "adv_simd.h"
 # include <pmmintrin.h>
 # include <tmmintrin.h>
-#endif
-
-#if (CRYPTOPP_SSE41_AVAILABLE)
 # include <smmintrin.h>
 #endif
 
 #if defined(__XOP__)
 # include <ammintrin.h>
 #endif
 
-#if defined(__AVX512F__)
-# define CRYPTOPP_AVX512_ROTATE 1
-# include <immintrin.h>
-#endif
-
 // C1189: error: This header is specific to ARM targets
 #if (CRYPTOPP_ARM_NEON_AVAILABLE)
 # include "adv_simd.h"

diff --git a/speck64_simd.cpp b/speck64_simd.cpp
@@ -16,25 +16,17 @@
 // #undef CRYPTOPP_SSE41_AVAILABLE
 // #undef CRYPTOPP_ARM_NEON_AVAILABLE
 
-#if (CRYPTOPP_SSSE3_AVAILABLE)
+#if (CRYPTOPP_SSE41_AVAILABLE)
 # include "adv_simd.h"
 # include <pmmintrin.h>
 # include <tmmintrin.h>
-#endif
-
-#if (CRYPTOPP_SSE41_AVAILABLE)
 # include <smmintrin.h>
 #endif
 
 #if defined(__XOP__)
 # include <ammintrin.h>
 #endif
 
-#if defined(__AVX512F__)
-# define CRYPTOPP_AVX512_ROTATE 1
-# include <immintrin.h>
-#endif
-
 // C1189: error: This header is specific to ARM targets
 #if (CRYPTOPP_ARM_NEON_AVAILABLE)
 # include "adv_simd.h"