From 5422f0c13a5733fe8639e40297ac8c47554ad4d9 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 3 May 2018 21:28:17 -0400 Subject: [PATCH] =?UTF-8?q?Rename=20CRYPTOPP=5FDISABLE=5FAES=20=E2=86=92?= =?UTF-8?q?=20CRYPTOPP=5FDISABLE=5FAESNI=20This=20aligns=20both=20config.h?= =?UTF-8?q?=20and=20Cmake.=20Also=20see=20Gentoo=20Issue=20654598=20(https?= =?UTF-8?q?://bugs.gentoo.org/654598)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.h b/config.h index d0f41d46..8ce89ce9 100644 --- a/config.h +++ b/config.h @@ -538,9 +538,9 @@ NAMESPACE_END #define CRYPTOPP_SSE42_AVAILABLE 1 #endif -// Couple to CRYPTOPP_DISABLE_AES, but use CRYPTOPP_CLMUL_AVAILABLE so we can selectively +// Couple to CRYPTOPP_DISABLE_AESNI, but use CRYPTOPP_CLMUL_AVAILABLE so we can selectively // disable for misbehaving platofrms and compilers, like Solaris or some Clang. -#if defined(CRYPTOPP_DISABLE_AES) +#if defined(CRYPTOPP_DISABLE_AESNI) #define CRYPTOPP_DISABLE_CLMUL 1 #endif @@ -553,7 +553,7 @@ NAMESPACE_END #endif // Requires Sun Studio 12.3 (SunCC 0x5120) -#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_AES) && defined(CRYPTOPP_SSE42_AVAILABLE) && \ +#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_AESNI) && defined(CRYPTOPP_SSE42_AVAILABLE) && \ (defined(__AES__) || (_MSC_FULL_VER >= 150030729) || (__SUNPRO_CC >= 0x5120) || \ (CRYPTOPP_GCC_VERSION >= 40300) || (__INTEL_COMPILER >= 1110) || \ (CRYPTOPP_LLVM_CLANG_VERSION >= 30200) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40300))