summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Filelist.txt10
-rwxr-xr-xGNUmakefile2
-rwxr-xr-xGNUmakefile-cross2
-rw-r--r--adv_simd.h6
-rw-r--r--algparam.h4
-rw-r--r--config.h1267
-rw-r--r--config_align.h61
-rw-r--r--config_asm.h431
-rw-r--r--config_cpu.h100
-rw-r--r--config_cxx.h190
-rw-r--r--config_dll.h77
-rw-r--r--config_int.h103
-rw-r--r--config_misc.h180
-rw-r--r--config_ns.h68
-rw-r--r--config_os.h152
-rw-r--r--config_ver.h46
-rw-r--r--cpu.cpp2
-rw-r--r--cryptdll.vcxproj10
-rw-r--r--cryptdll.vcxproj.filters30
-rw-r--r--cryptlib.vcxproj10
-rw-r--r--cryptlib.vcxproj.filters30
-rw-r--r--keccak_simd.cpp158
-rw-r--r--nbtheory.cpp22
-rw-r--r--rijndael.h2
-rw-r--r--rw.cpp14
-rw-r--r--simeck_simd.cpp25
26 files changed, 1651 insertions, 1351 deletions
diff --git a/Filelist.txt b/Filelist.txt
index 7e60a108..678772ac 100644
--- a/Filelist.txt
+++ b/Filelist.txt
@@ -66,6 +66,16 @@ channels.h
cmac.cpp
cmac.h
config.h
+config_align.h
+config_asm.h
+config_cpu.h
+config_cxx.h
+config_dll.h
+config_int.h
+config_misc.h
+config_ns.h
+config_os.h
+config_ver.h
cpu.cpp
cpu.h
crc.cpp
diff --git a/GNUmakefile b/GNUmakefile
index 0f75c86c..4a7e7326 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -997,7 +997,7 @@ ifeq ($(findstring lean,$(MAKECMDGOALS)),lean)
endif # Dead code stripping
# For Shared Objects, Diff, Dist/Zip rules
-LIB_VER := $(shell $(GREP) "define CRYPTOPP_VERSION" config.h | cut -d" " -f 3)
+LIB_VER := $(shell $(GREP) "define CRYPTOPP_VERSION" config_ver.h | cut -d" " -f 3)
LIB_MAJOR := $(shell echo $(LIB_VER) | cut -c 1)
LIB_MINOR := $(shell echo $(LIB_VER) | cut -c 2)
LIB_PATCH := $(shell echo $(LIB_VER) | cut -c 3)
diff --git a/GNUmakefile-cross b/GNUmakefile-cross
index e2435e51..1451038c 100755
--- a/GNUmakefile-cross
+++ b/GNUmakefile-cross
@@ -611,7 +611,7 @@ TESTOBJS := $(TESTSRCS:.cpp=.o)
LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS))
# For Shared Objects, Diff, Dist/Zip rules
-LIB_VER := $(shell $(EGREP) "define CRYPTOPP_VERSION" config.h | cut -d" " -f 3)
+LIB_VER := $(shell $(EGREP) "define CRYPTOPP_VERSION" config_ver.h | cut -d" " -f 3)
LIB_MAJOR := $(shell echo $(LIB_VER) | cut -c 1)
LIB_MINOR := $(shell echo $(LIB_VER) | cut -c 2)
LIB_PATCH := $(shell echo $(LIB_VER) | cut -c 3)
diff --git a/adv_simd.h b/adv_simd.h
index 37696c2c..fba243ff 100644
--- a/adv_simd.h
+++ b/adv_simd.h
@@ -355,9 +355,7 @@ inline size_t AdvancedProcessBlocks128_6x1_NEON(F1 func1, F6 func6,
CRYPTOPP_ASSERT(length >= 16);
const unsigned int w_one[] = {0, 0<<24, 0, 1<<24};
- const unsigned int w_two[] = {0, 2<<24, 0, 2<<24};
const uint32x4_t s_one = vld1q_u32(w_one);
- const uint32x4_t s_two = vld1q_u32(w_two);
const size_t blockSize = 16;
// const size_t neonBlockSize = 16;
@@ -511,9 +509,7 @@ inline size_t AdvancedProcessBlocks128_4x1_NEON(F1 func1, F4 func4,
CRYPTOPP_ASSERT(length >= 16);
const unsigned int w_one[] = {0, 0<<24, 0, 1<<24};
- const unsigned int w_two[] = {0, 2<<24, 0, 2<<24};
const uint32x4_t s_one = vld1q_u32(w_one);
- const uint32x4_t s_two = vld1q_u32(w_two);
const size_t blockSize = 16;
// const size_t neonBlockSize = 16;
@@ -647,9 +643,7 @@ inline size_t AdvancedProcessBlocks128_6x2_NEON(F2 func2, F6 func6,
CRYPTOPP_ASSERT(length >= 16);
const unsigned int w_one[] = {0, 0<<24, 0, 1<<24};
- const unsigned int w_two[] = {0, 2<<24, 0, 2<<24};
const uint32x4_t s_one = vld1q_u32(w_one);
- const uint32x4_t s_two = vld1q_u32(w_two);
const size_t blockSize = 16;
// const size_t neonBlockSize = 16;
diff --git a/algparam.h b/algparam.h
index 1b125f02..61783371 100644
--- a/algparam.h
+++ b/algparam.h
@@ -320,10 +320,12 @@ public:
if (m_throwIfNotUsed && !m_used)
throw ParameterNotUsed(m_name);
}
-#if !defined(CRYPTOPP_CXX17_EXCEPTIONS) && !defined(CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE)
+#if !defined(CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE)
+# if !defined(CRYPTOPP_CXX17_EXCEPTIONS)
catch(const Exception&)
{
}
+# endif
#endif
}
diff --git a/config.h b/config.h
index 52dd398f..935b4dd1 100644
--- a/config.h
+++ b/config.h
@@ -2,1252 +2,29 @@
/// \file config.h
/// \brief Library configuration file
+/// \details <tt>config.h</tt> was split into components in May 2019 to better
+/// integrate with Autoconf and its feature tests. The splitting occured so
+/// users could continue to include <tt>config.h</tt> while allowing Autoconf
+/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
+/// its feature tests.
+/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
+/// \since Crypto++ 8.3
+
+/// \file config.h
+/// \brief Library configuration file
#ifndef CRYPTOPP_CONFIG_H
#define CRYPTOPP_CONFIG_H
-// ***************** Important Settings ********************
-
-// define this if running on a big-endian CPU
-// big endian will be assumed if CRYPTOPP_LITTLE_ENDIAN is not non-0
-#if !defined(CRYPTOPP_LITTLE_ENDIAN) && !defined(CRYPTOPP_BIG_ENDIAN) && (defined(__BIG_ENDIAN__) || (defined(__s390__) || defined(__s390x__) || defined(__zarch__)) || (defined(__m68k__) || defined(__MC68K__)) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__MIPSEB__) || defined(__ARMEB__) || (defined(__MWERKS__) && !defined(__INTEL__)))
-# define CRYPTOPP_BIG_ENDIAN 1
-#endif
-
-// define this if running on a little-endian CPU
-// big endian will be assumed if CRYPTOPP_LITTLE_ENDIAN is not non-0
-#if !defined(CRYPTOPP_BIG_ENDIAN) && !defined(CRYPTOPP_LITTLE_ENDIAN)
-# define CRYPTOPP_LITTLE_ENDIAN 1
-#endif
-
-// Sanity checks. Some processors have more than big, little and bi-endian modes. PDP mode, where order results in "4312", should
-// raise red flags immediately. Additionally, mis-classified machines, like (previosuly) S/390, should raise red flags immediately.
-#if (CRYPTOPP_BIG_ENDIAN) && defined(__GNUC__) && defined(__BYTE_ORDER__) && (__BYTE_ORDER__ != __ORDER_BIG_ENDIAN__)
-# error "CRYPTOPP_BIG_ENDIAN is set, but __BYTE_ORDER__ is not __ORDER_BIG_ENDIAN__"
-#endif
-#if (CRYPTOPP_LITTLE_ENDIAN) && defined(__GNUC__) && defined(__BYTE_ORDER__) && (__BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__)
-# error "CRYPTOPP_LITTLE_ENDIAN is set, but __BYTE_ORDER__ is not __ORDER_LITTLE_ENDIAN__"
-#endif
-
-// Define this if you want to disable all OS-dependent features,
-// such as sockets and OS-provided random number generators
-// #define NO_OS_DEPENDENCE
-
-// Define this to use features provided by Microsoft's CryptoAPI.
-// Currently the only feature used is Windows random number generation.
-// This macro will be ignored if NO_OS_DEPENDENCE is defined.
-// #define USE_MS_CRYPTOAPI
-
-// Define this to use features provided by Microsoft's CryptoNG API.
-// CryptoNG API is available in Vista and above and its cross platform,
-// including desktop apps and store apps. Currently the only feature
-// used is Windows random number generation.
-// This macro will be ignored if NO_OS_DEPENDENCE is defined.
-// #define USE_MS_CNGAPI
-
-// If the user did not make a choice, then select CryptoNG if
-// targeting Windows 8 or above.
-#if !defined(USE_MS_CRYPTOAPI) && !defined(USE_MS_CNGAPI)
-# if !defined(_USING_V110_SDK71_) && ((WINVER >= 0x0602 /*_WIN32_WINNT_WIN8*/) || (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/))
-# define USE_MS_CNGAPI
-# else
-# define USE_MS_CRYPTOAPI
-# endif
-#endif
-
-// Define this to disable ASM, intrinsics and built-ins. The library will be
-// compiled using C++ only. The library code will not include SSE2 (and
-// above), NEON, Aarch32, Aarch64, or Altivec (and above). Note the compiler
-// may use higher ISAs depending on compiler options, but the library will not
-// explictly use the ISAs. When disabling ASM, it is best to do it from
-// config.h to ensure the library and all programs share the setting.
-// #define CRYPTOPP_DISABLE_ASM 1
-
-// https://github.com/weidai11/cryptopp/issues/719
-#if defined(__native_client__)
-# define CRYPTOPP_DISABLE_ASM 1
-#endif
-
-// Some Clang and SunCC cannot handle mixed asm with positional arguments,
-// where the body is Intel style with no prefix and the templates are
-// AT&T style. Define this if the Makefile misdetects the configuration.
-// Also see https://bugs.llvm.org/show_bug.cgi?id=39895 .
-// #define CRYPTOPP_DISABLE_MIXED_ASM 1
-
-// Define CRYPTOPP_NO_CXX11 to avoid C++11 related features shown at the
-// end of this file. Some compilers and standard C++ headers advertise C++11
-// but they are really just C++03 with some additional C++11 headers and
-// non-conforming classes. You might also consider `-std=c++03` or
-// `-std=gnu++03`, but they are required options when building the library
-// and all programs. CRYPTOPP_NO_CXX11 is probably easier to manage but it may
-// cause -Wterminate warnings under GCC. MSVC++ has a similar warning.
-// Also see https://github.com/weidai11/cryptopp/issues/529
-// #define CRYPTOPP_NO_CXX11 1
-
-// Define CRYPTOPP_NO_CXX17 to avoid C++17 related features shown at the end of
-// this file. At the moment it should only affect std::uncaught_exceptions.
-// #define CRYPTOPP_NO_CXX17 1
-
-// CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS is no longer honored. It
-// was removed at https://github.com/weidai11/cryptopp/issues/682
-// #define CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS 1
-
-// ***************** Less Important Settings ***************
-
-// Library version macro. Since this macro is in a header, it reflects
-// the version of the library the headers came from. It is not
-// necessarily the version of the library built as a shared object if
-// versions are inadvertently mixed and matched.
-#define CRYPTOPP_MAJOR 8
-#define CRYPTOPP_MINOR 3
-#define CRYPTOPP_REVISION 0
-#define CRYPTOPP_VERSION 830
-
-// Define this if you want to set a prefix for TestData/ and TestVectors/
-// Be sure to add the trailing slash since its simple concatenation.
-// After https://github.com/weidai11/cryptopp/issues/760 the library
-// should find the test vectors and data without much effort. It
-// will search in "./" and "$ORIGIN/../share/cryptopp" automatically.
-#ifndef CRYPTOPP_DATA_DIR
-# define CRYPTOPP_DATA_DIR ""
-#endif
-
-// Define this to disable the test suite from searching for test
-// vectors and data in "./" and "$ORIGIN/../share/cryptopp". The
-// library will still search in CRYPTOPP_DATA_DIR, regardless.
-// Some distros may want to disable this feature. Also see
-// https://github.com/weidai11/cryptopp/issues/760
-// #ifndef CRYPTOPP_DISABLE_DATA_DIR_SEARCH
-// # define CRYPTOPP_DISABLE_DATA_DIR_SEARCH
-// #endif
-
-// Define this if you want or need the library's memcpy_s and memmove_s.
-// See http://github.com/weidai11/cryptopp/issues/28.
-// #if !defined(CRYPTOPP_WANT_SECURE_LIB)
-// # define CRYPTOPP_WANT_SECURE_LIB
-// #endif
-
-// File system code to write to GZIP archive.
-// http://www.gzip.org/format.txt
-#if !defined(GZIP_OS_CODE)
-# if defined(__macintosh__)
-# define GZIP_OS_CODE 7
-# elif defined(__unix__) || defined(__linux__)
-# define GZIP_OS_CODE 3
-# else
-# define GZIP_OS_CODE 0
-# endif
-#endif
-
-// Try this if your CPU has 256K internal cache or a slow multiply instruction
-// and you want a (possibly) faster IDEA implementation using log tables
-// #define IDEA_LARGECACHE
-
-// Define this if, for the linear congruential RNG, you want to use
-// the original constants as specified in S.K. Park and K.W. Miller's
-// CACM paper.
-// #define LCRNG_ORIGINAL_NUMBERS
-
-// Define this if you want Integer's operator<< to honor std::showbase (and
-// std::noshowbase). If defined, Integer will use a suffix of 'b', 'o', 'h'
-// or '.' (the last for decimal) when std::showbase is in effect. If
-// std::noshowbase is set, then the suffix is not added to the Integer. If
-// not defined, existing behavior is preserved and Integer will use a suffix
-// of 'b', 'o', 'h' or '.' (the last for decimal).
-// #define CRYPTOPP_USE_STD_SHOWBASE
-
-// Define this if ARMv8 shifts are slow. ARM Cortex-A53 and Cortex-A57 shift
-// operation perform poorly, so NEON and ASIMD code that relies on shifts
-// or rotates often performs worse than C/C++ code. Also see
-// http://github.com/weidai11/cryptopp/issues/367.
-#define CRYPTOPP_SLOW_ARMV8_SHIFT 1
-
-// Define this if you want to decouple AlgorithmParameters and Integer
-// The decoupling should make it easier for the linker to remove Integer
-// related code for those who do not need Integer, and avoid a potential
-// race during AssignIntToInteger pointer initialization. Also
-// see http://github.com/weidai11/cryptopp/issues/389.
-// #define CRYPTOPP_NO_ASSIGN_TO_INTEGER
-
-// set the name of Rijndael cipher, was "Rijndael" before version 5.3
-#define CRYPTOPP_RIJNDAEL_NAME "AES"
-
-// CRYPTOPP_DEBUG enables the library's CRYPTOPP_ASSERT. CRYPTOPP_ASSERT
-// raises a SIGTRAP (Unix) or calls DebugBreak() (Windows). CRYPTOPP_ASSERT
-// is only in effect when CRYPTOPP_DEBUG, DEBUG or _DEBUG is defined. Unlike
-// Posix assert, CRYPTOPP_ASSERT is not affected by NDEBUG (or failure to
-// define it).
-// Also see http://github.com/weidai11/cryptopp/issues/277, CVE-2016-7420
-#if (defined(DEBUG) || defined(_DEBUG)) && !defined(CRYPTOPP_DEBUG)
-# define CRYPTOPP_DEBUG 1
-#endif
-
-// ***************** Important Settings Again ********************
-// But the defaults should be ok.
-
-// namespace support is now required
-#ifdef NO_NAMESPACE
-# error namespace support is now required
-#endif
-
-#ifdef CRYPTOPP_DOXYGEN_PROCESSING
-// Document the namespce exists. Put it here before CryptoPP is undefined below.
-/// \namespace CryptoPP
-/// \brief Crypto++ library namespace
-/// \details Nearly all classes are located in the CryptoPP namespace. Within
-/// the namespace, there are two additional namespaces.
-/// <ul>
-/// <li>Name - namespace for names used with \p NameValuePairs and documented in argnames.h
-/// <li>NaCl - namespace for NaCl library functions like crypto_box, crypto_box_open, crypto_sign, and crypto_sign_open
-/// <li>Donna - namespace for curve25519 library operations. The name was selected due to use of Adam Langley's curve25519-donna.
-/// <li>Test - namespace for testing and benchmarks classes
-/// <li>Weak - namespace for weak and wounded algorithms, like ARC4, MD5 and Pananma
-/// </ul>
-namespace CryptoPP { }
-// Bring in the symbols found in the weak namespace; and fold Weak1 into Weak
-# define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
-# define Weak1 Weak
-// Avoid putting "CryptoPP::" in front of everything in Doxygen output
-# define CryptoPP
-# define NAMESPACE_BEGIN(x)
-# define NAMESPACE_END
-// Get Doxygen to generate better documentation for these typedefs
-# define DOCUMENTED_TYPEDEF(x, y) class y : public x {};
-// Make "protected" "private" so the functions and members are not documented
-# define protected private
-#else
-# define NAMESPACE_BEGIN(x) namespace x {
-# define NAMESPACE_END }
-# define DOCUMENTED_TYPEDEF(x, y) typedef x y;
-#endif
-#define ANONYMOUS_NAMESPACE_BEGIN namespace {
-#define ANONYMOUS_NAMESPACE_END }
-#define USING_NAMESPACE(x) using namespace x;
-#define DOCUMENTED_NAMESPACE_BEGIN(x) namespace x {
-#define DOCUMENTED_NAMESPACE_END }
-
-// Originally in global namespace to avoid ambiguity with other byte typedefs.
-// Moved to Crypto++ namespace due to C++17, std::byte and potential compile problems. Also see
-// http://www.cryptopp.com/wiki/std::byte and http://github.com/weidai11/cryptopp/issues/442
-// typedef unsigned char byte;
-#define CRYPTOPP_NO_GLOBAL_BYTE 1
-
-NAMESPACE_BEGIN(CryptoPP)
-
-// Signed words added at Issue 609 for early versions of and Visual Studio and
-// the NaCl gear. Also see https://github.com/weidai11/cryptopp/issues/609.
-
-typedef unsigned char byte;
-typedef unsigned short word16;
-typedef unsigned int word32;
-
-typedef signed char sbyte;
-typedef signed short sword16;
-typedef signed int sword32;
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
- typedef signed __int64 sword64;
- typedef unsigned __int64 word64;
- #define SW64LIT(x) x##i64
- #define W64LIT(x) x##ui64
-#elif (_LP64 || __LP64__)
- typedef signed long sword64;
- typedef unsigned long word64;
- #define SW64LIT(x) x##L
- #define W64LIT(x) x##UL
-#else
- typedef signed long long sword64;
- typedef unsigned long long word64;
- #define SW64LIT(x) x##LL
- #define W64LIT(x) x##ULL
-#endif
-
-// define large word type, used for file offsets and such
-typedef word64 lword;
-const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
-
-// It is OK to remove the hard stop below, but you are on your own.
-// After building the library be sure to run self tests described
-// https://www.cryptopp.com/wiki/Release_Process#Self_Tests
-// Some relevant bug reports can be found at:
-// * Clang: http://github.com/weidai11/cryptopp/issues/147
-// * Native Client: https://github.com/weidai11/cryptopp/issues/719
-#if (defined(_MSC_VER) && defined(__clang__))
-# error: "Unsupported configuration"
-#endif
-
-#ifdef __GNUC__
- #define CRYPTOPP_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#endif
-
-#if defined(__xlc__) || defined(__xlC__)
- #define CRYPTOPP_XLC_VERSION ((__xlC__ / 256) * 10000 + (__xlC__ % 256) * 100)
-#endif
-
-// 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_APPLE_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
-#elif defined(__clang__)
- #define CRYPTOPP_LLVM_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
-#endif
-
-#ifdef _MSC_VER
- #define CRYPTOPP_MSC_VERSION (_MSC_VER)
-#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_LLVM_CLANG_VERSION >= 10700) || (CRYPTOPP_APPLE_CLANG_VERSION >= 20000)
- #define CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE 1
-#endif
-
-// define hword, word, and dword. these are used for multiprecision integer arithmetic
-// Intel compiler won't have _umul128 until version 10.0. See http://softwarecommunity.intel.com/isn/Community/en-US/forums/thread/30231625.aspx
-#if (defined(_MSC_VER) && (!defined(__INTEL_COMPILER) || __INTEL_COMPILER >= 1000) && (defined(_M_X64) || defined(_M_IA64))) || (defined(__DECCXX) && defined(__alpha__)) || (defined(__INTEL_COMPILER) && defined(__x86_64__)) || (defined(__SUNPRO_CC) && defined(__x86_64__))
- typedef word32 hword;
- typedef word64 word;
-#else
- #define CRYPTOPP_NATIVE_DWORD_AVAILABLE 1
- #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__)
- #if ((CRYPTOPP_GCC_VERSION >= 30400) || (CRYPTOPP_LLVM_CLANG_VERSION >= 30000) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40300)) && (__SIZEOF_INT128__ >= 16)
- // GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3
- // GCC 4.8.3 and bad uint128_t ops on PPC64/POWER7 (Issue 421)
- // mode(TI) division broken on amd64 with GCC earlier than GCC 3.4
- typedef word32 hword;
- typedef word64 word;
- typedef __uint128_t dword;
- typedef __uint128_t word128;
- #define CRYPTOPP_WORD128_AVAILABLE 1
- #else
- // if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results
- typedef word16 hword;
- typedef word32 word;
- typedef word64 dword;
- #endif
- #else
- // being here means the native register size is probably 32 bits or less
- #define CRYPTOPP_BOOL_SLOW_WORD64 1
- typedef word16 hword;
- typedef word32 word;
- typedef word64 dword;
- #endif
-#endif
-#ifndef CRYPTOPP_BOOL_SLOW_WORD64
- #define CRYPTOPP_BOOL_SLOW_WORD64 0
-#endif
-
-const unsigned int WORD_SIZE = sizeof(word);
-const unsigned int WORD_BITS = WORD_SIZE * 8;
-
-NAMESPACE_END
-
-#ifndef CRYPTOPP_L1_CACHE_LINE_SIZE
- // This should be a lower bound on the L1 cache line size. It's used for defense against timing attacks.
- // Also see http://stackoverflow.com/questions/794632/programmatically-get-the-cache-line-size.
- #if defined(_M_X64) || defined(__x86_64__) || defined(__arm64__) || defined(__aarch64__) || defined(__powerpc64__) || defined(_ARCH_PPC64)
- #define CRYPTOPP_L1_CACHE_LINE_SIZE 64
- #else
- // L1 cache line size is 32 on Pentium III and earlier
- #define CRYPTOPP_L1_CACHE_LINE_SIZE 32
- #endif
-#endif
-
-// Sun Studio Express 3 (December 2006) provides GCC-style attributes.
-// IBM XL C/C++ alignment modifier per Optimization Guide, pp. 19-20.
-// __IBM_ATTRIBUTES per XLC 12.1 AIX Compiler Manual, p. 473.
-// CRYPTOPP_ALIGN_DATA may not be reliable on AIX.
-#ifndef CRYPTOPP_ALIGN_DATA
- #if defined(_MSC_VER)
- #define CRYPTOPP_ALIGN_DATA(x) __declspec(align(x))
- #elif defined(__GNUC__) || (__SUNPRO_CC >= 0x5100)
- #define CRYPTOPP_ALIGN_DATA(x) __attribute__((aligned(x)))
- #elif defined(__xlc__) || defined(__xlC__)
- #define CRYPTOPP_ALIGN_DATA(x) __attribute__((aligned(x)))
- #else
- #define CRYPTOPP_ALIGN_DATA(x)
- #endif
-#endif
-
-// The section attribute attempts to initialize CPU flags to avoid Valgrind findings above -O1
-#if ((defined(__MACH__) && defined(__APPLE__)) && ((CRYPTOPP_LLVM_CLANG_VERSION >= 30600) || (CRYPTOPP_APPLE_CLANG_VERSION >= 70100) || (CRYPTOPP_GCC_VERSION >= 40300)))
- #define CRYPTOPP_SECTION_INIT __attribute__((section ("__DATA,__data")))
-#elif (defined(__ELF__) && (CRYPTOPP_GCC_VERSION >= 40300))
- #define CRYPTOPP_SECTION_INIT __attribute__((section ("nocommon")))
-#elif defined(__ELF__) && (defined(__xlC__) || defined(__ibmxl__))
- #define CRYPTOPP_SECTION_INIT __attribute__((section ("nocommon")))
-#else
- #define CRYPTOPP_SECTION_INIT
-#endif
-
-#if defined(_MSC_VER) || defined(__fastcall)
- #define CRYPTOPP_FASTCALL __fastcall
-#else
- #define CRYPTOPP_FASTCALL
-#endif
-
-#ifdef _MSC_VER
-#define CRYPTOPP_NO_VTABLE __declspec(novtable)
-#else
-#define CRYPTOPP_NO_VTABLE
-#endif
-
-#ifdef _MSC_VER
- // 4127: conditional expression is constant
- // 4512: assignment operator not generated
- // 4661: no suitable definition provided for explicit template instantiation request
- // 4910: '__declspec(dllexport)' and 'extern' are incompatible on an explicit instantiation
-# pragma warning(disable: 4127 4512 4661 4910)
- // Security related, possible defects
- // http://blogs.msdn.com/b/vcblog/archive/2010/12/14/off-by-default-compiler-warnings-in-visual-c.aspx
-# pragma warning(once: 4191 4242 4263 4264 4266 4302 4826 4905 4906 4928)
-#endif
-
-#ifdef __BORLANDC__
-// 8037: non-const function called for const object. needed to work around BCB2006 bug
-# pragma warn -8037
-#endif
-
-// [GCC Bug 53431] "C++ preprocessor ignores #pragma GCC diagnostic". Clang honors it.
-#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
-# pragma GCC diagnostic ignored "-Wunknown-pragmas"
-# pragma GCC diagnostic ignored "-Wunused-function"
-#endif
-
-// You may need to force include a C++ header on Android when using STLPort to ensure
-// _STLPORT_VERSION is defined: CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++11 -include iosfwd"
-// TODO: Figure out C++17 and lack of std::uncaught_exception
-#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__MWERKS__) || (defined(_STLPORT_VERSION) && ((_STLPORT_VERSION < 0x450) || defined(_STLP_NO_UNCAUGHT_EXCEPT_SUPPORT)))
-#define CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION
-#endif
-
-#ifndef CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION
-#define CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE
-#endif
-
-// ***************** Platform and CPU features ********************
-
-// Linux provides X32, which is 32-bit integers, longs and pointers on x86_64
-// using the full x86_64 register set. Detect via __ILP32__
-// (http://wiki.debian.org/X32Port). However, __ILP32__ shows up in more places
-// than the System V ABI specs calls out, like on some Solaris installations
-// and just about any 32-bit system with Clang.
-#if (defined(__ILP32__) || defined(_ILP32)) && defined(__x86_64__)
- #define CRYPTOPP_BOOL_X32 1
-#endif
-
-// see http://predef.sourceforge.net/prearch.html
-#if (defined(_M_IX86) || defined(__i386__) || defined(__i386) || defined(_X86_) || defined(__I86__) || defined(__INTEL__)) && !CRYPTOPP_BOOL_X32
- #define CRYPTOPP_BOOL_X86 1
-#endif
-
-#if (defined(_M_X64) || defined(__x86_64__)) && !CRYPTOPP_BOOL_X32
- #define CRYPTOPP_BOOL_X64 1
-#endif
-
-// Undo the ASM related defines due to X32.
-#if CRYPTOPP_BOOL_X32
-# undef CRYPTOPP_BOOL_X64
-# undef CRYPTOPP_X64_ASM_AVAILABLE
-# undef CRYPTOPP_X64_MASM_AVAILABLE
-#endif
-
-// Microsoft added ARM64 define December 2017.
-#if defined(__arm64__) || defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
- #define CRYPTOPP_BOOL_ARMV8 1
-#elif defined(__arm__) || defined(_M_ARM)
- #define CRYPTOPP_BOOL_ARM32 1
-#endif
-
-// AltiVec and Power8 crypto
-#if defined(__ppc64__) || defined(__powerpc64__) || defined(_ARCH_PPC64)
- #define CRYPTOPP_BOOL_PPC64 1
-#elif defined(__powerpc__) || defined(_ARCH_PPC)
- #define CRYPTOPP_BOOL_PPC32 1
-#endif
-
-// And MIPS. TODO: finish these defines
-#if defined(__mips64__)
- #define CRYPTOPP_BOOL_MIPS64 1
-#elif defined(__mips__)
- #define CRYPTOPP_BOOL_MIPS32 1
-#endif
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-# define CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY 1
-#else
-# define CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY 1
-#endif
-
-// ***************** IA32 CPU features ********************
-
-#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
-
-// Apple Clang prior to 5.0 cannot handle SSE2
-#if defined(CRYPTOPP_APPLE_CLANG_VERSION) && (CRYPTOPP_APPLE_CLANG_VERSION < 50000)
-# define CRYPTOPP_DISABLE_ASM 1
-#endif
-
-// Sun Studio 12.1 provides GCC inline assembly
-// http://blogs.oracle.com/x86be/entry/gcc_style_asm_inlining_support
-#if !defined(CRYPTOPP_DISABLE_ASM) && defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x5100)
-# define CRYPTOPP_DISABLE_ASM 1
-#endif
-
-#if !defined(CRYPTOPP_DISABLE_ASM) && ((defined(_MSC_VER) && defined(_M_IX86)) || (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))))
- // C++Builder 2010 does not allow "call label" where label is defined within inline assembly
- #define CRYPTOPP_X86_ASM_AVAILABLE 1
-
- #if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(_MSC_VER) || CRYPTOPP_GCC_VERSION >= 30300 || defined(__SSE2__))
- #define CRYPTOPP_SSE2_ASM_AVAILABLE 1
- #endif
-
- #if !defined(CRYPTOPP_DISABLE_SSSE3) && (_MSC_VER >= 1500 || CRYPTOPP_GCC_VERSION >= 40300 || defined(__SSSE3__))
- #define CRYPTOPP_SSSE3_ASM_AVAILABLE 1
- #endif
-#endif
-
-#if !defined(CRYPTOPP_DISABLE_ASM) && defined(_MSC_VER) && defined(_M_X64)
- #define CRYPTOPP_X64_MASM_AVAILABLE 1
-#endif
-
-#if !defined(CRYPTOPP_DISABLE_ASM) && defined(__GNUC__) && defined(__x86_64__)
- #define CRYPTOPP_X64_ASM_AVAILABLE 1
-#endif
-
-// 32-bit SunCC does not enable SSE2 by default.
-#if !defined(CRYPTOPP_DISABLE_ASM) && (defined(_MSC_VER) || CRYPTOPP_GCC_VERSION >= 30300 || defined(__SSE2__) || (__SUNPRO_CC >= 0x5100))
- #define CRYPTOPP_SSE2_INTRIN_AVAILABLE 1
-#endif
-
-#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SSSE3)
-# if defined(__SSSE3__) || (_MSC_VER >= 1500) || \
- (CRYPTOPP_GCC_VERSION >= 40300) || (__INTEL_COMPILER >= 1000) || (__SUNPRO_CC >= 0x5110) || \
- (CRYPTOPP_LLVM_CLANG_VERSION >= 20300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40000)
- #define CRYPTOPP_SSSE3_AVAILABLE 1
-# endif
-#endif
-
-// Intrinsics availible in GCC 4.3 (http://gcc.gnu.org/gcc-4.3/changes.html) and
-// MSVC 2008 (http://msdn.microsoft.com/en-us/library/bb892950%28v=vs.90%29.aspx)
-// SunCC could generate SSE4 at 12.1, but the intrinsics are missing until 12.4.
-#if !defined(CRYPTOPP_DISABLE_SSE4) && defined(CRYPTOPP_SSSE3_AVAILABLE) && \
- (defined(__SSE4_1__) || (CRYPTOPP_MSC_VERSION >= 1500) || \
- (CRYPTOPP_GCC_VERSION >= 40300) || (__INTEL_COMPILER >= 1000) || (__SUNPRO_CC >= 0x5110) || \
- (CRYPTOPP_LLVM_CLANG_VERSION >= 20300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40000))
- #define CRYPTOPP_SSE41_AVAILABLE 1
-#endif
-
-#if !defined(CRYPTOPP_DISABLE_SSE4) && defined(CRYPTOPP_SSSE3_AVAILABLE) && \
- (defined(__SSE4_2__) || (CRYPTOPP_MSC_VERSION >= 1500) || (__SUNPRO_CC >= 0x5110) || \
- (CRYPTOPP_GCC_VERSION >= 40300) || (__INTEL_COMPILER >= 1000) || \
- (CRYPTOPP_LLVM_CLANG_VERSION >= 20300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40000))
- #define CRYPTOPP_SSE42_AVAILABLE 1
-#endif
-
-// 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_AESNI)
- #define CRYPTOPP_DISABLE_CLMUL 1
-#endif
-
-// Requires Sun Studio 12.3 (SunCC 0x5120) in theory.
-#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_CLMUL) && defined(CRYPTOPP_SSE42_AVAILABLE) && \
- (defined(__PCLMUL__) || (_MSC_FULL_VER >= 150030729) || (__SUNPRO_CC >= 0x5120) || \
- (CRYPTOPP_GCC_VERSION >= 40300) || (__INTEL_COMPILER >= 1110) || \
- (CRYPTOPP_LLVM_CLANG_VERSION >= 30200) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40300))
- #define CRYPTOPP_CLMUL_AVAILABLE 1
-#endif
-
-// Requires Sun Studio 12.3 (SunCC 0x5120)
-#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))
- #define CRYPTOPP_AESNI_AVAILABLE 1
-#endif
-
-// Requires Binutils 2.24
-#if !defined(CRYPTOPP_DISABLE_AVX) && defined(CRYPTOPP_SSE42_AVAILABLE) && \
- (defined(__AVX2__) || (CRYPTOPP_MSC_VERSION >= 1800) || (__SUNPRO_CC >= 0x5130) || \
- (CRYPTOPP_GCC_VERSION >= 40700) || (__INTEL_COMPILER >= 1400) || \
- (CRYPTOPP_LLVM_CLANG_VERSION >= 30100) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40600))
-#define CRYPTOPP_AVX_AVAILABLE 1
-#endif
-
-// Requires Binutils 2.24
-#if !defined(CRYPTOPP_DISABLE_AVX2) && defined(CRYPTOPP_AVX_AVAILABLE) && \
- (defined(__AVX2__) || (CRYPTOPP_MSC_VERSION >= 1800) || (__SUNPRO_CC >= 0x5130) || \
- (CRYPTOPP_GCC_VERSION >= 40900) || (__INTEL_COMPILER >= 1400) || \
- (CRYPTOPP_LLVM_CLANG_VERSION >= 30100) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40600))
-#define CRYPTOPP_AVX2_AVAILABLE 1
-#endif
-
-// Guessing at SHA for SunCC. Its not in Sun Studio 12.6. Also see
-// http://stackoverflow.com/questions/45872180/which-xarch-for-sha-extensions-on-solaris
-#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SHANI) && defined(CRYPTOPP_SSE42_AVAILABLE) && \
- (defined(__SHA__) || (CRYPTOPP_MSC_VERSION >= 1900) || (__SUNPRO_CC >= 0x5160) || \
- (CRYPTOPP_GCC_VERSION >= 40900) || (__INTEL_COMPILER >= 1300) || \
- (CRYPTOPP_LLVM_CLANG_VERSION >= 30400) || (CRYPTOPP_APPLE_CLANG_VERSION >= 50100))
- #define CRYPTOPP_SHANI_AVAILABLE 1
-#endif
-
-// Fixup Android and SSE, Crypto. It may be enabled based on compiler version.
-#if (defined(__ANDROID__) || defined(ANDROID))
-# if (CRYPTOPP_BOOL_X86)
-# undef CRYPTOPP_SSE41_AVAILABLE
-# undef CRYPTOPP_SSE42_AVAILABLE
-# undef CRYPTOPP_CLMUL_AVAILABLE
-# undef CRYPTOPP_AESNI_AVAILABLE
-# undef CRYPTOPP_SHANI_AVAILABLE
-# endif
-# if (CRYPTOPP_BOOL_X64)
-# undef CRYPTOPP_CLMUL_AVAILABLE
-# undef CRYPTOPP_AESNI_AVAILABLE
-# undef CRYPTOPP_SHANI_AVAILABLE
-# endif
-#endif
-
-// Fixup for SunCC 12.1-12.4. Bad code generation in AES_Encrypt and friends.
-#if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x5130)
-# undef CRYPTOPP_AESNI_AVAILABLE
-#endif
-
-// Fixup for SunCC 12.1-12.6. Compiler crash on GCM_Reduce_CLMUL and friends.
-// http://github.com/weidai11/cryptopp/issues/226
-#if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x5150)
-# undef CRYPTOPP_CLMUL_AVAILABLE
-#endif
-
-#endif // X86, X32, X64
-
-// ***************** ARM CPU features ********************
-
-#if (CRYPTOPP_BOOL_ARM32 || CRYPTOPP_BOOL_ARMV8)
-
-// We don't have an ARM big endian test rig. Disable
-// ARM-BE ASM and instrinsics until we can test it.
-#if (CRYPTOPP_BIG_ENDIAN)
-# define CRYPTOPP_DISABLE_ASM 1
-#endif
-
-// Requires ARMv7 and ACLE 1.0. -march=armv7-a or above must be present
-// Requires GCC 4.3, Clang 2.8 or Visual Studio 2012
-// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
-#if !defined(CRYPTOPP_ARM_NEON_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
-# if defined(__arm__) || defined(__ARM_NEON) || defined(__ARM_FEATURE_NEON) || defined(_M_ARM)
-# if (CRYPTOPP_GCC_VERSION >= 40300) || (CRYPTOPP_CLANG_VERSION >= 20800) || \
- (CRYPTOPP_MSC_VERSION >= 1700)
-# define CRYPTOPP_ARM_NEON_AVAILABLE 1
-# endif // Compilers
-# endif // Platforms
-#endif
-
-// ARMv8 and ASIMD. -march=armv8-a or above must be present
-// Requires GCC 4.8, Clang 3.3 or Visual Studio 2017
-// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
-#if !defined(CRYPTOPP_ARM_ASIMD_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
-# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
-# if defined(__ARM_NEON) || defined(__ARM_FEATURE_NEON) || defined(__ARM_FEATURE_ASIMD) || \
- (CRYPTOPP_GCC_VERSION >= 40800) || (CRYPTOPP_CLANG_VERSION >= 30300) || \
- (CRYPTOPP_MSC_VERSION >= 1916)
-# define CRYPTOPP_ARM_NEON_AVAILABLE 1
-# define CRYPTOPP_ARM_ASIMD_AVAILABLE 1
-# endif // Compilers
-# endif // Platforms
-#endif
-
-// ARMv8 and ASIMD. -march=armv8-a+crc or above must be present
-// Requires GCC 4.8, Clang 3.3 or Visual Studio 2017
-// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
-#if !defined(CRYPTOPP_ARM_CRC32_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
-# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
-# if defined(__ARM_FEATURE_CRC32) || (CRYPTOPP_GCC_VERSION >= 40800) || \
- (CRYPTOPP_CLANG_VERSION >= 30300) || (CRYPTOPP_MSC_VERSION >= 1916)
-# define CRYPTOPP_ARM_CRC32_AVAILABLE 1
-# endif // Compilers
-# endif // Platforms
-#endif
-
-// ARMv8 and ASIMD. -march=armv8-a+crypto or above must be present
-// Requires GCC 4.8, Clang 3.3 or Visual Studio 2017
-// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
-#if !defined(CRYPTOPP_ARM_PMULL_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
-# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
-# if defined(__ARM_FEATURE_CRYPTO) || (CRYPTOPP_GCC_VERSION >= 40800) || \
- (CRYPTOPP_CLANG_VERSION >= 30300) || (CRYPTOPP_MSC_VERSION >= 1916)
-# define CRYPTOPP_ARM_PMULL_AVAILABLE 1
-# endif // Compilers
-# endif // Platforms
-#endif
-
-// ARMv8 and AES. -march=armv8-a+crypto or above must be present
-// Requires GCC 4.8, Clang 3.3 or Visual Studio 2017
-// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
-#if !defined(CRYPTOPP_ARM_AES_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
-# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
-# if defined(__ARM_FEATURE_CRYPTO) || (CRYPTOPP_GCC_VERSION >= 40800) || \
- (CRYPTOPP_CLANG_VERSION >= 30300) || (CRYPTOPP_MSC_VERSION >= 1910)
-# define CRYPTOPP_ARM_AES_AVAILABLE 1
-# endif // Compilers
-# endif // Platforms
-#endif
-
-// ARMv8 and SHA-1, SHA-256. -march=armv8-a+crypto or above must be present
-// Requires GCC 4.8, Clang 3.3 or Visual Studio 2017
-// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
-#if !defined(CRYPTOPP_ARM_SHA_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
-# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
-# if defined(__ARM_FEATURE_CRYPTO) || (CRYPTOPP_GCC_VERSION >= 40800) || \
- (CRYPTOPP_CLANG_VERSION >= 30300) || (CRYPTOPP_MSC_VERSION >= 1916)
-# define CRYPTOPP_ARM_SHA1_AVAILABLE 1
-# define CRYPTOPP_ARM_SHA2_AVAILABLE 1
-# endif // Compilers
-# endif // Platforms
-#endif
-
-// ARMv8 and SHA-512, SHA-3. -march=armv8.4-a+crypto or above must be present
-// Requires GCC 8.0, Clang 6.0 or Visual Studio 2021???
-// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
-#if !defined(CRYPTOPP_ARM_SHA_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
-# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
-# if defined(__ARM_FEATURE_SHA3) || (CRYPTOPP_GCC_VERSION >= 80000) || \
- (CRYPTOPP_MSC_VERSION >= 5000)
-# define CRYPTOPP_ARM_SHA512_AVAILABLE 1
-# define CRYPTOPP_ARM_SHA3_AVAILABLE 1
-# endif // Compilers
-# endif // Platforms
-#endif
-
-// ARMv8 and SM3, SM4. -march=armv8.4-a+crypto or above must be present
-// Requires GCC 8.0, Clang 6.0 or Visual Studio 2021???
-// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
-#if !defined(CRYPTOPP_ARM_SM3_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
-# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
-# if defined(__ARM_FEATURE_SM3) || (CRYPTOPP_GCC_VERSION >= 80000) || \
- (CRYPTOPP_MSC_VERSION >= 5000)
-# define CRYPTOPP_ARM_SM3_AVAILABLE 1
-# define CRYPTOPP_ARM_SM4_AVAILABLE 1
-# endif // Compilers
-# endif // Platforms
-#endif
-
-// Limit the <arm_acle.h> include.
-#if !defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
-# if defined(__aarch32__) || defined(__aarch64__) || (__ARM_ARCH >= 8) || defined(__ARM_ACLE)
-# if !defined(__ANDROID__) && !defined(ANDROID) && !defined(__APPLE__)
-# define CRYPTOPP_ARM_ACLE_AVAILABLE 1
-# endif
-# endif
-#endif
-
-// Fixup Apple Clang and PMULL. Apple defines __ARM_FEATURE_CRYPTO for Xcode 6
-// but does not provide PMULL. TODO: determine when PMULL is available.
-#if defined(CRYPTOPP_APPLE_CLANG_VERSION) && (CRYPTOPP_APPLE_CLANG_VERSION < 70000)
-# undef CRYPTOPP_ARM_PMULL_AVAILABLE
-#endif
-
-// Fixup Android and CRC32. It may be enabled based on compiler version.
-#if (defined(__ANDROID__) || defined(ANDROID)) && !defined(__ARM_FEATURE_CRC32)
-# undef CRYPTOPP_ARM_CRC32_AVAILABLE
-#endif
-
-// Fixup Android and Crypto. It may be enabled based on compiler version.
-#if (defined(__ANDROID__) || defined(ANDROID)) && !defined(__ARM_FEATURE_CRYPTO)
-# undef CRYPTOPP_ARM_PMULL_AVAILABLE
-# undef CRYPTOPP_ARM_AES_AVAILABLE
-# undef CRYPTOPP_ARM_SHA1_AVAILABLE
-# undef CRYPTOPP_ARM_SHA2_AVAILABLE
-#endif
-
-// Cryptogams offers an ARM asm AES implementation. Crypto++ does
-// not provide an asm implementation. The Cryptogams implementation
-// is about 2x faster than C/C++. Define this to use the Cryptogams
-// AES implementation on GNU Linux systems. When defined, Crypto++
-// will use aes_armv4.S. LLVM miscompiles aes_armv4.S so disable
-// under Clang. See https://bugs.llvm.org/show_bug.cgi?id=38133.
-#if !defined(CRYPTOPP_DISABLE_ASM) && defined(__arm__)
-# if defined(__GNUC__) && !defined(__clang__)
-# define CRYPTOGAMS_ARM_AES 1
-# endif
-#endif
-
-#endif // ARM32, ARM64
-
-// ***************** AltiVec and Power8 ********************
-
-#if (CRYPTOPP_BOOL_PPC32 || CRYPTOPP_BOOL_PPC64)
-
-#if defined(CRYPTOPP_DISABLE_ALTIVEC) || defined(CRYPTOPP_DISABLE_ASM)
-# undef CRYPTOPP_DISABLE_ALTIVEC
-# undef CRYPTOPP_DISABLE_POWER7
-# undef CRYPTOPP_DISABLE_POWER8
-# undef CRYPTOPP_DISABLE_POWER9
-# define CRYPTOPP_DISABLE_ALTIVEC 1
-# define CRYPTOPP_DISABLE_POWER7 1
-# define CRYPTOPP_DISABLE_POWER8 1
-# define CRYPTOPP_DISABLE_POWER9 1
-#endif
-
-// An old Apple G5 with GCC 4.01 has AltiVec, but its only Power4 or so.
-#if !defined(CRYPTOPP_ALTIVEC_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ALTIVEC)
-# if defined(_ARCH_PWR4) || defined(__ALTIVEC__) || \
- (CRYPTOPP_XLC_VERSION >= 100000) || (CRYPTOPP_GCC_VERSION >= 40001) || \
- (CRYPTOPP_CLANG_VERSION >= 20900)
-# define CRYPTOPP_ALTIVEC_AVAILABLE 1
-# endif
-#endif
-
-// We need Power7 for unaligned loads and stores
-#if !defined(CRYPTOPP_POWER7_AVAILABLE) && !defined(CRYPTOPP_DISABLE_POWER7) && defined(CRYPTOPP_ALTIVEC_AVAILABLE)
-# if defined(_ARCH_PWR7) || (CRYPTOPP_XLC_VERSION >= 100000) || \
- (CRYPTOPP_GCC_VERSION >= 40100) || (CRYPTOPP_CLANG_VERSION >= 30100)
-# define CRYPTOPP_POWER7_AVAILABLE 1
-# endif
-#endif
-
-// We need Power8 for in-core crypto and 64-bit vector types
-#if !defined(CRYPTOPP_POWER8_AVAILABLE) && !defined(CRYPTOPP_DISABLE_POWER8) && defined(CRYPTOPP_POWER7_AVAILABLE)
-# if defined(_ARCH_PWR8) || (CRYPTOPP_XLC_VERSION >= 130000) || \
- (CRYPTOPP_GCC_VERSION >= 40800) || (CRYPTOPP_CLANG_VERSION >= 70000)
-# define CRYPTOPP_POWER8_AVAILABLE 1
-# endif
-#endif
-
-// Power9 for random numbers
-#if !defined(CRYPTOPP_POWER9_AVAILABLE) && !defined(CRYPTOPP_DISABLE_POWER9) && defined(CRYPTOPP_POWER8_AVAILABLE)
-# if defined(_ARCH_PWR9) || (CRYPTOPP_XLC_VERSION >= 130200) || \
- (CRYPTOPP_GCC_VERSION >= 70000) || (CRYPTOPP_CLANG_VERSION >= 80000)
-# define CRYPTOPP_POWER9_AVAILABLE 1
-# endif
-#endif
-
-#if !defined(CRYPTOPP_POWER8_AES_AVAILABLE) && !defined(CRYPTOPP_DISABLE_POWER8_AES) && defined(CRYPTOPP_POWER8_AVAILABLE)
-# if defined(__CRYPTO__) || defined(_ARCH_PWR8) || (CRYPTOPP_XLC_VERSION >= 130000) || \
- (CRYPTOPP_GCC_VERSION >= 40800) || (CRYPTOPP_CLANG_VERSION >= 70000)
-//# define CRYPTOPP_POWER8_CRC_AVAILABLE 1
-# define CRYPTOPP_POWER8_AES_AVAILABLE 1
-# define CRYPTOPP_POWER8_VMULL_AVAILABLE 1
-# define CRYPTOPP_POWER8_SHA_AVAILABLE 1
-# endif
-#endif
-
-#endif // PPC32, PPC64
-
-// ***************** Miscellaneous ********************
-
-// Nearly all Intel's and AMD's have SSE. Enable it independent of SSE ASM and intrinscs
-#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_PPC32 || CRYPTOPP_BOOL_PPC64) && !defined(CRYPTOPP_DISABLE_ASM)
- #define CRYPTOPP_BOOL_ALIGN16 1
-#else
- #define CRYPTOPP_BOOL_ALIGN16 0
-#endif
-
-// How to allocate 16-byte aligned memory (for SSE2)
-// posix_memalign see https://forum.kde.org/viewtopic.php?p=66274
-#if defined(_MSC_VER)
- #define CRYPTOPP_MM_MALLOC_AVAILABLE
-#elif defined(__linux__) || defined(__sun__) || defined(__CYGWIN__)
- #define CRYPTOPP_MEMALIGN_AVAILABLE
-#elif defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define CRYPTOPP_MALLOC_ALIGNMENT_IS_16
-#elif (defined(_GNU_SOURCE) || ((_XOPEN_SOURCE + 0) >= 600)) && (_POSIX_ADVISORY_INFO > 0)
- #define CRYPTOPP_POSIX_MEMALIGN_AVAILABLE
-#else
- #define CRYPTOPP_NO_ALIGNED_ALLOC
-#endif
-
-// how to disable inlining
-#if defined(_MSC_VER)
-# define CRYPTOPP_NOINLINE_DOTDOTDOT
-# define CRYPTOPP_NOINLINE __declspec(noinline)
-#elif defined(__xlc__) || defined(__xlC__) || defined(__ibmxl__)
-# define CRYPTOPP_NOINLINE_DOTDOTDOT ...
-# define CRYPTOPP_NOINLINE __attribute__((noinline))
-#elif defined(__GNUC__)
-# define CRYPTOPP_NOINLINE_DOTDOTDOT
-# define CRYPTOPP_NOINLINE __attribute__((noinline))
-#else
-# define CRYPTOPP_NOINLINE_DOTDOTDOT ...
-# define CRYPTOPP_NOINLINE
-#endif
-
-// How to declare class constants
-#if defined(CRYPTOPP_DOXYGEN_PROCESSING) || defined(__BORLANDC__)
-# define CRYPTOPP_CONSTANT(x) static const int x;
-#else
-# define CRYPTOPP_CONSTANT(x) enum {x};
-#endif
-
-// How to disable CPU feature probing. We determine machine
-// capabilities by performing an os/platform *query* first,
-// like getauxv(). If the *query* fails, we move onto a
-// cpu *probe*. The cpu *probe* tries to exeute an instruction
-// and then catches a SIGILL on Linux or the exception
-// EXCEPTION_ILLEGAL_INSTRUCTION on Windows. Some OSes
-// fail to hangle a SIGILL gracefully, like Apple OSes. Apple
-// machines corrupt memory and variables around the probe.
-#if defined(__APPLE__)
-# define CRYPTOPP_NO_CPU_FEATURE_PROBES 1
-#endif
-
-// ***************** Initialization and Constructor priorities ********************
-
-// CRYPTOPP_INIT_PRIORITY attempts to manage initialization of C++ static objects.
-// Under GCC, the library uses init_priority attribute in the range
-// [CRYPTOPP_INIT_PRIORITY, CRYPTOPP_INIT_PRIORITY+100]. Under Windows,
-// CRYPTOPP_INIT_PRIORITY enlists "#pragma init_seg(lib)". The platforms
-// with gaps are Apple and Sun because they require linker scripts. Apple and
-// Sun will use the library's Singletons to initialize and acquire resources.
-// Also see http://cryptopp.com/wiki/Static_Initialization_Order_Fiasco
-#ifndef CRYPTOPP_INIT_PRIORITY
-# define CRYPTOPP_INIT_PRIORITY 250
-#endif
-
-// CRYPTOPP_USER_PRIORITY is for other libraries and user code that is using Crypto++
-// and managing C++ static object creation. It is guaranteed not to conflict with
-// values used by (or would be used by) the Crypto++ library.
-#ifndef CRYPTOPP_USER_PRIORITY
-# define CRYPTOPP_USER_PRIORITY (CRYPTOPP_INIT_PRIORITY+101)
-#endif
-
-// Most platforms allow us to specify when to create C++ objects. Apple and Sun do not.
-#if (CRYPTOPP_INIT_PRIORITY > 0) && !(defined(NO_OS_DEPENDENCE) || defined(__APPLE__) || defined(__sun__))
-# if (CRYPTOPP_GCC_VERSION >= 30000) || (CRYPTOPP_LLVM_CLANG_VERSION >= 20900) || (_INTEL_COMPILER >= 800)
-# define HAVE_GCC_INIT_PRIORITY 1
-# elif (CRYPTOPP_MSC_VERSION >= 1310)
-# define HAVE_MSC_INIT_PRIORITY 1
-# elif defined(__xlc__) || defined(__xlC__) || defined(__ibmxl__)
-# define HAVE_XLC_INIT_PRIORITY 1
-# endif
-#endif // CRYPTOPP_INIT_PRIORITY, NO_OS_DEPENDENCE, Apple, Sun
-
-// ***************** determine availability of OS features ********************
-
-#ifndef NO_OS_DEPENDENCE
-
-#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
-#define CRYPTOPP_WIN32_AVAILABLE
-#endif
-
-#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__sun)
-#define CRYPTOPP_UNIX_AVAILABLE
-#endif
-
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-#define CRYPTOPP_BSD_AVAILABLE
-#endif
-
-#if defined(CRYPTOPP_WIN32_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE)
-# define HIGHRES_TIMER_AVAILABLE
-#endif
-
-#ifdef CRYPTOPP_WIN32_AVAILABLE
-# if !defined(WINAPI_FAMILY)
-# define THREAD_TIMER_AVAILABLE
-# elif defined(WINAPI_FAMILY)
-# if (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP))
-# define THREAD_TIMER_AVAILABLE
-# endif
-# endif
-#endif
-
-#if defined(CRYPTOPP_UNIX_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING)
-# define NONBLOCKING_RNG_AVAILABLE
-# define BLOCKING_RNG_AVAILABLE
-# define OS_RNG_AVAILABLE
-#endif
-
-// Cygwin/Newlib requires _XOPEN_SOURCE=600
-#if defined(CRYPTOPP_UNIX_AVAILABLE)
-# define UNIX_SIGNALS_AVAILABLE 1
-#endif
-
-#ifdef CRYPTOPP_WIN32_AVAILABLE
-# if !defined(WINAPI_FAMILY)
-# define NONBLOCKING_RNG_AVAILABLE
-# define OS_RNG_AVAILABLE
-# elif defined(WINAPI_FAMILY)
-# if (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP))
-# define NONBLOCKING_RNG_AVAILABLE
-# define OS_RNG_AVAILABLE
-# elif !(WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP))
-# if ((WINVER >= 0x0A00 /*_WIN32_WINNT_WIN10*/) || (_WIN32_WINNT >= 0x0A00 /*_WIN32_WINNT_WIN10*/))
-# define NONBLOCKING_RNG_AVAILABLE
-# define OS_RNG_AVAILABLE
-# endif
-# endif
-# endif
-#endif
-
-#endif // NO_OS_DEPENDENCE
-
-// ***************** DLL related ********************
-
-#if defined(CRYPTOPP_WIN32_AVAILABLE) && !defined(CRYPTOPP_DOXYGEN_PROCESSING)
-
-#ifdef CRYPTOPP_EXPORTS
-#define CRYPTOPP_IS_DLL
-#define CRYPTOPP_DLL __declspec(dllexport)
-#elif defined(CRYPTOPP_IMPORTS)
-#define CRYPTOPP_IS_DLL
-#define CRYPTOPP_DLL __declspec(dllimport)
-#else
-#define CRYPTOPP_DLL
-#endif
-
-// C++ makes const internal linkage
-#define CRYPTOPP_TABLE extern
-#define CRYPTOPP_API __cdecl
-
-#else // not CRYPTOPP_WIN32_AVAILABLE
-
-// C++ makes const internal linkage
-#define CRYPTOPP_TABLE extern
-#define CRYPTOPP_DLL
-#define CRYPTOPP_API
-
-#endif // CRYPTOPP_WIN32_AVAILABLE
-
-#if defined(__MWERKS__)
-#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern class CRYPTOPP_DLL
-#elif defined(__BORLANDC__) || defined(__SUNPRO_CC)
-#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL
-#else
-#define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern template class CRYPTOPP_DLL
-#endif
-
-#if defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) && !defined(CRYPTOPP_IMPORTS)
-#define CRYPTOPP_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL
-#else
-#define CRYPTOPP_DLL_TEMPLATE_CLASS CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS
-#endif
-
-#if defined(__MWERKS__)
-#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern class
-#elif defined(__BORLANDC__) || defined(__SUNPRO_CC)
-#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS template class
-#else
-#define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern template class
-#endif
-
-#if defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) && !defined(CRYPTOPP_EXPORTS)
-#define CRYPTOPP_STATIC_TEMPLATE_CLASS template class
-#else
-#define CRYPTOPP_STATIC_TEMPLATE_CLASS CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS
-#endif
-
-// ************** Unused variable ***************
-
-// Portable way to suppress warnings.
-// Moved from misc.h due to circular depenedencies.
-#define CRYPTOPP_UNUSED(x) ((void)(x))
-
-// ************** Deprecated ***************
-
-#if (CRYPTOPP_GCC_VERSION >= 40500) || (CRYPTOPP_LLVM_CLANG_VERSION >= 20800) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40200)
-# define CRYPTOPP_DEPRECATED(msg) __attribute__((deprecated (msg)))
-#elif (CRYPTOPP_GCC_VERSION)
-# define CRYPTOPP_DEPRECATED(msg) __attribute__((deprecated))
-#else
-# define CRYPTOPP_DEPRECATED(msg)
-#endif
-
-// ***************** C++11 related ********************
-
-// Visual Studio began at VS2010, http://msdn.microsoft.com/en-us/library/hh567368%28v=vs.110%29.aspx
-// and https://docs.microsoft.com/en-us/cpp/visual-cpp-language-conformance .
-// Intel, http://software.intel.com/en-us/articles/c0x-features-supported-by-intel-c-compiler
-// GCC, http://gcc.gnu.org/projects/cxx0x.html
-// Clang, http://clang.llvm.org/cxx_status.html
-
-// Compatibility with non-clang compilers.
-#ifndef __has_feature
-# define __has_feature(x) 0
-#endif
-
-#if !defined(CRYPTOPP_NO_CXX11)
-# if ((_MSC_VER >= 1600) || (__cplusplus >= 201103L)) && !defined(_STLPORT_VERSION)
-# define CRYPTOPP_CXX11 1
-# endif
-#endif
-
-// Hack ahead. Apple's standard library does not have C++'s unique_ptr in C++11. We can't
-// test for unique_ptr directly because some of the non-Apple Clangs on OS X fail the same
-// way. However, modern standard libraries have <forward_list>, so we test for it instead.
-// Thanks to Jonathan Wakely for devising the clever test for modern/ancient versions.
-// TODO: test under Xcode 3, where g++ is really g++.
-#if defined(__APPLE__) && defined(__clang__)
-# if !(defined(__has_include) && __has_include(<forward_list>))
-# undef CRYPTOPP_CXX11
-# endif
-#endif
-
-// C++11 or C++14 is available
-#if defined(CRYPTOPP_CXX11)
-
-// atomics: MS at VS2012 (17.00); GCC at 4.4; Clang at 3.1/3.2; Intel 13.0; SunCC 5.14.
-#if (CRYPTOPP_MSC_VERSION >= 1700) || __has_feature(cxx_atomic) || \
- (__INTEL_COMPILER >= 1300) || (CRYPTOPP_GCC_VERSION >= 40400) || (__SUNPRO_CC >= 0x5140)
-# define CRYPTOPP_CXX11_ATOMICS 1
-#endif // atomics
-
-// synchronization: MS at VS2012 (17.00); GCC at 4.4; Clang at 3.3; Xcode 5.0; Intel 12.0; SunCC 5.13.
-// TODO: verify Clang and Intel versions; find __has_feature(x) extension for Clang
-#if (CRYPTOPP_MSC_VERSION >= 1700) || (CRYPTOPP_LLVM_CLANG_VERSION >= 30300) || \
- (CRYPTOPP_APPLE_CLANG_VERSION >= 50000) || (__INTEL_COMPILER >= 1200) || \
- (CRYPTOPP_GCC_VERSION >= 40400) || (__SUNPRO_CC >= 0x5130)
-// Hack ahead. New GCC compilers like GCC 6 on AIX 7.0 or earlier as well as original MinGW
-// don't have the synchronization gear. However, Wakely's test used for Apple does not work
-// on the GCC/AIX combination. Another twist is we need other stuff from C++11,
-// like no-except destructors. Dumping preprocessors shows the following may
-// apply: http://stackoverflow.com/q/14191566/608639.
-# include <cstddef>
-# if !defined(__GLIBCXX__) || defined(_GLIBCXX_HAS_GTHREADS)
-# define CRYPTOPP_CXX11_SYNCHRONIZATION 1
-# endif
-#endif // synchronization
-
-// Dynamic Initialization and Destruction with Concurrency ("Magic Statics")
-// MS at VS2015 with Vista (19.00); GCC at 4.3; LLVM Clang at 2.9; Apple Clang at 4.0; Intel 11.1; SunCC 5.13.
-// Microsoft's implementation only works for Vista and above, so its further
-// limited. http://connect.microsoft.com/VisualStudio/feedback/details/1789709
-#if (CRYPTOPP_MSC_VERSION >= 1900) && ((WINVER >= 0x0600) || (_WIN32_WINNT >= 0x0600)) || \
- (CRYPTOPP_LLVM_CLANG_VERSION >= 20900) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40000) || \
- (__INTEL_COMPILER >= 1110) || (CRYPTOPP_GCC_VERSION >= 40300) || (__SUNPRO_CC >= 0x5130)
-# define CRYPTOPP_CXX11_DYNAMIC_INIT 1
-#endif // Dynamic Initialization compilers
-
-// alignof/alignas: MS at VS2015 (19.00); GCC at 4.8; Clang at 3.0; Intel 15.0; SunCC 5.13.
-#if (CRYPTOPP_MSC_VERSION >= 1900) || __has_feature(cxx_alignas) || \
- (__INTEL_COMPILER >= 1500) || (CRYPTOPP_GCC_VERSION >= 40800) || (__SUNPRO_CC >= 0x5130)
-# define CRYPTOPP_CXX11_ALIGNAS 1
-#endif // alignas
-
-// alignof: MS at VS2015 (19.00); GCC at 4.5; Clang at 2.9; Intel 15.0; SunCC 5.13.
-#if (CRYPTOPP_MSC_VERSION >= 1900) || __has_feature(cxx_alignof) || \
- (__INTEL_COMPILER >= 1500) || (CRYPTOPP_GCC_VERSION >= 40500) || (__SUNPRO_CC >= 0x5130)
-# define CRYPTOPP_CXX11_ALIGNOF 1
-#endif // alignof
-
-// lambdas: MS at VS2012 (17.00); GCC at 4.9; Clang at 3.3; Intel 12.0; SunCC 5.14.
-#if (CRYPTOPP_MSC_VERSION >= 1700) || __has_feature(cxx_lambdas) || \
- (__INTEL_COMPILER >= 1200) || (CRYPTOPP_GCC_VERSION >= 40900) || (__SUNPRO_CC >= 0x5140)
-# define CRYPTOPP_CXX11_LAMBDA 1
-#endif // lambdas
-
-// noexcept: MS at VS2015 (19.00); GCC at 4.6; Clang at 3.0; Intel 14.0; SunCC 5.13.
-#if (CRYPTOPP_MSC_VERSION >= 1900) || __has_feature(cxx_noexcept) || \
- (__INTEL_COMPILER >= 1400) || (CRYPTOPP_GCC_VERSION >= 40600) || (__SUNPRO_CC >= 0x5130)
-# define CRYPTOPP_CXX11_NOEXCEPT 1
-#endif // noexcept compilers
-
-// variadic templates: MS at VS2013 (18.00); GCC at 4.3; Clang at 2.9; Intel 12.1; SunCC 5.13.
-#if (CRYPTOPP_MSC_VERSION >= 1800) || __has_feature(cxx_variadic_templates) || \
- (__INTEL_COMPILER >= 1210) || (CRYPTOPP_GCC_VERSION >= 40300) || (__SUNPRO_CC >= 0x5130)
-# define CRYPTOPP_CXX11_VARIADIC_TEMPLATES 1
-#endif // variadic templates
-
-// constexpr: MS at VS2015 (19.00); GCC at 4.6; Clang at 3.1; Intel 16.0; SunCC 5.13.
-// Intel has mis-supported the feature since at least ICPC 13.00
-#if (CRYPTOPP_MSC_VERSION >= 1900) || __has_feature(cxx_constexpr) || \
- (__INTEL_COMPILER >= 1600) || (CRYPTOPP_GCC_VERSION >= 40600) || (__SUNPRO_CC >= 0x5130)
-# define CRYPTOPP_CXX11_CONSTEXPR 1
-#endif // constexpr compilers
-
-// strong typed enums: MS at VS2012 (17.00); GCC at 4.4; Clang at 3.3; Intel 14.0; SunCC 5.12.
-// Mircorosft and Intel had partial support earlier, but we require full support.
-#if (CRYPTOPP_MSC_VERSION >= 1700) || __has_feature(cxx_strong_enums) || \
- (__INTEL_COMPILER >= 1400) || (CRYPTOPP_GCC_VERSION >= 40400) || (__SUNPRO_CC >= 0x5120)
-# define CRYPTOPP_CXX11_ENUM 1
-#endif // constexpr compilers
-
-// nullptr_t: MS at VS2010 (16.00); GCC at 4.6; Clang at 3.3; Intel 10.0; SunCC 5.13.
-#if (CRYPTOPP_MSC_VERSION >= 1600) || __has_feature(cxx_nullptr) || \
- (__INTEL_COMPILER >= 1000) || (CRYPTOPP_GCC_VERSION >= 40600) || \
- (__SUNPRO_CC >= 0x5130) || defined(__IBMCPP_NULLPTR)
-# define CRYPTOPP_CXX11_NULLPTR 1
-#endif // nullptr_t compilers
-
-#endif // CRYPTOPP_CXX11
-
-// ***************** C++17 related ********************
-
-// C++17 macro version, https://stackoverflow.com/q/38456127/608639
-#if defined(CRYPTOPP_CXX11) && !defined(CRYPTOPP_NO_CXX17)
-# if ((_MSC_VER >= 1900) || (__cplusplus >= 201703L)) && !defined(_STLPORT_VERSION)
-# define CRYPTOPP_CXX17 1
-# endif
-#endif
-
-// C++17 is available
-#if defined(CRYPTOPP_CXX17)
-
-// C++17 uncaught_exceptions: MS at VS2015 (19.00); GCC at 6.0; Clang at 3.5; Intel 18.0.
-// Clang and __EXCEPTIONS see http://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html
-#if defined(__clang__)
-# if __EXCEPTIONS && __has_feature(cxx_exceptions)
-# if __cpp_lib_uncaught_exceptions
-# define CRYPTOPP_CXX17_EXCEPTIONS 1
-# endif
-# endif
-#elif (CRYPTOPP_MSC_VERSION >= 1900) || (__INTEL_COMPILER >= 1800) || (CRYPTOPP_GCC_VERSION >= 60000) || (__cpp_lib_uncaught_exceptions)
-# define CRYPTOPP_CXX17_EXCEPTIONS 1
-#endif // uncaught_exceptions compilers
-
-#endif // CRYPTOPP_CXX17
-
-// ***************** C++ fixups ********************
-
-#if defined(CRYPTOPP_CXX11_NOEXCEPT)
-# define CRYPTOPP_THROW noexcept(false)
-# define CRYPTOPP_NO_THROW noexcept(true)
-#else
-# define CRYPTOPP_THROW
-# define CRYPTOPP_NO_THROW
-#endif // CRYPTOPP_CXX11_NOEXCEPT
-
-// http://stackoverflow.com/a/13867690/608639
-#if defined(CRYPTOPP_CXX11_CONSTEXPR)
-# define CRYPTOPP_STATIC_CONSTEXPR static constexpr
-# define CRYPTOPP_CONSTEXPR constexpr
-#else
-# define CRYPTOPP_STATIC_CONSTEXPR static
-# define CRYPTOPP_CONSTEXPR
-#endif // CRYPTOPP_CXX11_CONSTEXPR
-
-// Hack... CRYPTOPP_ALIGN_DATA is defined earlier, before C++11 alignas availability is determined
-#if defined(CRYPTOPP_CXX11_ALIGNAS)
-# undef CRYPTOPP_ALIGN_DATA
-# define CRYPTOPP_ALIGN_DATA(x) alignas(x)
-#endif // CRYPTOPP_CXX11_ALIGNAS
-
-// Hack... CRYPTOPP_CONSTANT is defined earlier, before C++11 constexpr availability is determined
-// http://stackoverflow.com/q/35213098/608639
-// #if defined(CRYPTOPP_CXX11_CONSTEXPR)
-// # undef CRYPTOPP_CONSTANT
-// # define CRYPTOPP_CONSTANT(x) constexpr static int x;
-// #endif
-
-// Hack... CRYPTOPP_CONSTANT is defined earlier, before C++11 constexpr availability is determined
-// http://stackoverflow.com/q/35213098/608639
-#if defined(CRYPTOPP_CXX11_ENUM)
-# undef CRYPTOPP_CONSTANT
-# define CRYPTOPP_CONSTANT(x) enum : int { x };
-#elif defined(CRYPTOPP_CXX11_CONSTEXPR)
-# undef CRYPTOPP_CONSTANT
-# define CRYPTOPP_CONSTANT(x) constexpr static int x;
-#endif
-
-// Hack... C++11 nullptr_t type safety and analysis
-#if defined(CRYPTOPP_CXX11_NULLPTR) && !defined(NULLPTR)
-# define NULLPTR nullptr
-#elif !defined(NULLPTR)
-# define NULLPTR NULL
-#endif // CRYPTOPP_CXX11_NULLPTR
-
-// OK to comment the following out, but please report it so we can fix it.
-// C++17 value taken from http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4567.pdf.
-#if (defined(__cplusplus) && (__cplusplus >= 199711L) && (__cplusplus < 201402L)) && !defined(CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE)
-# error "std::uncaught_exception is not available. This is likely a configuration error."
-#endif
-
-#endif // CRYPTOPP_CONFIG_H
+#include "config_align.h"
+#include "config_asm.h"
+#include "config_cpu.h"
+#include "config_cxx.h"
+#include "config_dll.h"
+#include "config_int.h"
+#include "config_misc.h"
+#include "config_ns.h"
+#include "config_os.h"
+#include "config_ver.h"
+
+#endif // CRYPTOPP_CONFIG_H
diff --git a/config_align.h b/config_align.h
new file mode 100644
index 00000000..7477e289
--- /dev/null
+++ b/config_align.h
@@ -0,0 +1,61 @@
+// config_align.h - written and placed in public domain by Jeffrey Walton
+// the bits that make up this source file are from the
+// library's monolithic config.h.
+
+/// \file config_align.h
+/// \brief Library configuration file
+/// \details <tt>config.h</tt> was split into components in May 2019 to better
+/// integrate with Autoconf and its feature tests. The splitting occured so
+/// users could continue to include <tt>config.h</tt> while allowing Autoconf
+/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
+/// its feature tests.
+/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
+/// \since Crypto++ 8.3
+
+#ifndef CRYPTOPP_CONFIG_ALIGN_H
+#define CRYPTOPP_CONFIG_ALIGN_H
+
+#include "config_cpu.h"
+#include "config_cxx.h"
+#include "config_ver.h"
+
+// Nearly all Intel's and AMD's have SSE. Enable it independent of SSE ASM and intrinscs
+#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_PPC32 || CRYPTOPP_BOOL_PPC64) && !defined(CRYPTOPP_DISABLE_ASM)
+ #define CRYPTOPP_BOOL_ALIGN16 1
+#else
+ #define CRYPTOPP_BOOL_ALIGN16 0
+#endif
+
+// How to allocate 16-byte aligned memory (for SSE2)
+// posix_memalign see https://forum.kde.org/viewtopic.php?p=66274
+#if defined(_MSC_VER)
+ #define CRYPTOPP_MM_MALLOC_AVAILABLE
+#elif defined(__linux__) || defined(__sun__) || defined(__CYGWIN__)
+ #define CRYPTOPP_MEMALIGN_AVAILABLE
+#elif defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #define CRYPTOPP_MALLOC_ALIGNMENT_IS_16
+#elif (defined(_GNU_SOURCE) || ((_XOPEN_SOURCE + 0) >= 600)) && (_POSIX_ADVISORY_INFO > 0)
+ #define CRYPTOPP_POSIX_MEMALIGN_AVAILABLE
+#else
+ #define CRYPTOPP_NO_ALIGNED_ALLOC
+#endif
+
+// Sun Studio Express 3 (December 2006) provides GCC-style attributes.
+// IBM XL C/C++ alignment modifier per Optimization Guide, pp. 19-20.
+// __IBM_ATTRIBUTES per XLC 12.1 AIX Compiler Manual, p. 473.
+// CRYPTOPP_ALIGN_DATA may not be reliable on AIX.
+#ifndef CRYPTOPP_ALIGN_DATA
+ #if defined(CRYPTOPP_CXX11_ALIGNAS)
+ #define CRYPTOPP_ALIGN_DATA(x) alignas(x)
+ #elif defined(_MSC_VER)
+ #define CRYPTOPP_ALIGN_DATA(x) __declspec(align(x))
+ #elif defined(__GNUC__) || defined(__clang__) || (__SUNPRO_CC >= 0x5100)
+ #define CRYPTOPP_ALIGN_DATA(x) __attribute__((aligned(x)))
+ #elif defined(__xlc__) || defined(__xlC__)
+ #define CRYPTOPP_ALIGN_DATA(x) __attribute__((aligned(x)))
+ #else
+ #define CRYPTOPP_ALIGN_DATA(x)
+ #endif
+#endif
+
+#endif // CRYPTOPP_CONFIG_ALIGN_H
diff --git a/config_asm.h b/config_asm.h
new file mode 100644
index 00000000..7a798f71
--- /dev/null
+++ b/config_asm.h
@@ -0,0 +1,431 @@
+// config_asm.h - written and placed in public domain by Jeffrey Walton
+// the bits that make up this source file are from the
+// library's monolithic config.h.
+
+/// \file config_asm.h
+/// \brief Library configuration file
+/// \details <tt>config.h</tt> was split into components in May 2019 to better
+/// integrate with Autoconf and its feature tests. The splitting occured so
+/// users could continue to include <tt>config.h</tt> while allowing Autoconf
+/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
+/// its feature tests.
+/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
+/// \since Crypto++ 8.3
+
+#ifndef CRYPTOPP_CONFIG_ASM_H
+#define CRYPTOPP_CONFIG_ASM_H
+
+#include "config_os.h"
+#include "config_cpu.h"
+#include "config_ver.h"
+
+// Define this to disable ASM, intrinsics and built-ins. The library will be
+// compiled using C++ only. The library code will not include SSE2 (and
+// above), NEON, Aarch32, Aarch64, or Altivec (and above). Note the compiler
+// may use higher ISAs depending on compiler options, but the library will not
+// explictly use the ISAs. When disabling ASM, it is best to do it from
+// config.h to ensure the library and all programs share the setting.
+// #define CRYPTOPP_DISABLE_ASM 1
+
+// https://github.com/weidai11/cryptopp/issues/719
+#if defined(__native_client__) && !defined(CRYPTOPP_DISABLE_ASM)
+# define CRYPTOPP_DISABLE_ASM 1
+#endif
+
+// Some Clang and SunCC cannot handle mixed asm with positional arguments,
+// where the body is Intel style with no prefix and the templates are
+// AT&T style. Define this if the Makefile misdetects the configuration.
+// Also see https://bugs.llvm.org/show_bug.cgi?id=39895 .
+// #define CRYPTOPP_DISABLE_MIXED_ASM 1
+
+// Define CRYPTOPP_NO_CXX11 to avoid C++11 related features shown at the
+// end of this file. Some compilers and standard C++ headers advertise C++11
+// but they are really just C++03 with some additional C++11 headers and
+// non-conforming classes. You might also consider `-std=c++03` or
+// `-std=gnu++03`, but they are required options when building the library
+// and all programs. CRYPTOPP_NO_CXX11 is probably easier to manage but it may
+// cause -Wterminate warnings under GCC. MSVC++ has a similar warning.
+// Also see https://github.com/weidai11/cryptopp/issues/529
+// #define CRYPTOPP_NO_CXX11 1
+
+// Define CRYPTOPP_NO_CXX17 to avoid C++17 related features shown at the end of
+// this file. At the moment it should only affect std::uncaught_exceptions.
+// #define CRYPTOPP_NO_CXX17 1
+
+// CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS is no longer honored. It
+// was removed at https://github.com/weidai11/cryptopp/issues/682
+// #define CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS 1
+
+// It is OK to remove the hard stop below, but you are on your own.
+// After building the library be sure to run self tests described
+// https://www.cryptopp.com/wiki/Release_Process#Self_Tests
+// Some relevant bug reports can be found at:
+// * Clang: http://github.com/weidai11/cryptopp/issues/147
+// * Native Client: https://github.com/weidai11/cryptopp/issues/719
+#if (defined(_MSC_VER) && defined(__clang__))
+# error: "Unsupported configuration"
+#endif
+
+// You may need to force include a C++ header on Android when using STLPort to ensure
+// _STLPORT_VERSION is defined: CXXFLAGS="-DNDEBUG -g2 -O2 -std=c++11 -include iosfwd"
+// TODO: Figure out C++17 and lack of std::uncaught_exception
+#if (defined(_MSC_VER) && _MSC_VER <= 1300) || defined(__MWERKS__) || (defined(_STLPORT_VERSION) && ((_STLPORT_VERSION < 0x450) || defined(_STLP_NO_UNCAUGHT_EXCEPT_SUPPORT)))
+#define CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION
+#endif
+
+// ***************** IA32 CPU features ********************
+
+#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
+
+// Apple Clang prior to 5.0 cannot handle SSE2
+#if !defined(CRYPTOPP_DISABLE_ASM) && defined(CRYPTOPP_APPLE_CLANG_VERSION) && (CRYPTOPP_APPLE_CLANG_VERSION < 50000)
+# define CRYPTOPP_DISABLE_ASM 1
+#endif
+
+// Sun Studio 12.1 provides GCC inline assembly
+// http://blogs.oracle.com/x86be/entry/gcc_style_asm_inlining_support
+#if !defined(CRYPTOPP_DISABLE_ASM) && defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x5100)
+# define CRYPTOPP_DISABLE_ASM 1
+#endif
+
+#if !defined(CRYPTOPP_DISABLE_ASM) && ((defined(_MSC_VER) && defined(_M_IX86)) || (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))))
+ // C++Builder 2010 does not allow "call label" where label is defined within inline assembly
+ #define CRYPTOPP_X86_ASM_AVAILABLE 1
+
+ #if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(_MSC_VER) || CRYPTOPP_GCC_VERSION >= 30300 || defined(__SSE2__))
+ #define CRYPTOPP_SSE2_ASM_AVAILABLE 1
+ #endif
+
+ #if !defined(CRYPTOPP_DISABLE_SSSE3) && (_MSC_VER >= 1500 || CRYPTOPP_GCC_VERSION >= 40300 || defined(__SSSE3__))
+ #define CRYPTOPP_SSSE3_ASM_AVAILABLE 1
+ #endif
+#endif
+
+#if !defined(CRYPTOPP_DISABLE_ASM) && defined(_MSC_VER) && defined(_M_X64)
+ #define CRYPTOPP_X64_MASM_AVAILABLE 1
+#endif
+
+#if !defined(CRYPTOPP_DISABLE_ASM) && defined(__GNUC__) && defined(__x86_64__)
+ #define CRYPTOPP_X64_ASM_AVAILABLE 1
+#endif
+
+// 32-bit SunCC does not enable SSE2 by default.
+#if !defined(CRYPTOPP_DISABLE_ASM) && (defined(_MSC_VER) || CRYPTOPP_GCC_VERSION >= 30300 || defined(__SSE2__) || (__SUNPRO_CC >= 0x5100))
+ #define CRYPTOPP_SSE2_INTRIN_AVAILABLE 1
+#endif
+
+#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SSSE3)
+# if defined(__SSSE3__) || (_MSC_VER >= 1500) || \
+ (CRYPTOPP_GCC_VERSION >= 40300) || (__INTEL_COMPILER >= 1000) || (__SUNPRO_CC >= 0x5110) || \
+ (CRYPTOPP_LLVM_CLANG_VERSION >= 20300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40000)
+ #define CRYPTOPP_SSSE3_AVAILABLE 1
+# endif
+#endif
+
+// Intrinsics availible in GCC 4.3 (http://gcc.gnu.org/gcc-4.3/changes.html) and
+// MSVC 2008 (http://msdn.microsoft.com/en-us/library/bb892950%28v=vs.90%29.aspx)
+// SunCC could generate SSE4 at 12.1, but the intrinsics are missing until 12.4.
+#if !defined(CRYPTOPP_DISABLE_SSE4) && defined(CRYPTOPP_SSSE3_AVAILABLE) && \
+ (defined(__SSE4_1__) || (CRYPTOPP_MSC_VERSION >= 1500) || \
+ (CRYPTOPP_GCC_VERSION >= 40300) || (__INTEL_COMPILER >= 1000) || (__SUNPRO_CC >= 0x5110) || \
+ (CRYPTOPP_LLVM_CLANG_VERSION >= 20300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40000))
+ #define CRYPTOPP_SSE41_AVAILABLE 1
+#endif
+
+#if !defined(CRYPTOPP_DISABLE_SSE4) && defined(CRYPTOPP_SSSE3_AVAILABLE) && \
+ (defined(__SSE4_2__) || (CRYPTOPP_MSC_VERSION >= 1500) || (__SUNPRO_CC >= 0x5110) || \
+ (CRYPTOPP_GCC_VERSION >= 40300) || (__INTEL_COMPILER >= 1000) || \
+ (CRYPTOPP_LLVM_CLANG_VERSION >= 20300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40000))
+ #define CRYPTOPP_SSE42_AVAILABLE 1
+#endif
+
+// 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_AESNI)
+ #define CRYPTOPP_DISABLE_CLMUL 1
+#endif
+
+// Requires Sun Studio 12.3 (SunCC 0x5120) in theory.
+#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_CLMUL) && defined(CRYPTOPP_SSE42_AVAILABLE) && \
+ (defined(__PCLMUL__) || (_MSC_FULL_VER >= 150030729) || (__SUNPRO_CC >= 0x5120) || \
+ (CRYPTOPP_GCC_VERSION >= 40300) || (__INTEL_COMPILER >= 1110) || \
+ (CRYPTOPP_LLVM_CLANG_VERSION >= 30200) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40300))
+ #define CRYPTOPP_CLMUL_AVAILABLE 1
+#endif
+
+// Requires Sun Studio 12.3 (SunCC 0x5120)
+#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))
+ #define CRYPTOPP_AESNI_AVAILABLE 1
+#endif
+
+// Requires Binutils 2.24
+#if !defined(CRYPTOPP_DISABLE_AVX) && defined(CRYPTOPP_SSE42_AVAILABLE) && \
+ (defined(__AVX2__) || (CRYPTOPP_MSC_VERSION >= 1800) || (__SUNPRO_CC >= 0x5130) || \
+ (CRYPTOPP_GCC_VERSION >= 40700) || (__INTEL_COMPILER >= 1400) || \
+ (CRYPTOPP_LLVM_CLANG_VERSION >= 30100) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40600))
+#define CRYPTOPP_AVX_AVAILABLE 1
+#endif
+
+// Requires Binutils 2.24
+#if !defined(CRYPTOPP_DISABLE_AVX2) && defined(CRYPTOPP_AVX_AVAILABLE) && \
+ (defined(__AVX2__) || (CRYPTOPP_MSC_VERSION >= 1800) || (__SUNPRO_CC >= 0x5130) || \
+ (CRYPTOPP_GCC_VERSION >= 40900) || (__INTEL_COMPILER >= 1400) || \
+ (CRYPTOPP_LLVM_CLANG_VERSION >= 30100) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40600))
+#define CRYPTOPP_AVX2_AVAILABLE 1
+#endif
+
+// Guessing at SHA for SunCC. Its not in Sun Studio 12.6. Also see
+// http://stackoverflow.com/questions/45872180/which-xarch-for-sha-extensions-on-solaris
+#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SHANI) && defined(CRYPTOPP_SSE42_AVAILABLE) && \
+ (defined(__SHA__) || (CRYPTOPP_MSC_VERSION >= 1900) || (__SUNPRO_CC >= 0x5160) || \
+ (CRYPTOPP_GCC_VERSION >= 40900) || (__INTEL_COMPILER >= 1300) || \
+ (CRYPTOPP_LLVM_CLANG_VERSION >= 30400) || (CRYPTOPP_APPLE_CLANG_VERSION >= 50100))
+ #define CRYPTOPP_SHANI_AVAILABLE 1
+#endif
+
+// Fixup Android and SSE, Crypto. It may be enabled based on compiler version.
+#if (defined(__ANDROID__) || defined(ANDROID))
+# if (CRYPTOPP_BOOL_X86)
+# undef CRYPTOPP_SSE41_AVAILABLE
+# undef CRYPTOPP_SSE42_AVAILABLE
+# undef CRYPTOPP_CLMUL_AVAILABLE
+# undef CRYPTOPP_AESNI_AVAILABLE
+# undef CRYPTOPP_SHANI_AVAILABLE
+# endif
+# if (CRYPTOPP_BOOL_X64)
+# undef CRYPTOPP_CLMUL_AVAILABLE
+# undef CRYPTOPP_AESNI_AVAILABLE
+# undef CRYPTOPP_SHANI_AVAILABLE
+# endif
+#endif
+
+// Fixup for SunCC 12.1-12.4. Bad code generation in AES_Encrypt and friends.
+#if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x5130)
+# undef CRYPTOPP_AESNI_AVAILABLE
+#endif
+
+// Fixup for SunCC 12.1-12.6. Compiler crash on GCM_Reduce_CLMUL and friends.
+// http://github.com/weidai11/cryptopp/issues/226
+#if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x5150)
+# undef CRYPTOPP_CLMUL_AVAILABLE
+#endif
+
+#endif // X86, X32, X64
+
+// ***************** ARM CPU features ********************
+
+#if (CRYPTOPP_BOOL_ARM32 || CRYPTOPP_BOOL_ARMV8)
+
+// We don't have an ARM big endian test rig. Disable
+// ARM-BE ASM and instrinsics until we can test it.
+#if (CRYPTOPP_BIG_ENDIAN)
+# define CRYPTOPP_DISABLE_ASM 1
+#endif
+
+// Requires ARMv7 and ACLE 1.0. -march=armv7-a or above must be present
+// Requires GCC 4.3, Clang 2.8 or Visual Studio 2012
+// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
+#if !defined(CRYPTOPP_ARM_NEON_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
+# if defined(__arm__) || defined(__ARM_NEON) || defined(__ARM_FEATURE_NEON) || defined(_M_ARM)
+# if (CRYPTOPP_GCC_VERSION >= 40300) || (CRYPTOPP_CLANG_VERSION >= 20800) || \
+ (CRYPTOPP_MSC_VERSION >= 1700)
+# define CRYPTOPP_ARM_NEON_AVAILABLE 1
+# endif // Compilers
+# endif // Platforms
+#endif
+
+// ARMv8 and ASIMD. -march=armv8-a or above must be present
+// Requires GCC 4.8, Clang 3.3 or Visual Studio 2017
+// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
+#if !defined(CRYPTOPP_ARM_ASIMD_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
+# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
+# if defined(__ARM_NEON) || defined(__ARM_FEATURE_NEON) || defined(__ARM_FEATURE_ASIMD) || \
+ (CRYPTOPP_GCC_VERSION >= 40800) || (CRYPTOPP_CLANG_VERSION >= 30300) || \
+ (CRYPTOPP_MSC_VERSION >= 1916)
+# define CRYPTOPP_ARM_NEON_AVAILABLE 1
+# define CRYPTOPP_ARM_ASIMD_AVAILABLE 1
+# endif // Compilers
+# endif // Platforms
+#endif
+
+// ARMv8 and ASIMD. -march=armv8-a+crc or above must be present
+// Requires GCC 4.8, Clang 3.3 or Visual Studio 2017
+// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
+#if !defined(CRYPTOPP_ARM_CRC32_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
+# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
+# if defined(__ARM_FEATURE_CRC32) || (CRYPTOPP_GCC_VERSION >= 40800) || \
+ (CRYPTOPP_CLANG_VERSION >= 30300) || (CRYPTOPP_MSC_VERSION >= 1916)
+# define CRYPTOPP_ARM_CRC32_AVAILABLE 1
+# endif // Compilers
+# endif // Platforms
+#endif
+
+// ARMv8 and ASIMD. -march=armv8-a+crypto or above must be present
+// Requires GCC 4.8, Clang 3.3 or Visual Studio 2017
+// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
+#if !defined(CRYPTOPP_ARM_PMULL_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
+# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
+# if defined(__ARM_FEATURE_CRYPTO) || (CRYPTOPP_GCC_VERSION >= 40800) || \
+ (CRYPTOPP_CLANG_VERSION >= 30300) || (CRYPTOPP_MSC_VERSION >= 1916)
+# define CRYPTOPP_ARM_PMULL_AVAILABLE 1
+# endif // Compilers
+# endif // Platforms
+#endif
+
+// ARMv8 and AES. -march=armv8-a+crypto or above must be present
+// Requires GCC 4.8, Clang 3.3 or Visual Studio 2017
+// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
+#if !defined(CRYPTOPP_ARM_AES_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
+# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
+# if defined(__ARM_FEATURE_CRYPTO) || (CRYPTOPP_GCC_VERSION >= 40800) || \
+ (CRYPTOPP_CLANG_VERSION >= 30300) || (CRYPTOPP_MSC_VERSION >= 1910)
+# define CRYPTOPP_ARM_AES_AVAILABLE 1
+# endif // Compilers
+# endif // Platforms
+#endif
+
+// ARMv8 and SHA-1, SHA-256. -march=armv8-a+crypto or above must be present
+// Requires GCC 4.8, Clang 3.3 or Visual Studio 2017
+// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
+#if !defined(CRYPTOPP_ARM_SHA_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
+# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
+# if defined(__ARM_FEATURE_CRYPTO) || (CRYPTOPP_GCC_VERSION >= 40800) || \
+ (CRYPTOPP_CLANG_VERSION >= 30300) || (CRYPTOPP_MSC_VERSION >= 1916)
+# define CRYPTOPP_ARM_SHA1_AVAILABLE 1
+# define CRYPTOPP_ARM_SHA2_AVAILABLE 1
+# endif // Compilers
+# endif // Platforms
+#endif
+
+// ARMv8 and SHA-512, SHA-3. -march=armv8.4-a+crypto or above must be present
+// Requires GCC 8.0, Clang 6.0 or Visual Studio 2021???
+// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
+#if !defined(CRYPTOPP_ARM_SHA_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
+# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
+# if defined(__ARM_FEATURE_SHA3) || (CRYPTOPP_GCC_VERSION >= 80000) || \
+ (CRYPTOPP_MSC_VERSION >= 5000)
+# define CRYPTOPP_ARM_SHA512_AVAILABLE 1
+# define CRYPTOPP_ARM_SHA3_AVAILABLE 1
+# endif // Compilers
+# endif // Platforms
+#endif
+
+// ARMv8 and SM3, SM4. -march=armv8.4-a+crypto or above must be present
+// Requires GCC 8.0, Clang 6.0 or Visual Studio 2021???
+// Do not use APPLE_CLANG_VERSION; use __ARM_FEATURE_XXX instead.
+#if !defined(CRYPTOPP_ARM_SM3_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ASM)
+# if defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
+# if defined(__ARM_FEATURE_SM3) || (CRYPTOPP_GCC_VERSION >= 80000) || \
+ (CRYPTOPP_MSC_VERSION >= 5000)
+# define CRYPTOPP_ARM_SM3_AVAILABLE 1
+# define CRYPTOPP_ARM_SM4_AVAILABLE 1
+# endif // Compilers
+# endif // Platforms
+#endif
+
+// Limit the <arm_acle.h> include.
+#if !defined(CRYPTOPP_ARM_ACLE_AVAILABLE)
+# if defined(__aarch32__) || defined(__aarch64__) || (__ARM_ARCH >= 8) || defined(__ARM_ACLE)
+# if !defined(__ANDROID__) && !defined(ANDROID) && !defined(__APPLE__)
+# define CRYPTOPP_ARM_ACLE_AVAILABLE 1
+# endif
+# endif
+#endif
+
+// Fixup Apple Clang and PMULL. Apple defines __ARM_FEATURE_CRYPTO for Xcode 6
+// but does not provide PMULL. TODO: determine when PMULL is available.
+#if defined(CRYPTOPP_APPLE_CLANG_VERSION) && (CRYPTOPP_APPLE_CLANG_VERSION < 70000)
+# undef CRYPTOPP_ARM_PMULL_AVAILABLE
+#endif
+
+// Fixup Android and CRC32. It may be enabled based on compiler version.
+#if (defined(__ANDROID__) || defined(ANDROID)) && !defined(__ARM_FEATURE_CRC32)
+# undef CRYPTOPP_ARM_CRC32_AVAILABLE
+#endif
+
+// Fixup Android and Crypto. It may be enabled based on compiler version.
+#if (defined(__ANDROID__) || defined(ANDROID)) && !defined(__ARM_FEATURE_CRYPTO)
+# undef CRYPTOPP_ARM_PMULL_AVAILABLE
+# undef CRYPTOPP_ARM_AES_AVAILABLE
+# undef CRYPTOPP_ARM_SHA1_AVAILABLE
+# undef CRYPTOPP_ARM_SHA2_AVAILABLE
+#endif
+
+// Cryptogams offers an ARM asm AES implementation. Crypto++ does
+// not provide an asm implementation. The Cryptogams implementation
+// is about 2x faster than C/C++. Define this to use the Cryptogams
+// AES implementation on GNU Linux systems. When defined, Crypto++
+// will use aes_armv4.S. LLVM miscompiles aes_armv4.S so disable
+// under Clang. See https://bugs.llvm.org/show_bug.cgi?id=38133.
+#if !defined(CRYPTOPP_DISABLE_ASM) && defined(__arm__)
+# if defined(__GNUC__) && !defined(__clang__)
+# define CRYPTOGAMS_ARM_AES 1
+# endif
+#endif
+
+#endif // ARM32, ARM64
+
+// ***************** AltiVec and Power8 ********************
+
+#if (CRYPTOPP_BOOL_PPC32 || CRYPTOPP_BOOL_PPC64)
+
+#if defined(CRYPTOPP_DISABLE_ALTIVEC) || defined(CRYPTOPP_DISABLE_ASM)
+# undef CRYPTOPP_DISABLE_ALTIVEC
+# undef CRYPTOPP_DISABLE_POWER7
+# undef CRYPTOPP_DISABLE_POWER8
+# undef CRYPTOPP_DISABLE_POWER9
+# define CRYPTOPP_DISABLE_ALTIVEC 1
+# define CRYPTOPP_DISABLE_POWER7 1
+# define CRYPTOPP_DISABLE_POWER8 1
+# define CRYPTOPP_DISABLE_POWER9 1
+#endif
+
+// An old Apple G5 with GCC 4.01 has AltiVec, but its only Power4 or so.
+#if !defined(CRYPTOPP_ALTIVEC_AVAILABLE) && !defined(CRYPTOPP_DISABLE_ALTIVEC)
+# if defined(_ARCH_PWR4) || defined(__ALTIVEC__) || \
+ (CRYPTOPP_XLC_VERSION >= 100000) || (CRYPTOPP_GCC_VERSION >= 40001) || \
+ (CRYPTOPP_CLANG_VERSION >= 20900)
+# define CRYPTOPP_ALTIVEC_AVAILABLE 1
+# endif
+#endif
+
+// We need Power7 for unaligned loads and stores
+#if !defined(CRYPTOPP_POWER7_AVAILABLE) && !defined(CRYPTOPP_DISABLE_POWER7) && defined(CRYPTOPP_ALTIVEC_AVAILABLE)
+# if defined(_ARCH_PWR7) || (CRYPTOPP_XLC_VERSION >= 100000) || \
+ (CRYPTOPP_GCC_VERSION >= 40100) || (CRYPTOPP_CLANG_VERSION >= 30100)
+# define CRYPTOPP_POWER7_AVAILABLE 1
+# endif
+#endif
+
+// We need Power8 for in-core crypto and 64-bit vector types
+#if !defined(CRYPTOPP_POWER8_AVAILABLE) && !defined(CRYPTOPP_DISABLE_POWER8) && defined(CRYPTOPP_POWER7_AVAILABLE)
+# if defined(_ARCH_PWR8) || (CRYPTOPP_XLC_VERSION >= 130000) || \
+ (CRYPTOPP_GCC_VERSION >= 40800) || (CRYPTOPP_CLANG_VERSION >= 70000)
+# define CRYPTOPP_POWER8_AVAILABLE 1
+# endif
+#endif
+
+// Power9 for random numbers
+#if !defined(CRYPTOPP_POWER9_AVAILABLE) && !defined(CRYPTOPP_DISABLE_POWER9) && defined(CRYPTOPP_POWER8_AVAILABLE)
+# if defined(_ARCH_PWR9) || (CRYPTOPP_XLC_VERSION >= 130200) || \
+ (CRYPTOPP_GCC_VERSION >= 70000) || (CRYPTOPP_CLANG_VERSION >= 80000)
+# define CRYPTOPP_POWER9_AVAILABLE 1
+# endif
+#endif
+
+#if !defined(CRYPTOPP_POWER8_AES_AVAILABLE) && !defined(CRYPTOPP_DISABLE_POWER8_AES) && defined(CRYPTOPP_POWER8_AVAILABLE)
+# if defined(__CRYPTO__) || defined(_ARCH_PWR8) || (CRYPTOPP_XLC_VERSION >= 130000) || \
+ (CRYPTOPP_GCC_VERSION >= 40800) || (CRYPTOPP_CLANG_VERSION >= 70000)
+//# define CRYPTOPP_POWER8_CRC_AVAILABLE 1
+# define CRYPTOPP_POWER8_AES_AVAILABLE 1
+# define CRYPTOPP_POWER8_VMULL_AVAILABLE 1
+# define CRYPTOPP_POWER8_SHA_AVAILABLE 1
+# endif
+#endif
+
+#endif // PPC32, PPC64
+
+#endif // CRYPTOPP_CONFIG_ASM_H
diff --git a/config_cpu.h b/config_cpu.h
new file mode 100644
index 00000000..00005862
--- /dev/null
+++ b/config_cpu.h
@@ -0,0 +1,100 @@
+// config_cpu.h - written and placed in public domain by Jeffrey Walton
+// the bits that make up this source file are from the
+// library's monolithic config.h.
+
+/// \file config_cpu.h
+/// \brief Library configuration file
+/// \details <tt>config.h</tt> was split into components in May 2019 to better
+/// integrate with Autoconf and its feature tests. The splitting occured so
+/// users could continue to include <tt>config.h</tt> while allowing Autoconf
+/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
+/// its feature tests.
+/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
+/// <A HREF="https://sourceforge.net/p/predef/wiki/Architectures/">Sourceforge
+/// Pre-defined Compiler Macros</A>
+/// \since Crypto++ 8.3
+
+#ifndef CRYPTOPP_CONFIG_CPU_H
+#define CRYPTOPP_CONFIG_CPU_H
+
+#include "config_ver.h"
+
+#if (defined(__ILP32__) || defined(_ILP32)) && defined(__x86_64__)
+ #define CRYPTOPP_BOOL_X32 1
+#elif (defined(_M_X64) || defined(__x86_64__))
+ #define CRYPTOPP_BOOL_X64 1
+#elif (defined(_M_IX86) || defined(__i386__) || defined(__i386) || defined(_X86_) || defined(__I86__) || defined(__INTEL__))
+ #define CRYPTOPP_BOOL_X86 1
+#endif
+
+// Microsoft added ARM64 define December 2017.
+#if defined(__arm64__) || defined(__aarch32__) || defined(__aarch64__) || defined(_M_ARM64)
+ #define CRYPTOPP_BOOL_ARMV8 1
+#elif defined(__arm__) || defined(_M_ARM)
+ #define CRYPTOPP_BOOL_ARM32 1
+#endif
+
+// And PowerPC.
+#if defined(__ppc64__) || defined(__powerpc64__) || defined(__PPC64__) || defined(_ARCH_PPC64)
+ #define CRYPTOPP_BOOL_PPC64 1
+#elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) || defined(_ARCH_PPC)
+ #define CRYPTOPP_BOOL_PPC32 1
+#endif
+
+// And MIPS. TODO: finish these defines
+#if defined(__mips64__)
+ #define CRYPTOPP_BOOL_MIPS64 1
+#elif defined(__mips__)
+ #define CRYPTOPP_BOOL_MIPS32 1
+#endif
+
+// And SPARC.
+#if defined(__sparc64__) || defined(__sparc64) || defined(__sparcv9) || defined(__sparc_v9__)
+ #define CRYPTOPP_BOOL_SPARC64 1
+#elif defined(__sparc__) || defined(__sparc) || defined(__sparcv8) || defined(__sparc_v8__)
+ #define CRYPTOPP_BOOL_SPARC32 1
+#endif
+
+// This should be a lower bound on the L1 cache line size.
+// It's used for defense against timing attacks.
+#ifndef CRYPTOPP_L1_CACHE_LINE_SIZE
+ #if defined(CRYPTOPP_BOOL_X32) || defined(CRYPTOPP_BOOL_X64) || defined(CRYPTOPP_BOOL_ARMV8) || \
+ defined(CRYPTOPP_BOOL_PPC64) || defined(CRYPTOPP_BOOL_MIPS64) || defined(CRYPTOPP_BOOL_SPARC64)
+ #define CRYPTOPP_L1_CACHE_LINE_SIZE 64
+ #else
+ // L1 cache line size is 32 on Pentium III and earlier
+ #define CRYPTOPP_L1_CACHE_LINE_SIZE 32
+ #endif
+#endif
+
+// The section attribute attempts to initialize CPU flags to avoid Valgrind findings above -O1
+#if ((defined(__MACH__) && defined(__APPLE__)) && ((CRYPTOPP_LLVM_CLANG_VERSION >= 30600) || (CRYPTOPP_APPLE_CLANG_VERSION >= 70100) || (CRYPTOPP_GCC_VERSION >= 40300)))
+ #define CRYPTOPP_SECTION_INIT __attribute__((section ("__DATA,__data")))
+#elif (defined(__ELF__) && (CRYPTOPP_GCC_VERSION >= 40300))
+ #define CRYPTOPP_SECTION_INIT __attribute__((section ("nocommon")))
+#elif defined(__ELF__) && (defined(__xlC__) || defined(__ibmxl__))
+ #define CRYPTOPP_SECTION_INIT __attribute__((section ("nocommon")))
+#else
+ #define CRYPTOPP_SECTION_INIT
+#endif
+
+// How to disable CPU feature probing. We determine machine
+// capabilities by performing an os/platform *query* first,
+// like getauxv(). If the *query* fails, we move onto a
+// cpu *probe*. The cpu *probe* tries to exeute an instruction
+// and then catches a SIGILL on Linux or the exception
+// EXCEPTION_ILLEGAL_INSTRUCTION on Windows. Some OSes
+// fail to hangle a SIGILL gracefully, like Apple OSes. Apple
+// machines corrupt memory and variables around the probe.
+#if defined(__APPLE__)
+ #define CRYPTOPP_NO_CPU_FEATURE_PROBES 1
+#endif
+
+// Flavor of inline assembly language
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+ #define CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY 1
+#else
+ #define CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY 1
+#endif
+
+#endif
diff --git a/config_cxx.h b/config_cxx.h
new file mode 100644
index 00000000..b687dcfd
--- /dev/null
+++ b/config_cxx.h
@@ -0,0 +1,190 @@
+// config_cxx.h - written and placed in public domain by Jeffrey Walton
+// the bits that make up this source file are from the
+// library's monolithic config.h.
+
+/// \file config_cxx.h
+/// \brief Library configuration file
+/// \details <tt>config.h</tt> was split into components in May 2019 to better
+/// integrate with Autoconf and its feature tests. The splitting occured so
+/// users could continue to include <tt>config.h</tt> while allowing Autoconf
+/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
+/// its feature tests.
+/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
+/// \since Crypto++ 8.3
+
+// Visual Studio began at VS2010, http://msdn.microsoft.com/en-us/library/hh567368%28v=vs.110%29.aspx
+// and https://docs.microsoft.com/en-us/cpp/visual-cpp-language-conformance
+// Intel, http://software.intel.com/en-us/articles/c0x-features-supported-by-intel-c-compiler
+// GCC, http://gcc.gnu.org/projects/cxx0x.html
+// Clang, http://clang.llvm.org/cxx_status.html
+
+#ifndef CRYPTOPP_CONFIG_CXX_H
+#define CRYPTOPP_CONFIG_CXX_H
+
+#include "config_os.h"
+#include "config_cpu.h"
+#include "config_ver.h"
+
+// Ancient Crypto++ define, dating back to C++98 and C++03.
+#ifndef CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION
+# define CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE 1
+#endif
+
+// Compatibility with non-clang compilers.
+#ifndef __has_feature
+# define __has_feature(x) 0
+#endif
+
+// C++11 macro version, https://stackoverflow.com/q/7223991/608639
+#if !defined(CRYPTOPP_NO_CXX11)
+# if ((_MSC_VER >= 1600) || (__cplusplus >= 201103L)) && !defined(_STLPORT_VERSION)
+# define CRYPTOPP_CXX11 1
+# endif
+#endif
+
+// Hack ahead. Apple's standard library does not have C++'s unique_ptr in C++11.
+// We can't test for unique_ptr directly because some of the non-Apple Clangs
+// on OS X fail the same way. However, modern standard libraries have
+// <forward_list>, so we test for it instead. Thanks to Jonathan Wakely for
+// devising the clever test for modern/ancient versions. TODO: test under
+// Xcode 3, where g++ is really g++.
+#if defined(__APPLE__) && defined(__clang__)
+# if !(defined(__has_include) && __has_include(<forward_list>))
+# undef CRYPTOPP_CXX11
+# endif
+#endif
+
+// C++17 macro version, https://stackoverflow.com/q/38456127/608639
+#if defined(CRYPTOPP_CXX11) && !defined(CRYPTOPP_NO_CXX17)
+# if ((_MSC_VER >= 1900) || (__cplusplus >= 201703L)) && !defined(_STLPORT_VERSION)
+# define CRYPTOPP_CXX17 1
+# endif
+#endif
+
+// ***************** C++11 and above ********************
+
+#if defined(CRYPTOPP_CXX11)
+
+// atomics: MS at VS2012 (17.00); GCC at 4.4; Clang at 3.1/3.2; Intel 13.0; SunCC 5.14.
+#if (CRYPTOPP_MSC_VERSION >= 1700) || __has_feature(cxx_atomic) || \
+ (__INTEL_COMPILER >= 1300) || (CRYPTOPP_GCC_VERSION >= 40400) || (__SUNPRO_CC >= 0x5140)
+# define CRYPTOPP_CXX11_ATOMICS 1
+#endif // atomics
+
+// synchronization: MS at VS2012 (17.00); GCC at 4.4; Clang at 3.3; Xcode 5.0; Intel 12.0; SunCC 5.13.
+// TODO: verify Clang and Intel versions; find __has_feature(x) extension for Clang
+#if (CRYPTOPP_MSC_VERSION >= 1700) || (CRYPTOPP_LLVM_CLANG_VERSION >= 30300) || \
+ (CRYPTOPP_APPLE_CLANG_VERSION >= 50000) || (__INTEL_COMPILER >= 1200) || \
+ (CRYPTOPP_GCC_VERSION >= 40400) || (__SUNPRO_CC >= 0x5130)
+// Hack ahead. New GCC compilers like GCC 6 on AIX 7.0 or earlier as well as original MinGW
+// don't have the synchronization gear. However, Wakely's test used for Apple does not work
+// on the GCC/AIX combination. Another twist is we need other stuff from C++11,
+// like no-except destructors. Dumping preprocessors shows the following may
+// apply: http://stackoverflow.com/q/14191566/608639.
+# include <cstddef>
+# if !defined(__GLIBCXX__) || defined(_GLIBCXX_HAS_GTHREADS)
+# define CRYPTOPP_CXX11_SYNCHRONIZATION 1
+# endif
+#endif // synchronization
+
+// Dynamic Initialization and Destruction with Concurrency ("Magic Statics")
+// MS at VS2015 with Vista (19.00); GCC at 4.3; LLVM Clang at 2.9; Apple Clang at 4.0; Intel 11.1; SunCC 5.13.
+// Microsoft's implementation only works for Vista and above, so its further
+// limited. http://connect.microsoft.com/VisualStudio/feedback/details/1789709
+#if (CRYPTOPP_MSC_VERSION >= 1900) && ((WINVER >= 0x0600) || (_WIN32_WINNT >= 0x0600)) || \
+ (CRYPTOPP_LLVM_CLANG_VERSION >= 20900) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40000) || \
+ (__INTEL_COMPILER >= 1110) || (CRYPTOPP_GCC_VERSION >= 40300) || (__SUNPRO_CC >= 0x5130)
+# define CRYPTOPP_CXX11_DYNAMIC_INIT 1
+#endif // Dynamic Initialization compilers
+
+// alignof/alignas: MS at VS2015 (19.00); GCC at 4.8; Clang at 3.0; Intel 15.0; SunCC 5.13.
+#if (CRYPTOPP_MSC_VERSION >= 1900) || __has_feature(cxx_alignas) || \
+ (__INTEL_COMPILER >= 1500) || (CRYPTOPP_GCC_VERSION >= 40800) || (__SUNPRO_CC >= 0x5130)
+# define CRYPTOPP_CXX11_ALIGNAS 1
+#endif // alignas
+
+// alignof: MS at VS2015 (19.00); GCC at 4.5; Clang at 2.9; Intel 15.0; SunCC 5.13.
+#if (CRYPTOPP_MSC_VERSION >= 1900) || __has_feature(cxx_alignof) || \
+ (__INTEL_COMPILER >= 1500) || (CRYPTOPP_GCC_VERSION >= 40500) || (__SUNPRO_CC >= 0x5130)
+# define CRYPTOPP_CXX11_ALIGNOF 1
+#endif // alignof
+
+// lambdas: MS at VS2012 (17.00); GCC at 4.9; Clang at 3.3; Intel 12.0; SunCC 5.14.
+#if (CRYPTOPP_MSC_VERSION >= 1700) || __has_feature(cxx_lambdas) || \
+ (__INTEL_COMPILER >= 1200) || (CRYPTOPP_GCC_VERSION >= 40900) || (__SUNPRO_CC >= 0x5140)
+# define CRYPTOPP_CXX11_LAMBDA 1
+#endif // lambdas
+
+// noexcept: MS at VS2015 (19.00); GCC at 4.6; Clang at 3.0; Intel 14.0; SunCC 5.13.
+#if (CRYPTOPP_MSC_VERSION >= 1900) || __has_feature(cxx_noexcept) || \
+ (__INTEL_COMPILER >= 1400) || (CRYPTOPP_GCC_VERSION >= 40600) || (__SUNPRO_CC >= 0x5130)
+# define CRYPTOPP_CXX11_NOEXCEPT 1
+#endif // noexcept compilers
+
+// variadic templates: MS at VS2013 (18.00); GCC at 4.3; Clang at 2.9; Intel 12.1; SunCC 5.13.
+#if (CRYPTOPP_MSC_VERSION >= 1800) || __has_feature(cxx_variadic_templates) || \
+ (__INTEL_COMPILER >= 1210) || (CRYPTOPP_GCC_VERSION >= 40300) || (__SUNPRO_CC >= 0x5130)
+# define CRYPTOPP_CXX11_VARIADIC_TEMPLATES 1
+#endif // variadic templates
+
+// constexpr: MS at VS2015 (19.00); GCC at 4.6; Clang at 3.1; Intel 16.0; SunCC 5.13.
+// Intel has mis-supported the feature since at least ICPC 13.00
+#if (CRYPTOPP_MSC_VERSION >= 1900) || __has_feature(cxx_constexpr) || \
+ (__INTEL_COMPILER >= 1600) || (CRYPTOPP_GCC_VERSION >= 40600) || (__SUNPRO_CC >= 0x5130)
+# define CRYPTOPP_CXX11_CONSTEXPR 1
+#endif // constexpr compilers
+
+// strong typed enums: MS at VS2012 (17.00); GCC at 4.4; Clang at 3.3; Intel 14.0; SunCC 5.12.
+// Mircorosft and Intel had partial support earlier, but we require full support.
+#if (CRYPTOPP_MSC_VERSION >= 1700) || __has_feature(cxx_strong_enums) || \
+ (__INTEL_COMPILER >= 1400) || (CRYPTOPP_GCC_VERSION >= 40400) || (__SUNPRO_CC >= 0x5120)
+# define CRYPTOPP_CXX11_ENUM 1
+#endif // constexpr compilers
+
+// nullptr_t: MS at VS2010 (16.00); GCC at 4.6; Clang at 3.3; Intel 10.0; SunCC 5.13.
+#if (CRYPTOPP_MSC_VERSION >= 1600) || __has_feature(cxx_nullptr) || \
+ (__INTEL_COMPILER >= 1000) || (CRYPTOPP_GCC_VERSION >= 40600) || \
+ (__SUNPRO_CC >= 0x5130) || defined(__IBMCPP_NULLPTR)
+# define CRYPTOPP_CXX11_NULLPTR 1
+#endif // nullptr_t compilers
+
+#endif // CRYPTOPP_CXX11
+
+// ***************** C++17 and above ********************
+
+// C++17 is available
+#if defined(CRYPTOPP_CXX17)
+
+// C++17 uncaught_exceptions: MS at VS2015 (19.00); GCC at 6.0; Clang at 3.5; Intel 18.0.
+// Clang and __EXCEPTIONS see http://releases.llvm.org/3.6.0/tools/clang/docs/ReleaseNotes.html
+#if defined(__clang__)
+# if __EXCEPTIONS && __has_feature(cxx_exceptions)
+# if __cpp_lib_uncaught_exceptions
+# define CRYPTOPP_CXX17_EXCEPTIONS 1
+# endif
+# endif
+#elif (CRYPTOPP_MSC_VERSION >= 1900) || (__INTEL_COMPILER >= 1800) || \
+ (CRYPTOPP_GCC_VERSION >= 60000) || (__cpp_lib_uncaught_exceptions)
+# define CRYPTOPP_CXX17_EXCEPTIONS 1
+#endif // uncaught_exceptions compilers
+
+#endif // CRYPTOPP_CXX17
+
+// ***************** C++ fixups ********************
+
+#if defined(CRYPTOPP_CXX11_NOEXCEPT)
+# define CRYPTOPP_THROW noexcept(false)
+# define CRYPTOPP_NO_THROW noexcept(true)
+#else
+# define CRYPTOPP_THROW
+# define CRYPTOPP_NO_THROW
+#endif // CRYPTOPP_CXX11_NOEXCEPT
+
+// Hack... C++11 nullptr_t type safety and analysis
+#if defined(CRYPTOPP_CXX11_NULLPTR) && !defined(NULLPTR)
+# define NULLPTR nullptr
+#elif !defined(NULLPTR)
+# define NULLPTR NULL
+#endif // CRYPTOPP_CXX11_NULLPTR
+
+#endif // CRYPTOPP_CONFIG_CXX_H
diff --git a/config_dll.h b/config_dll.h
new file mode 100644
index 00000000..73676ea0
--- /dev/null
+++ b/config_dll.h
@@ -0,0 +1,77 @@
+// config_dll.h - written and placed in public domain by Jeffrey Walton
+// the bits that make up this source file are from the
+// library's monolithic config.h.
+
+/// \file config_dll.h
+/// \brief Library configuration file
+/// \details <tt>config.h</tt> was split into components in May 2019 to better
+/// integrate with Autoconf and its feature tests. The splitting occured so
+/// users could continue to include <tt>config.h</tt> while allowing Autoconf
+/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
+/// its feature tests.
+/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
+/// \since Crypto++ 8.3
+
+#ifndef CRYPTOPP_CONFIG_DLL_H
+#define CRYPTOPP_CONFIG_DLL_H
+
+#include "config_os.h"
+
+#if !defined(CRYPTOPP_DOXYGEN_PROCESSING)
+
+#if defined(CRYPTOPP_WIN32_AVAILABLE)
+
+#ifdef CRYPTOPP_EXPORTS
+# define CRYPTOPP_IS_DLL
+# define CRYPTOPP_DLL __declspec(dllexport)
+#elif defined(CRYPTOPP_IMPORTS)
+# define CRYPTOPP_IS_DLL
+# define CRYPTOPP_DLL __declspec(dllimport)
+#else
+# define CRYPTOPP_DLL
+#endif
+
+// C++ makes const internal linkage
+#define CRYPTOPP_TABLE extern
+#define CRYPTOPP_API __cdecl
+
+#else // not CRYPTOPP_WIN32_AVAILABLE
+
+// C++ makes const internal linkage
+#define CRYPTOPP_TABLE extern
+#define CRYPTOPP_DLL
+#define CRYPTOPP_API
+
+#endif // CRYPTOPP_WIN32_AVAILABLE
+
+#if defined(__MWERKS__)
+# define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern class CRYPTOPP_DLL
+#elif defined(__BORLANDC__) || defined(__SUNPRO_CC)
+# define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL
+#else
+# define CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS extern template class CRYPTOPP_DLL
+#endif
+
+#if defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) && !defined(CRYPTOPP_IMPORTS)
+# define CRYPTOPP_DLL_TEMPLATE_CLASS template class CRYPTOPP_DLL
+#else
+# define CRYPTOPP_DLL_TEMPLATE_CLASS CRYPTOPP_EXTERN_DLL_TEMPLATE_CLASS
+#endif
+
+#if defined(__MWERKS__)
+# define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern class
+#elif defined(__BORLANDC__) || defined(__SUNPRO_CC)
+# define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS template class
+#else
+# define CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS extern template class
+#endif
+
+#if defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) && !defined(CRYPTOPP_EXPORTS)
+# define CRYPTOPP_STATIC_TEMPLATE_CLASS template class
+#else
+# define CRYPTOPP_STATIC_TEMPLATE_CLASS CRYPTOPP_EXTERN_STATIC_TEMPLATE_CLASS
+#endif
+
+#endif // CRYPTOPP_DOXYGEN_PROCESSING
+
+#endif // CRYPTOPP_CONFIG_DLL_H
diff --git a/config_int.h b/config_int.h
new file mode 100644
index 00000000..205deb7a
--- /dev/null
+++ b/config_int.h
@@ -0,0 +1,103 @@
+// config_int.h - written and placed in public domain by Jeffrey Walton
+// the bits that make up this source file are from the
+// library's monolithic config.h.
+
+/// \file config_int.h
+/// \brief Library configuration file
+/// \details <tt>config.h</tt> was split into components in May 2019 to better
+/// integrate with Autoconf and its feature tests. The splitting occured so
+/// users could continue to include <tt>config.h</tt> while allowing Autoconf
+/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
+/// its feature tests.
+/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
+/// \since Crypto++ 8.3
+
+#ifndef CRYPTOPP_CONFIG_INT_H
+#define CRYPTOPP_CONFIG_INT_H
+
+#include "config_ns.h"
+#include "config_ver.h"
+
+// Originally in global namespace to avoid ambiguity with other byte typedefs.
+// Moved to Crypto++ namespace due to C++17, std::byte and potential compile
+// problems. Also see http://www.cryptopp.com/wiki/std::byte and
+// http://github.com/weidai11/cryptopp/issues/442.
+// typedef unsigned char byte;
+#define CRYPTOPP_NO_GLOBAL_BYTE 1
+
+NAMESPACE_BEGIN(CryptoPP)
+
+// Signed words added at Issue 609 for early versions of and Visual Studio and
+// the NaCl gear. Also see https://github.com/weidai11/cryptopp/issues/609.
+
+typedef unsigned char byte;
+typedef unsigned short word16;
+typedef unsigned int word32;
+
+typedef signed char sbyte;
+typedef signed short sword16;
+typedef signed int sword32;
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+ typedef signed __int64 sword64;
+ typedef unsigned __int64 word64;
+ #define SW64LIT(x) x##i64
+ #define W64LIT(x) x##ui64
+#elif (_LP64 || __LP64__)
+ typedef signed long sword64;
+ typedef unsigned long word64;
+ #define SW64LIT(x) x##L
+ #define W64LIT(x) x##UL
+#else
+ typedef signed long long sword64;
+ typedef unsigned long long word64;
+ #define SW64LIT(x) x##LL
+ #define W64LIT(x) x##ULL
+#endif
+
+// define large word type, used for file offsets and such
+typedef word64 lword;
+const lword LWORD_MAX = W64LIT(0xffffffffffffffff);
+
+// define hword, word, and dword. these are used for multiprecision integer arithmetic
+// Intel compiler won't have _umul128 until version 10.0. See http://softwarecommunity.intel.com/isn/Community/en-US/forums/thread/30231625.aspx
+#if (defined(_MSC_VER) && (!defined(__INTEL_COMPILER) || __INTEL_COMPILER >= 1000) && (defined(_M_X64) || defined(_M_IA64))) || (defined(__DECCXX) && defined(__alpha__)) || (defined(__INTEL_COMPILER) && defined(__x86_64__)) || (defined(__SUNPRO_CC) && defined(__x86_64__))
+ typedef word32 hword;
+ typedef word64 word;
+#else
+ #define CRYPTOPP_NATIVE_DWORD_AVAILABLE 1
+ #if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || defined(__x86_64__) || defined(__mips64) || defined(__sparc64__)
+ #if ((CRYPTOPP_GCC_VERSION >= 30400) || (CRYPTOPP_LLVM_CLANG_VERSION >= 30000) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40300)) && (__SIZEOF_INT128__ >= 16)
+ // GCC 4.0.1 on MacOS X is missing __umodti3 and __udivti3
+ // GCC 4.8.3 and bad uint128_t ops on PPC64/POWER7 (Issue 421)
+ // mode(TI) division broken on amd64 with GCC earlier than GCC 3.4
+ typedef word32 hword;
+ typedef word64 word;
+ typedef __uint128_t dword;
+ typedef __uint128_t word128;
+ #define CRYPTOPP_WORD128_AVAILABLE 1
+ #else
+ // if we're here, it means we're on a 64-bit CPU but we don't have a way to obtain 128-bit multiplication results
+ typedef word16 hword;
+ typedef word32 word;
+ typedef word64 dword;
+ #endif
+ #else
+ // being here means the native register size is probably 32 bits or less
+ #define CRYPTOPP_BOOL_SLOW_WORD64 1
+ typedef word16 hword;
+ typedef word32 word;
+ typedef word64 dword;
+ #endif
+#endif
+
+#ifndef CRYPTOPP_BOOL_SLOW_WORD64
+# define CRYPTOPP_BOOL_SLOW_WORD64 0
+#endif
+
+const unsigned int WORD_SIZE = sizeof(word);
+const unsigned int WORD_BITS = WORD_SIZE * 8;
+
+NAMESPACE_END
+
+#endif // CRYPTOPP_CONFIG_INT_H
diff --git a/config_misc.h b/config_misc.h
new file mode 100644
index 00000000..a6832968
--- /dev/null
+++ b/config_misc.h
@@ -0,0 +1,180 @@
+// config_misc.h - written and placed in public domain by Jeffrey Walton
+// the bits that make up this source file are from the
+// library's monolithic config.h.
+
+/// \file config_misc.h
+/// \brief Library configuration file
+/// \details <tt>config.h</tt> was split into components in May 2019 to better
+/// integrate with Autoconf and its feature tests. The splitting occured so
+/// users could continue to include <tt>config.h</tt> while allowing Autoconf
+/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
+/// its feature tests.
+/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
+/// \since Crypto++ 8.3
+
+#ifndef CRYPTOPP_CONFIG_MISC_H
+#define CRYPTOPP_CONFIG_MISC_H
+
+#include "config_asm.h"
+#include "config_cxx.h"
+#include "config_os.h"
+#include "config_ver.h"
+
+// Define this if running on a big-endian CPU
+// big endian will be assumed if CRYPTOPP_LITTLE_ENDIAN is not non-0
+#if !defined(CRYPTOPP_LITTLE_ENDIAN) && !defined(CRYPTOPP_BIG_ENDIAN) && (defined(__BIG_ENDIAN__) || (defined(__s390__) || defined(__s390x__) || defined(__zarch__)) || (defined(__m68k__) || defined(__MC68K__)) || defined(__sparc) || defined(__sparc__) || defined(__hppa__) || defined(__MIPSEB__) || defined(__ARMEB__) || (defined(__MWERKS__) && !defined(__INTEL__)))
+# define CRYPTOPP_BIG_ENDIAN 1
+#endif
+
+// Define this if running on a little-endian CPU
+// big endian will be assumed if CRYPTOPP_LITTLE_ENDIAN is not non-0
+#if !defined(CRYPTOPP_BIG_ENDIAN) && !defined(CRYPTOPP_LITTLE_ENDIAN)
+# define CRYPTOPP_LITTLE_ENDIAN 1
+#endif
+
+// Define this if you want to set a prefix for TestData/ and TestVectors/
+// Be sure to add the trailing slash since its simple concatenation.
+// After https://github.com/weidai11/cryptopp/issues/760 the library
+// should find the test vectors and data without much effort. It
+// will search in "./" and "$ORIGIN/../share/cryptopp" automatically.
+#ifndef CRYPTOPP_DATA_DIR
+# define CRYPTOPP_DATA_DIR ""
+#endif
+
+// Define this to disable the test suite from searching for test
+// vectors and data in "./" and "$ORIGIN/../share/cryptopp". The
+// library will still search in CRYPTOPP_DATA_DIR, regardless.
+// Some distros may want to disable this feature. Also see
+// https://github.com/weidai11/cryptopp/issues/760
+// #ifndef CRYPTOPP_DISABLE_DATA_DIR_SEARCH
+// # define CRYPTOPP_DISABLE_DATA_DIR_SEARCH
+// #endif
+
+// Define this if you want or need the library's memcpy_s and memmove_s.
+// See http://github.com/weidai11/cryptopp/issues/28.
+// #if !defined(CRYPTOPP_WANT_SECURE_LIB)
+// # define CRYPTOPP_WANT_SECURE_LIB
+// #endif
+
+// Define this if ARMv8 shifts are slow. ARM Cortex-A53 and Cortex-A57 shift
+// operation perform poorly, so NEON and ASIMD code that relies on shifts
+// or rotates often performs worse than C/C++ code. Also see
+// http://github.com/weidai11/cryptopp/issues/367.
+#define CRYPTOPP_SLOW_ARMV8_SHIFT 1
+
+// CRYPTOPP_DEBUG enables the library's CRYPTOPP_ASSERT. CRYPTOPP_ASSERT
+// raises a SIGTRAP (Unix) or calls DebugBreak() (Windows). CRYPTOPP_ASSERT
+// is only in effect when CRYPTOPP_DEBUG, DEBUG or _DEBUG is defined. Unlike
+// Posix assert, CRYPTOPP_ASSERT is not affected by NDEBUG (or failure to
+// define it).
+// Also see http://github.com/weidai11/cryptopp/issues/277, CVE-2016-7420
+#if (defined(DEBUG) || defined(_DEBUG)) && !defined(CRYPTOPP_DEBUG)
+# define CRYPTOPP_DEBUG 1
+#endif
+
+// File system code to use when creating GZIP archive.
+// http://www.gzip.org/format.txt
+#if !defined(GZIP_OS_CODE)
+# if defined(__macintosh__)
+# define GZIP_OS_CODE 7
+# elif defined(__unix__) || defined(__linux__)
+# define GZIP_OS_CODE 3
+# else
+# define GZIP_OS_CODE 0
+# endif
+#endif
+
+// Try this if your CPU has 256K internal cache or a slow multiply instruction
+// and you want a (possibly) faster IDEA implementation using log tables
+// #define IDEA_LARGECACHE
+
+// Define this if, for the linear congruential RNG, you want to use
+// the original constants as specified in S.K. Park and K.W. Miller's
+// CACM paper.
+// #define LCRNG_ORIGINAL_NUMBERS
+
+// Define this if you want Integer's operator<< to honor std::showbase (and
+// std::noshowbase). If defined, Integer will use a suffix of 'b', 'o', 'h'
+// or '.' (the last for decimal) when std::showbase is in effect. If
+// std::noshowbase is set, then the suffix is not added to the Integer. If
+// not defined, existing behavior is preserved and Integer will use a suffix
+// of 'b', 'o', 'h' or '.' (the last for decimal).
+// #define CRYPTOPP_USE_STD_SHOWBASE
+
+// Define this if you want to decouple AlgorithmParameters and Integer
+// The decoupling should make it easier for the linker to remove Integer
+// related code for those who do not need Integer, and avoid a potential
+// race during AssignIntToInteger pointer initialization. Also
+// see http://github.com/weidai11/cryptopp/issues/389.
+// #define CRYPTOPP_NO_ASSIGN_TO_INTEGER
+
+// 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_LLVM_CLANG_VERSION >= 10700) || \
+ (CRYPTOPP_APPLE_CLANG_VERSION >= 20000)
+ #define CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE 1
+#endif
+
+// Portable way to suppress warnings.
+// Moved from misc.h due to circular depenedencies.
+#ifndef CRYPTOPP_UNUSED
+ #define CRYPTOPP_UNUSED(x) ((void)(x))
+#endif
+
+// how to disable inlining
+#if defined(_MSC_VER)
+# define CRYPTOPP_NOINLINE_DOTDOTDOT
+# define CRYPTOPP_NOINLINE __declspec(noinline)
+#elif defined(__xlc__) || defined(__xlC__) || defined(__ibmxl__)
+# define CRYPTOPP_NOINLINE_DOTDOTDOT ...
+# define CRYPTOPP_NOINLINE __attribute__((noinline))
+#elif defined(__GNUC__)
+# define CRYPTOPP_NOINLINE_DOTDOTDOT
+# define CRYPTOPP_NOINLINE __attribute__((noinline))
+#else
+# define CRYPTOPP_NOINLINE_DOTDOTDOT ...
+# define CRYPTOPP_NOINLINE
+#endif
+
+// http://stackoverflow.com/a/13867690/608639
+#if defined(CRYPTOPP_CXX11_CONSTEXPR)
+# define CRYPTOPP_STATIC_CONSTEXPR static constexpr
+# define CRYPTOPP_CONSTEXPR constexpr
+#else
+# define CRYPTOPP_STATIC_CONSTEXPR static
+# define CRYPTOPP_CONSTEXPR
+#endif // CRYPTOPP_CXX11_CONSTEXPR
+
+#if defined(CRYPTOPP_DOXYGEN_PROCESSING)
+# define CRYPTOPP_CONSTANT(x) static const int x;
+#elif defined(CRYPTOPP_CXX11_ENUM)
+# define CRYPTOPP_CONSTANT(x) enum : int { x };
+#elif defined(CRYPTOPP_CXX11_CONSTEXPR)
+# define CRYPTOPP_CONSTANT(x) constexpr static int x;
+#else
+# define CRYPTOPP_CONSTANT(x) static const int x;
+#endif
+
+// Warnings
+#ifdef _MSC_VER
+ // 4127: conditional expression is constant
+ // 4512: assignment operator not generated
+ // 4661: no suitable definition provided for explicit template instantiation request
+ // 4910: '__declspec(dllexport)' and 'extern' are incompatible on an explicit instantiation
+# pragma warning(disable: 4127 4512 4661 4910)
+ // Security related, possible defects
+ // http://blogs.msdn.com/b/vcblog/archive/2010/12/14/off-by-default-compiler-warnings-in-visual-c.aspx
+# pragma warning(once: 4191 4242 4263 4264 4266 4302 4826 4905 4906 4928)
+#endif
+
+#ifdef __BORLANDC__
+// 8037: non-const function called for const object. needed to work around BCB2006 bug
+# pragma warn -8037
+#endif
+
+// [GCC Bug 53431] "C++ preprocessor ignores #pragma GCC diagnostic". Clang honors it.
+#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
+# pragma GCC diagnostic ignored "-Wunknown-pragmas"
+# pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+#endif // CRYPTOPP_CONFIG_MISC_H
diff --git a/config_ns.h b/config_ns.h
new file mode 100644
index 00000000..bf91c2fb
--- /dev/null
+++ b/config_ns.h
@@ -0,0 +1,68 @@
+// config_ns.h - written and placed in public domain by Jeffrey Walton
+// the bits that make up this source file are from the
+// library's monolithic config.h.
+
+/// \file config_ns.h
+/// \brief Library configuration file
+/// \details <tt>config.h</tt> was split into components in May 2019 to better
+/// integrate with Autoconf and its feature tests. The splitting occured so
+/// users could continue to include <tt>config.h</tt> while allowing Autoconf
+/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
+/// its feature tests.
+/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
+/// \since Crypto++ 8.3
+
+#ifndef CRYPTOPP_CONFIG_NAMESPACE_H
+#define CRYPTOPP_CONFIG_NAMESPACE_H
+
+// namespace support is now required
+#ifdef NO_NAMESPACE
+# error namespace support is now required
+#endif
+
+#ifdef CRYPTOPP_DOXYGEN_PROCESSING
+
+/// \namespace CryptoPP
+/// \brief Crypto++ library namespace
+/// \details Nearly all classes are located in the CryptoPP namespace. Within
+/// the namespace, there are two additional namespaces.
+/// <ul>
+/// <li>Name - namespace for names used with NameValuePairs and documented
+/// in argnames.h
+/// <li>NaCl - namespace for NaCl test functions like crypto_box,
+/// crypto_box_open, crypto_sign, and crypto_sign_open
+/// <li>Donna - namespace for curve25519 library operations. The name was
+/// selected due to use of Langley and Moon's curve25519-donna.
+/// <li>Test - namespace for testing and benchmarks classes
+/// <li>Weak - namespace for weak and wounded algorithms, like ARC4, MD5
+/// and Pananma
+/// </ul>
+namespace CryptoPP { }
+
+// Bring in the symbols found in the weak namespace; and fold Weak1 into Weak
+#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
+#define Weak1 Weak
+// Avoid putting "CryptoPP::" in front of everything in Doxygen output
+#define CryptoPP
+#define NAMESPACE_BEGIN(x)
+#define NAMESPACE_END
+// Get Doxygen to generate better documentation for these typedefs
+#define DOCUMENTED_TYPEDEF(x, y) class y : public x {};
+// Make "protected" "private" so the functions and members are not documented
+#define protected private
+
+#else
+// Not Doxygen
+#define NAMESPACE_BEGIN(x) namespace x {
+#define NAMESPACE_END }
+#define DOCUMENTED_TYPEDEF(x, y) typedef x y;
+
+#endif // CRYPTOPP_DOXYGEN_PROCESSING
+
+#define ANONYMOUS_NAMESPACE_BEGIN namespace {
+#define ANONYMOUS_NAMESPACE_END }
+#define USING_NAMESPACE(x) using namespace x;
+#define DOCUMENTED_NAMESPACE_BEGIN(x) namespace x {
+#define DOCUMENTED_NAMESPACE_END }
+
+#endif // CRYPTOPP_CONFIG_NAMESPACE_H
diff --git a/config_os.h b/config_os.h
new file mode 100644
index 00000000..87b0a52a
--- /dev/null
+++ b/config_os.h
@@ -0,0 +1,152 @@
+// config_os.h - written and placed in public domain by Jeffrey Walton
+// the bits that make up this source file are from the
+// library's monolithic config.h.
+
+/// \file config_os.h
+/// \brief Library configuration file
+/// \details <tt>config.h</tt> was split into components in May 2019 to better
+/// integrate with Autoconf and its feature tests. The splitting occured so
+/// users could continue to include <tt>config.h</tt> while allowing Autoconf
+/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
+/// its feature tests.
+/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
+/// \since Crypto++ 8.3
+
+#ifndef CRYPTOPP_CONFIG_OS_H
+#define CRYPTOPP_CONFIG_OS_H
+
+#include "config_ver.h"
+
+// Windows platform
+#if defined(_WIN32) || defined(_WIN64) || defined(__CYGWIN__)
+#define CRYPTOPP_WIN32_AVAILABLE
+#endif
+
+// Unix and Linux platforms
+#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__sun)
+#define CRYPTOPP_UNIX_AVAILABLE
+#endif
+
+// BSD platforms
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#define CRYPTOPP_BSD_AVAILABLE
+#endif
+
+// Microsoft compilers
+#if defined(_MSC_VER) || defined(__fastcall)
+ #define CRYPTOPP_FASTCALL __fastcall
+#else
+ #define CRYPTOPP_FASTCALL
+#endif
+
+// Microsoft compilers
+#if defined(_MSC_VER)
+ #define CRYPTOPP_NO_VTABLE __declspec(novtable)
+#else
+ #define CRYPTOPP_NO_VTABLE
+#endif
+
+// Define this if you want to disable all OS-dependent features,
+// such as sockets and OS-provided random number generators
+// #define NO_OS_DEPENDENCE
+
+// Define this to use features provided by Microsoft's CryptoAPI.
+// Currently the only feature used is Windows random number generation.
+// This macro will be ignored if NO_OS_DEPENDENCE is defined.
+// #define USE_MS_CRYPTOAPI
+
+// Define this to use features provided by Microsoft's CryptoNG API.
+// CryptoNG API is available in Vista and above and its cross platform,
+// including desktop apps and store apps. Currently the only feature
+// used is Windows random number generation.
+// This macro will be ignored if NO_OS_DEPENDENCE is defined.
+// #define USE_MS_CNGAPI
+
+// If the user did not make a choice, then select CryptoNG if
+// targeting Windows 8 or above.
+#if !defined(USE_MS_CRYPTOAPI) && !defined(USE_MS_CNGAPI)
+# if !defined(_USING_V110_SDK71_) && ((WINVER >= 0x0602 /*_WIN32_WINNT_WIN8*/) || \
+ (_WIN32_WINNT >= 0x0602 /*_WIN32_WINNT_WIN8*/))
+# define USE_MS_CNGAPI
+# else
+# define USE_MS_CRYPTOAPI
+# endif
+#endif
+
+// Begin OS features, like init priorities and random numbers
+#ifndef NO_OS_DEPENDENCE
+
+// CRYPTOPP_INIT_PRIORITY attempts to manage initialization of C++ static objects.
+// Under GCC, the library uses init_priority attribute in the range
+// [CRYPTOPP_INIT_PRIORITY, CRYPTOPP_INIT_PRIORITY+100]. Under Windows,
+// CRYPTOPP_INIT_PRIORITY enlists "#pragma init_seg(lib)". The platforms
+// with gaps are Apple and Sun because they require linker scripts. Apple and
+// Sun will use the library's Singletons to initialize and acquire resources.
+// Also see http://cryptopp.com/wiki/Static_Initialization_Order_Fiasco
+#ifndef CRYPTOPP_INIT_PRIORITY
+# define CRYPTOPP_INIT_PRIORITY 250
+#endif
+
+// CRYPTOPP_USER_PRIORITY is for other libraries and user code that is using Crypto++
+// and managing C++ static object creation. It is guaranteed not to conflict with
+// values used by (or would be used by) the Crypto++ library.
+#ifndef CRYPTOPP_USER_PRIORITY
+# define CRYPTOPP_USER_PRIORITY (CRYPTOPP_INIT_PRIORITY+101)
+#endif
+
+// Most platforms allow us to specify when to create C++ objects. Apple and Sun do not.
+#if (CRYPTOPP_INIT_PRIORITY > 0) && !(defined(NO_OS_DEPENDENCE) || defined(__APPLE__) || defined(__sun__))
+# if (CRYPTOPP_GCC_VERSION >= 30000) || (CRYPTOPP_LLVM_CLANG_VERSION >= 20900) || (_INTEL_COMPILER >= 800)
+# define HAVE_GCC_INIT_PRIORITY 1
+# elif (CRYPTOPP_MSC_VERSION >= 1310)
+# define HAVE_MSC_INIT_PRIORITY 1
+# elif defined(__xlc__) || defined(__xlC__) || defined(__ibmxl__)
+# define HAVE_XLC_INIT_PRIORITY 1
+# endif
+#endif // CRYPTOPP_INIT_PRIORITY, NO_OS_DEPENDENCE, Apple, Sun
+
+#if defined(CRYPTOPP_WIN32_AVAILABLE) || defined(CRYPTOPP_UNIX_AVAILABLE)
+# define HIGHRES_TIMER_AVAILABLE
+#endif
+
+#ifdef CRYPTOPP_WIN32_AVAILABLE
+# if !defined(WINAPI_FAMILY)
+# define THREAD_TIMER_AVAILABLE
+# elif defined(WINAPI_FAMILY)
+# if (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP))
+# define THREAD_TIMER_AVAILABLE
+# endif
+# endif
+#endif
+
+#if defined(CRYPTOPP_UNIX_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING)
+# define NONBLOCKING_RNG_AVAILABLE
+# define BLOCKING_RNG_AVAILABLE
+# define OS_RNG_AVAILABLE
+#endif
+
+// Cygwin/Newlib requires _XOPEN_SOURCE=600
+#if defined(CRYPTOPP_UNIX_AVAILABLE)
+# define UNIX_SIGNALS_AVAILABLE 1
+#endif
+
+#ifdef CRYPTOPP_WIN32_AVAILABLE
+# if !defined(WINAPI_FAMILY)
+# define NONBLOCKING_RNG_AVAILABLE
+# define OS_RNG_AVAILABLE
+# elif defined(WINAPI_FAMILY)
+# if (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP))
+# define NONBLOCKING_RNG_AVAILABLE
+# define OS_RNG_AVAILABLE
+# elif !(WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP))
+# if ((WINVER >= 0x0A00 /*_WIN32_WINNT_WIN10*/) || (_WIN32_WINNT >= 0x0A00 /*_WIN32_WINNT_WIN10*/))
+# define NONBLOCKING_RNG_AVAILABLE
+# define OS_RNG_AVAILABLE
+# endif
+# endif
+# endif
+#endif
+
+#endif // NO_OS_DEPENDENCE
+
+#endif // CRYPTOPP_CONFIG_OS_H
diff --git a/config_ver.h b/config_ver.h
new file mode 100644
index 00000000..7369f5ef
--- /dev/null
+++ b/config_ver.h
@@ -0,0 +1,46 @@
+// config_ver.h - written and placed in public domain by Jeffrey Walton
+// the bits that make up this source file are from the
+// library's monolithic config.h.
+
+/// \file config_ver.h
+/// \brief Library configuration file
+/// \details <tt>config.h</tt> was split into components in May 2019 to better
+/// integrate with Autoconf and its feature tests. The splitting occured so
+/// users could continue to include <tt>config.h</tt> while allowing Autoconf
+/// to write new <tt>config_asm.h</tt> and new <tt>config_cxx.h</tt> using
+/// its feature tests.
+/// \sa <A HREF="https://github.com/weidai11/cryptopp/issues/835">Issue 835</A>
+/// \since Crypto++ 8.3
+
+#ifndef CRYPTOPP_CONFIG_VERSION_H
+#define CRYPTOPP_CONFIG_VERSION_H
+
+// Library version macro. Since this macro is in a header, it reflects
+// the version of the library the headers came from. It is not
+// necessarily the version of the library built as a shared object if
+// versions are inadvertently mixed and matched.
+#define CRYPTOPP_MAJOR 8
+#define CRYPTOPP_MINOR 3
+#define CRYPTOPP_REVISION 0
+#define CRYPTOPP_VERSION 830
+
+#ifdef __GNUC__
+# define CRYPTOPP_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#endif
+
+#if defined(__xlc__) || defined(__xlC__)
+# define CRYPTOPP_XLC_VERSION ((__xlC__ / 256) * 10000 + (__xlC__ % 256) * 100)
+#endif
+
+// 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_APPLE_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
+#elif defined(__clang__)
+# define CRYPTOPP_LLVM_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
+#endif
+
+#ifdef _MSC_VER
+# define CRYPTOPP_MSC_VERSION (_MSC_VER)
+#endif
+
+#endif // CRYPTOPP_CONFIG_VERSION_H
diff --git a/cpu.cpp b/cpu.cpp
index 34449d38..46f2019e 100644
--- a/cpu.cpp
+++ b/cpu.cpp
@@ -109,6 +109,8 @@ bool IsAppleMachineARMv8(unsigned int device, unsigned int version)
bool IsAppleMachineARMv84(unsigned int device, unsigned int version)
{
+ CRYPTOPP_UNUSED(device);
+ CRYPTOPP_UNUSED(version);
return false;
}
#endif // __APPLE__
diff --git a/cryptdll.vcxproj b/cryptdll.vcxproj
index 2a65a6b9..47454494 100644
--- a/cryptdll.vcxproj
+++ b/cryptdll.vcxproj
@@ -256,6 +256,16 @@
<ClInclude Include="channels.h" />
<ClInclude Include="cmac.h" />
<ClInclude Include="config.h" />
+ <ClInclude Include="config_align.h" />
+ <ClInclude Include="config_asm.h" />
+ <ClInclude Include="config_cpu.h" />
+ <ClInclude Include="config_cxx.h" />
+ <ClInclude Include="config_dll.h" />
+ <ClInclude Include="config_int.h" />
+ <ClInclude Include="config_misc.h" />
+ <ClInclude Include="config_ns.h" />
+ <ClInclude Include="config_os.h" />
+ <ClInclude Include="config_ver.h" />
<ClInclude Include="cpu.h" />
<ClInclude Include="cryptlib.h" />
<ClInclude Include="des.h" />
diff --git a/cryptdll.vcxproj.filters b/cryptdll.vcxproj.filters
index a4951a76..29ddb313 100644
--- a/cryptdll.vcxproj.filters
+++ b/cryptdll.vcxproj.filters
@@ -232,6 +232,36 @@
<ClInclude Include="config.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="config_align.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_asm.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_cpu.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_cxx.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_dll.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_int.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_misc.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_ns.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_os.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_ver.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="cpu.h">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/cryptlib.vcxproj b/cryptlib.vcxproj
index afaae0d4..4985c096 100644
--- a/cryptlib.vcxproj
+++ b/cryptlib.vcxproj
@@ -412,6 +412,16 @@
<ClInclude Include="channels.h" />
<ClInclude Include="cmac.h" />
<ClInclude Include="config.h" />
+ <ClInclude Include="config_align.h" />
+ <ClInclude Include="config_asm.h" />
+ <ClInclude Include="config_cpu.h" />
+ <ClInclude Include="config_cxx.h" />
+ <ClInclude Include="config_dll.h" />
+ <ClInclude Include="config_int.h" />
+ <ClInclude Include="config_misc.h" />
+ <ClInclude Include="config_ns.h" />
+ <ClInclude Include="config_os.h" />
+ <ClInclude Include="config_ver.h" />
<ClInclude Include="cpu.h" />
<ClInclude Include="crc.h" />
<ClInclude Include="cryptlib.h" />
diff --git a/cryptlib.vcxproj.filters b/cryptlib.vcxproj.filters
index f3a0db1a..de140e33 100644
--- a/cryptlib.vcxproj.filters
+++ b/cryptlib.vcxproj.filters
@@ -615,6 +615,36 @@
<ClInclude Include="config.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="config_align.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_asm.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_cpu.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_cxx.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_dll.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_int.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_misc.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_ns.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_os.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="config_ver.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="cpu.h">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/keccak_simd.cpp b/keccak_simd.cpp
index 71389cbd..45674ac2 100644
--- a/keccak_simd.cpp
+++ b/keccak_simd.cpp
@@ -39,16 +39,17 @@ extern void KeccakF1600x2_SSE(word64 *state);
// The F1600 round constants
extern const word64 KeccakF1600Constants[24];
-const word64 rho8[2] = {W64LIT(0x0605040302010007), W64LIT(0x0E0D0C0B0A09080F)};
-const word64 rho56[2] = {W64LIT(0x0007060504030201), W64LIT(0x080F0E0D0C0B0A09)};
+CRYPTOPP_ALIGN_DATA(16)
+const word64
+rho8[2] = {W64LIT(0x0605040302010007), W64LIT(0x0E0D0C0B0A09080F)};
-#define V128 __m128i
-#define CV128 const __m128i
+CRYPTOPP_ALIGN_DATA(16)
+const word64
+rho56[2] = {W64LIT(0x0007060504030201), W64LIT(0x080F0E0D0C0B0A09)};
-#define CONST128(a) _mm_load_si128((CV128 *)&(a))
-#define XOREQ128(a, b) a = _mm_xor_si128((a), (b))
-#define UNPACKL(a, b) _mm_unpacklo_epi64((a), (b))
-#define UNPACKH(a, b) _mm_unpackhi_epi64((a), (b))
+// Clang __m128i casts, http://bugs.llvm.org/show_bug.cgi?id=20670
+#define M128_CAST(x) ((__m128i *)(void *)(x))
+#define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
#if defined(__XOP__)
# define ROL64in128(a, o) _mm_roti_epi64((a), (o))
@@ -56,8 +57,8 @@ const word64 rho56[2] = {W64LIT(0x0007060504030201), W64LIT(0x080F0E0D0C0B0A09)}
# define ROL64in128_56(a) ROL64in128((a), 56)
#else
# define ROL64in128(a, o) _mm_or_si128(_mm_slli_epi64((a), (o)), _mm_srli_epi64(a, 64-(o)))
-# define ROL64in128_8(a) _mm_shuffle_epi8((a), CONST128(rho8))
-# define ROL64in128_56(a) _mm_shuffle_epi8((a), CONST128(rho56))
+# define ROL64in128_8(a) _mm_shuffle_epi8((a), _mm_load_si128(CONST_M128_CAST(rho8)))
+# define ROL64in128_56(a) _mm_shuffle_epi8((a), _mm_load_si128(CONST_M128_CAST(rho56)))
#endif
// Damn Visual Studio is missing too many intrinsics...
@@ -74,51 +75,50 @@ inline __m128i SPLAT64(const word64 a)
// The Keccak ParallelHash128 core function
void KeccakF1600x2_SSE(word64 *state)
{
- V128 *statesAsLanes = (V128 *)state;
+ __m128i Aba, Abe, Abi, Abo, Abu;
+ __m128i Aga, Age, Agi, Ago, Agu;
+ __m128i Aka, Ake, Aki, Ako, Aku;
+ __m128i Ama, Ame, Ami, Amo, Amu;
+ __m128i Asa, Ase, Asi, Aso, Asu;
+ __m128i Bba, Bbe, Bbi, Bbo, Bbu;
+ __m128i Bga, Bge, Bgi, Bgo, Bgu;
+ __m128i Bka, Bke, Bki, Bko, Bku;
+ __m128i Bma, Bme, Bmi, Bmo, Bmu;
+ __m128i Bsa, Bse, Bsi, Bso, Bsu;
+ __m128i Ca, Ce, Ci, Co, Cu;
+ __m128i Da, De, Di, Do, Du;
+ __m128i Eba, Ebe, Ebi, Ebo, Ebu;
+ __m128i Ega, Ege, Egi, Ego, Egu;
+ __m128i Eka, Eke, Eki, Eko, Eku;
+ __m128i Ema, Eme, Emi, Emo, Emu;
+ __m128i Esa, Ese, Esi, Eso, Esu;
- V128 Aba, Abe, Abi, Abo, Abu;
- V128 Aga, Age, Agi, Ago, Agu;
- V128 Aka, Ake, Aki, Ako, Aku;
- V128 Ama, Ame, Ami, Amo, Amu;
- V128 Asa, Ase, Asi, Aso, Asu;
- V128 Bba, Bbe, Bbi, Bbo, Bbu;
- V128 Bga, Bge, Bgi, Bgo, Bgu;
- V128 Bka, Bke, Bki, Bko, Bku;
- V128 Bma, Bme, Bmi, Bmo, Bmu;
- V128 Bsa, Bse, Bsi, Bso, Bsu;
- V128 Ca, Ce, Ci, Co, Cu;
- V128 Da, De, Di, Do, Du;
- V128 Eba, Ebe, Ebi, Ebo, Ebu;
- V128 Ega, Ege, Egi, Ego, Egu;
- V128 Eka, Eke, Eki, Eko, Eku;
- V128 Ema, Eme, Emi, Emo, Emu;
- V128 Esa, Ese, Esi, Eso, Esu;
-
- Aba = _mm_loadu_si128((CV128 *)&(statesAsLanes[ 0]));
- Abe = _mm_loadu_si128((CV128 *)&(statesAsLanes[ 1]));
- Abi = _mm_loadu_si128((CV128 *)&(statesAsLanes[ 2]));
- Abo = _mm_loadu_si128((CV128 *)&(statesAsLanes[ 3]));
- Abu = _mm_loadu_si128((CV128 *)&(statesAsLanes[ 4]));
- Aga = _mm_loadu_si128((CV128 *)&(statesAsLanes[ 5]));
- Age = _mm_loadu_si128((CV128 *)&(statesAsLanes[ 6]));
- Agi = _mm_loadu_si128((CV128 *)&(statesAsLanes[ 7]));
- Ago = _mm_loadu_si128((CV128 *)&(statesAsLanes[ 8]));
- Agu = _mm_loadu_si128((CV128 *)&(statesAsLanes[ 9]));
- Aka = _mm_loadu_si128((CV128 *)&(statesAsLanes[10]));
- Ake = _mm_loadu_si128((CV128 *)&(statesAsLanes[11]));
- Aki = _mm_loadu_si128((CV128 *)&(statesAsLanes[12]));
- Ako = _mm_loadu_si128((CV128 *)&(statesAsLanes[13]));
- Aku = _mm_loadu_si128((CV128 *)&(statesAsLanes[14]));
- Ama = _mm_loadu_si128((CV128 *)&(statesAsLanes[15]));
- Ame = _mm_loadu_si128((CV128 *)&(statesAsLanes[16]));
- Ami = _mm_loadu_si128((CV128 *)&(statesAsLanes[17]));
- Amo = _mm_loadu_si128((CV128 *)&(statesAsLanes[18]));
- Amu = _mm_loadu_si128((CV128 *)&(statesAsLanes[19]));
- Asa = _mm_loadu_si128((CV128 *)&(statesAsLanes[20]));
- Ase = _mm_loadu_si128((CV128 *)&(statesAsLanes[21]));
- Asi = _mm_loadu_si128((CV128 *)&(statesAsLanes[22]));
- Aso = _mm_loadu_si128((CV128 *)&(statesAsLanes[23]));
- Asu = _mm_loadu_si128((CV128 *)&(statesAsLanes[24]));
+ __m128i* lanes = reinterpret_cast<__m128i*>(state);
+ Aba = _mm_loadu_si128(CONST_M128_CAST(lanes+ 0));
+ Abe = _mm_loadu_si128(CONST_M128_CAST(lanes+ 1));
+ Abi = _mm_loadu_si128(CONST_M128_CAST(lanes+ 2));
+ Abo = _mm_loadu_si128(CONST_M128_CAST(lanes+ 3));
+ Abu = _mm_loadu_si128(CONST_M128_CAST(lanes+ 4));
+ Aga = _mm_loadu_si128(CONST_M128_CAST(lanes+ 5));
+ Age = _mm_loadu_si128(CONST_M128_CAST(lanes+ 6));
+ Agi = _mm_loadu_si128(CONST_M128_CAST(lanes+ 7));
+ Ago = _mm_loadu_si128(CONST_M128_CAST(lanes+ 8));
+ Agu = _mm_loadu_si128(CONST_M128_CAST(lanes+ 9));
+ Aka = _mm_loadu_si128(CONST_M128_CAST(lanes+10));
+ Ake = _mm_loadu_si128(CONST_M128_CAST(lanes+11));
+ Aki = _mm_loadu_si128(CONST_M128_CAST(lanes+12));
+ Ako = _mm_loadu_si128(CONST_M128_CAST(lanes+13));
+ Aku = _mm_loadu_si128(CONST_M128_CAST(lanes+14));
+ Ama = _mm_loadu_si128(CONST_M128_CAST(lanes+15));
+ Ame = _mm_loadu_si128(CONST_M128_CAST(lanes+16));
+ Ami = _mm_loadu_si128(CONST_M128_CAST(lanes+17));
+ Amo = _mm_loadu_si128(CONST_M128_CAST(lanes+18));
+ Amu = _mm_loadu_si128(CONST_M128_CAST(lanes+19));
+ Asa = _mm_loadu_si128(CONST_M128_CAST(lanes+20));
+ Ase = _mm_loadu_si128(CONST_M128_CAST(lanes+21));
+ Asi = _mm_loadu_si128(CONST_M128_CAST(lanes+22));
+ Aso = _mm_loadu_si128(CONST_M128_CAST(lanes+23));
+ Asu = _mm_loadu_si128(CONST_M128_CAST(lanes+24));
Ca = _mm_xor_si128(Aba, _mm_xor_si128(Aga, _mm_xor_si128(Aka, _mm_xor_si128(Ama, Asa))));
Ce = _mm_xor_si128(Abe, _mm_xor_si128(Age, _mm_xor_si128(Ake, _mm_xor_si128(Ame, Ase))));
@@ -2646,31 +2646,31 @@ void KeccakF1600x2_SSE(word64 *state)
Aso = _mm_xor_si128(Bso, _mm_andnot_si128(Bsu, Bsa));
Asu = _mm_xor_si128(Bsu, _mm_andnot_si128(Bsa, Bse));
- _mm_storeu_si128((V128 *)&(statesAsLanes[ 0]), Aba);
- _mm_storeu_si128((V128 *)&(statesAsLanes[ 1]), Abe);
- _mm_storeu_si128((V128 *)&(statesAsLanes[ 2]), Abi);
- _mm_storeu_si128((V128 *)&(statesAsLanes[ 3]), Abo);
- _mm_storeu_si128((V128 *)&(statesAsLanes[ 4]), Abu);
- _mm_storeu_si128((V128 *)&(statesAsLanes[ 5]), Aga);
- _mm_storeu_si128((V128 *)&(statesAsLanes[ 6]), Age);
- _mm_storeu_si128((V128 *)&(statesAsLanes[ 7]), Agi);
- _mm_storeu_si128((V128 *)&(statesAsLanes[ 8]), Ago);
- _mm_storeu_si128((V128 *)&(statesAsLanes[ 9]), Agu);
- _mm_storeu_si128((V128 *)&(statesAsLanes[10]), Aka);
- _mm_storeu_si128((V128 *)&(statesAsLanes[11]), Ake);
- _mm_storeu_si128((V128 *)&(statesAsLanes[12]), Aki);
- _mm_storeu_si128((V128 *)&(statesAsLanes[13]), Ako);
- _mm_storeu_si128((V128 *)&(statesAsLanes[14]), Aku);
- _mm_storeu_si128((V128 *)&(statesAsLanes[15]), Ama);
- _mm_storeu_si128((V128 *)&(statesAsLanes[16]), Ame);
- _mm_storeu_si128((V128 *)&(statesAsLanes[17]), Ami);
- _mm_storeu_si128((V128 *)&(statesAsLanes[18]), Amo);
- _mm_storeu_si128((V128 *)&(statesAsLanes[19]), Amu);
- _mm_storeu_si128((V128 *)&(statesAsLanes[20]), Asa);
- _mm_storeu_si128((V128 *)&(statesAsLanes[21]), Ase);
- _mm_storeu_si128((V128 *)&(statesAsLanes[22]), Asi);
- _mm_storeu_si128((V128 *)&(statesAsLanes[23]), Aso);
- _mm_storeu_si128((V128 *)&(statesAsLanes[24]), Asu);
+ _mm_storeu_si128(M128_CAST(lanes+ 0), Aba);
+ _mm_storeu_si128(M128_CAST(lanes+ 1), Abe);
+ _mm_storeu_si128(M128_CAST(lanes+ 2), Abi);
+ _mm_storeu_si128(M128_CAST(lanes+ 3), Abo);
+ _mm_storeu_si128(M128_CAST(lanes+ 4), Abu);
+ _mm_storeu_si128(M128_CAST(lanes+ 5), Aga);
+ _mm_storeu_si128(M128_CAST(lanes+ 6), Age);
+ _mm_storeu_si128(M128_CAST(lanes+ 7), Agi);
+ _mm_storeu_si128(M128_CAST(lanes+ 8), Ago);
+ _mm_storeu_si128(M128_CAST(lanes+ 9), Agu);
+ _mm_storeu_si128(M128_CAST(lanes+10), Aka);
+ _mm_storeu_si128(M128_CAST(lanes+11), Ake);
+ _mm_storeu_si128(M128_CAST(lanes+12), Aki);
+ _mm_storeu_si128(M128_CAST(lanes+13), Ako);
+ _mm_storeu_si128(M128_CAST(lanes+14), Aku);
+ _mm_storeu_si128(M128_CAST(lanes+15), Ama);
+ _mm_storeu_si128(M128_CAST(lanes+16), Ame);
+ _mm_storeu_si128(M128_CAST(lanes+17), Ami);
+ _mm_storeu_si128(M128_CAST(lanes+18), Amo);
+ _mm_storeu_si128(M128_CAST(lanes+19), Amu);
+ _mm_storeu_si128(M128_CAST(lanes+20), Asa);
+ _mm_storeu_si128(M128_CAST(lanes+21), Ase);
+ _mm_storeu_si128(M128_CAST(lanes+22), Asi);
+ _mm_storeu_si128(M128_CAST(lanes+23), Aso);
+ _mm_storeu_si128(M128_CAST(lanes+24), Asu);
}
#endif
diff --git a/nbtheory.cpp b/nbtheory.cpp
index de812374..b7a50306 100644
--- a/nbtheory.cpp
+++ b/nbtheory.cpp
@@ -646,6 +646,8 @@ bool SolveModularQuadraticEquation(Integer &r1, Integer &r2, const Integer &a, c
Integer ModularRoot(const Integer &a, const Integer &dp, const Integer &dq,
const Integer &p, const Integer &q, const Integer &u)
{
+ // GCC warning bug, https://stackoverflow.com/q/12842306/608639
+#ifdef _OPENMP
Integer p2, q2;
#pragma omp parallel
#pragma omp sections
@@ -655,6 +657,11 @@ Integer ModularRoot(const Integer &a, const Integer &dp, const Integer &dq,
#pragma omp section
q2 = ModularExponentiation((a % q), dq, q);
}
+#else
+ const Integer p2 = ModularExponentiation((a % p), dp, p);
+ const Integer q2 = ModularExponentiation((a % q), dq, q);
+#endif
+
return CRT(p2, p, q2, q, u);
}
@@ -997,8 +1004,10 @@ Integer Lucas(const Integer &n, const Integer &P, const Integer &modulus)
Integer InverseLucas(const Integer &e, const Integer &m, const Integer &p, const Integer &q, const Integer &u)
{
- Integer d = (m*m-4);
- Integer p2, q2;
+
+ // GCC warning bug, https://stackoverflow.com/q/12842306/608639
+#ifdef _OPENMP
+ Integer d = (m*m-4), p2, q2;
#pragma omp parallel
#pragma omp sections
{
@@ -1013,6 +1022,15 @@ Integer InverseLucas(const Integer &e, const Integer &m, const Integer &p, const
q2 = Lucas(EuclideanMultiplicativeInverse(e,q2), m, q);
}
}
+#else
+ const Integer d = (m*m-4);
+ const Integer t1 = p-Jacobi(d,p);
+ const Integer p2 = Lucas(EuclideanMultiplicativeInverse(e,t1), m, p);
+
+ const Integer t2 = q-Jacobi(d,q);
+ const Integer q2 = Lucas(EuclideanMultiplicativeInverse(e,t2), m, q);
+#endif
+
return CRT(p2, p, q2, q, u);
}
diff --git a/rijndael.h b/rijndael.h
index ca7c286c..bfb80fa1 100644
--- a/rijndael.h
+++ b/rijndael.h
@@ -33,7 +33,7 @@ NAMESPACE_BEGIN(CryptoPP)
/// Power8 AES since Crypto++ 6.0, ARMv7 AES since Crypto++ 8.0
struct Rijndael_Info : public FixedBlockSize<16>, public VariableKeyLength<16, 16, 32, 8>
{
- CRYPTOPP_DLL static const char * CRYPTOPP_API StaticAlgorithmName() {return CRYPTOPP_RIJNDAEL_NAME;}
+ CRYPTOPP_DLL static const char * CRYPTOPP_API StaticAlgorithmName() {return "AES";}
};
/// \brief Rijndael block cipher
diff --git a/rw.cpp b/rw.cpp
index d7287fad..ab79358c 100644
--- a/rw.cpp
+++ b/rw.cpp
@@ -126,6 +126,8 @@ void InvertibleRWFunction::PrecomputeTweakedRoots() const
{
ModularArithmetic modp(m_p), modq(m_q);
+ // GCC warning bug, https://stackoverflow.com/q/12842306/608639
+#ifdef _OPENMP
#pragma omp parallel sections if(CRYPTOPP_RW_USE_OMP)
{
#pragma omp section
@@ -135,6 +137,11 @@ void InvertibleRWFunction::PrecomputeTweakedRoots() const
#pragma omp section
m_pre_q_p = modp.Exponentiate(m_q, m_p - 2);
}
+#else
+ m_pre_2_9p = modp.Exponentiate(2, (9 * m_p - 11)/8);
+ m_pre_2_3q = modq.Exponentiate(2, (3 * m_q - 5)/8);
+ m_pre_q_p = modp.Exponentiate(m_q, m_p - 2);
+#endif
m_precompute = true;
}
@@ -223,6 +230,7 @@ Integer InvertibleRWFunction::CalculateInverse(RandomNumberGenerator &rng, const
else
f = 2;
+#ifdef _OPENMP
Integer W, X;
#pragma omp parallel sections if(CRYPTOPP_RW_USE_OMP)
{
@@ -236,6 +244,12 @@ Integer InvertibleRWFunction::CalculateInverse(RandomNumberGenerator &rng, const
X = (f.IsUnit() ? t : modp.Multiply(m_pre_2_9p, t));
}
}
+#else
+ const Integer W = (f.IsUnit() ? U : modq.Multiply(m_pre_2_3q, U));
+ const Integer t = modp.Multiply(modp.Exponentiate(V, 3), eh);
+ const Integer X = (f.IsUnit() ? t : modp.Multiply(m_pre_2_9p, t));
+#endif
+
const Integer Y = W + q * modp.Multiply(m_pre_q_p, (X - W));
// Signature
diff --git a/simeck_simd.cpp b/simeck_simd.cpp
index 37ea2c5e..2a9efc99 100644
--- a/simeck_simd.cpp
+++ b/simeck_simd.cpp
@@ -26,14 +26,13 @@
# include <ammintrin.h>
#endif
-#if defined(__AVX512F__)
-# define CRYPTOPP_AVX512_ROTATE 1
-# include <immintrin.h>
-#endif
-
// Squash MS LNK4221 and libtool warnings
extern const char SIMECK_SIMD_FNAME[] = __FILE__;
+// Clang __m128i casts, http://bugs.llvm.org/show_bug.cgi?id=20670
+#define M128_CAST(x) ((__m128i *)(void *)(x))
+#define CONST_M128_CAST(x) ((const __m128i *)(const void *)(x))
+
ANONYMOUS_NAMESPACE_BEGIN
using CryptoPP::word16;
@@ -46,9 +45,7 @@ using CryptoPP::word32;
template <unsigned int R>
inline __m128i RotateLeft32(const __m128i& val)
{
-#if defined(CRYPTOPP_AVX512_ROTATE)
- return _mm_rol_epi32(val, R);
-#elif defined(__XOP__)
+#if defined(__XOP__)
return _mm_roti_epi32(val, R);
#else
return _mm_or_si128(
@@ -59,9 +56,7 @@ inline __m128i RotateLeft32(const __m128i& val)
template <unsigned int R>
inline __m128i RotateRight32(const __m128i& val)
{
-#if defined(CRYPTOPP_AVX512_ROTATE)
- return _mm_ror_epi32(val, R);
-#elif defined(__XOP__)
+#if defined(__XOP__)
return _mm_roti_epi32(val, 32-R);
#else
return _mm_or_si128(
@@ -218,7 +213,7 @@ inline void SIMECK64_Enc_Block(__m128i &block0, const word32 *subkeys, unsigned
const unsigned int rounds = 44;
for (int i = 0; i < static_cast<int>(rounds); i += 4)
{
- const __m128i key = _mm_loadu_si128((const __m128i*)(subkeys + i));
+ const __m128i key = _mm_loadu_si128(CONST_M128_CAST(subkeys + i));
SIMECK64_Encrypt(a, b, c, d, _mm_shuffle_epi32(key, _MM_SHUFFLE(0, 0, 0, 0)));
SIMECK64_Encrypt(a, b, c, d, _mm_shuffle_epi32(key, _MM_SHUFFLE(1, 1, 1, 1)));
SIMECK64_Encrypt(a, b, c, d, _mm_shuffle_epi32(key, _MM_SHUFFLE(2, 2, 2, 2)));
@@ -243,7 +238,7 @@ inline void SIMECK64_Dec_Block(__m128i &block0, const word32 *subkeys, unsigned
const unsigned int rounds = 44;
for (int i = static_cast<int>(rounds)-1; i >= 0; i -= 4)
{
- const __m128i key = _mm_loadu_si128((const __m128i*)(subkeys + i - 3));
+ const __m128i key = _mm_loadu_si128(CONST_M128_CAST(subkeys + i - 3));
SIMECK64_Encrypt(a, b, c, d, _mm_shuffle_epi32(key, _MM_SHUFFLE(3, 3, 3, 3)));
SIMECK64_Encrypt(a, b, c, d, _mm_shuffle_epi32(key, _MM_SHUFFLE(2, 2, 2, 2)));
SIMECK64_Encrypt(a, b, c, d, _mm_shuffle_epi32(key, _MM_SHUFFLE(1, 1, 1, 1)));
@@ -268,7 +263,7 @@ inline void SIMECK64_Enc_4_Blocks(__m128i &block0, __m128i &block1,
const unsigned int rounds = 44;
for (int i = 0; i < static_cast<int>(rounds); i += 4)
{
- const __m128i key = _mm_loadu_si128((const __m128i*)(subkeys + i));
+ const __m128i key = _mm_loadu_si128(CONST_M128_CAST(subkeys + i));
SIMECK64_Encrypt(a, b, c, d, _mm_shuffle_epi32(key, _MM_SHUFFLE(0, 0, 0, 0)));
SIMECK64_Encrypt(a, b, c, d, _mm_shuffle_epi32(key, _MM_SHUFFLE(1, 1, 1, 1)));
SIMECK64_Encrypt(a, b, c, d, _mm_shuffle_epi32(key, _MM_SHUFFLE(2, 2, 2, 2)));
@@ -300,7 +295,7 @@ inline void SIMECK64_Dec_4_Blocks(__m128i &block0, __m128i &block1,
const unsigned int rounds = 44;
for (int i = static_cast<int>(rounds)-1; i >= 0; i -= 4)
{
- const __m128i key = _mm_loadu_si128((const __m128i*)(subkeys + i - 3));
+ const __m128i key = _mm_loadu_si128(CONST_M128_CAST(subkeys + i - 3));
SIMECK64_Encrypt(a, b, c, d, _mm_shuffle_epi32(key, _MM_SHUFFLE(3, 3, 3, 3)));
SIMECK64_Encrypt(a, b, c, d, _mm_shuffle_epi32(key, _MM_SHUFFLE(2, 2, 2, 2)));
SIMECK64_Encrypt(a, b, c, d, _mm_shuffle_epi32(key, _MM_SHUFFLE(1, 1, 1, 1)));
View Lorry Controller Status