Go back to Commit 66ada4cc61d62afc

1 files changed, 10 insertions, 6 deletions

diff --git a/config.h b/config.h
index 7ac17fda..9a40f2ba 100644
--- a/config.h
+++ b/config.h
@@ -63,7 +63,9 @@
 // Define this to choose the FIPS 202 version of SHA3, and not the original version of SHA3. NIST selected Keccak as SHA3

 // in January 2013. SHA3 was finalized in FIPS 202 in August 2015, and it was a modified version of the original selection.

 // If CRYPTOPP_USE_FIPS_202_SHA3 is defined, then sha3_fips_202.txt test vectors will be used instead of sha3.txt.

-// #define CRYPTOPP_USE_FIPS_202_SHA3

+// #ifndef CRYPTOPP_USE_FIPS_202_SHA3

+// # define CRYPTOPP_USE_FIPS_202_SHA3

+// #endif

 

 // ***************** Less Important Settings ***************

 

@@ -236,9 +238,11 @@ const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
 

 // Apple and LLVM's Clang. Apple Clang version 7.0 roughly equals LLVM Clang version 3.7

 #if defined(__clang__ ) && !defined(__apple_build_version__)

-	#define CRYPTOPP_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)

+	#define CRYPTOPP_LLVM_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)

+	#define CRYPTOPP_CLANG_INTEGRATED_ASSEMBLER 1

 #elif defined(__clang__ ) && defined(__apple_build_version__)

 	#define CRYPTOPP_APPLE_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)

+	#define CRYPTOPP_CLANG_INTEGRATED_ASSEMBLER 1

 #endif

 

 #ifdef _MSC_VER

@@ -246,13 +250,13 @@ const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
 #endif

 

 // Need GCC 4.6/Clang 1.7/Apple Clang 2.0 or above due to "GCC diagnostic {push|pop}"

-#if (CRYPTOPP_GCC_VERSION >= 40600) || (CRYPTOPP_CLANG_VERSION >= 10700) || (CRYPTOPP_APPLE_CLANG_VERSION >= 20000)

+#if (CRYPTOPP_GCC_VERSION >= 40600) || (CRYPTOPP_LLVM_CLANG_VERSION >= 10700) || (CRYPTOPP_APPLE_CLANG_VERSION >= 20000)

 	#define CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE 1

 #endif

 

 // Clang due to "Inline assembly operands don't work with .intel_syntax", http://llvm.org/bugs/show_bug.cgi?id=24232

 //   TODO: supply the upper version when LLVM fixes it. We set it to 20.0 for compilation purposes.

-#if (defined(CRYPTOPP_CLANG_VERSION) && CRYPTOPP_CLANG_VERSION <= 200000) || (defined(CRYPTOPP_APPLE_CLANG_VERSION) && CRYPTOPP_APPLE_CLANG_VERSION <= 200000)

+#if (defined(CRYPTOPP_LLVM_CLANG_VERSION) && CRYPTOPP_LLVM_CLANG_VERSION <= 200000) || (defined(CRYPTOPP_APPLE_CLANG_VERSION) && CRYPTOPP_APPLE_CLANG_VERSION <= 200000) || defined(CRYPTOPP_CLANG_INTEGRATED_ASSEMBLER)

 	#define CRYPTOPP_DISABLE_INTEL_ASM 1

 #endif

 

@@ -726,7 +730,7 @@ NAMESPACE_END
 

 // ************** Deprecated ***************

 

-#if (CRYPTOPP_GCC_VERSION >= 40500) || (CRYPTOPP_CLANG_VERSION >= 20800)

+#if (CRYPTOPP_GCC_VERSION >= 40500) || (CRYPTOPP_LLVM_CLANG_VERSION >= 20800)

 # define CRYPTOPP_DEPRECATED(msg) __attribute__((deprecated (msg)));

 #elif (CRYPTOPP_GCC_VERSION)

 # define CRYPTOPP_DEPRECATED(msg) __attribute__((deprecated));

@@ -779,7 +783,7 @@ NAMESPACE_END
 #  define CRYPTOPP_CXX11_SYNCHRONIZATION 1

 #elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1200)

 #  define CRYPTOPP_CXX11_SYNCHRONIZATION 1

-#elif (CRYPTOPP_CLANG_VERSION >= 30300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 50000)

+#elif (CRYPTOPP_LLVM_CLANG_VERSION >= 30300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 50000)

 #  define CRYPTOPP_CXX11_SYNCHRONIZATION 1

 #elif (CRYPTOPP_GCC_VERSION >= 40400)

 #  define CRYPTOPP_CXX11_SYNCHRONIZATION 1