diff --git a/config.h b/config.h index c6f403c6..b5a6cfa7 100644 --- a/config.h +++ b/config.h @@ -572,9 +572,11 @@ NAMESPACE_END # if defined(__ARM_FEATURE_CRYPTO) || (CRYPTOPP_MSC_VERSION >= 1910) || \ defined(__aarch32__) || defined(__aarch64__) # define CRYPTOPP_ARM_AES_AVAILABLE 1 -# define CRYPTOPP_ARM_PMULL_AVAILABLE 1 # define CRYPTOPP_ARM_SHA_AVAILABLE 1 # define CRYPTOPP_ARM_CRYPTO_AVAILABLE 1 +# if !defined(__apple_build_version__) +# define CRYPTOPP_ARM_PMULL_AVAILABLE 1 +# endif # endif #endif diff --git a/crc-simd.cpp b/crc-simd.cpp index d3034546..e1ed3ff0 100644 --- a/crc-simd.cpp +++ b/crc-simd.cpp @@ -29,7 +29,7 @@ # include "nmmintrin.h" #endif -#if (CRYPTOPP_ARM_CRC32_AVAILABLE) +#if (CRYPTOPP_ARM_CRC32_AVAILABLE) && !defined(CRYPTOPP_APPLE_CLANG_VERSION) # include "arm_acle.h" #endif diff --git a/gcm-simd.cpp b/gcm-simd.cpp index 1741def8..bc230692 100644 --- a/gcm-simd.cpp +++ b/gcm-simd.cpp @@ -34,7 +34,7 @@ # include "arm_neon.h" #endif -#if (CRYPTOPP_ARM_PMULL_AVAILABLE) +#if (CRYPTOPP_ARM_PMULL_AVAILABLE) && !defined(CRYPTOPP_APPLE_CLANG_VERSION) # include "arm_acle.h" #endif diff --git a/rijndael-simd.cpp b/rijndael-simd.cpp index 3a0a700f..4f608ae7 100644 --- a/rijndael-simd.cpp +++ b/rijndael-simd.cpp @@ -44,6 +44,9 @@ #if (CRYPTOPP_ARM_AES_AVAILABLE) # include "arm_neon.h" +#endif + +#if (CRYPTOPP_ARM_AES_AVAILABLE) && !defined(CRYPTOPP_APPLE_CLANG_VERSION) # include "arm_acle.h" #endif diff --git a/sha-simd.cpp b/sha-simd.cpp index 4e808c02..bb65a15b 100644 --- a/sha-simd.cpp +++ b/sha-simd.cpp @@ -39,8 +39,11 @@ # include "immintrin.h" #endif -#if (CRYPTOPP_ARM_SHA_AVAILABLE) +#if (CRYPTOPP_ARM_AES_AVAILABLE) # include "arm_neon.h" +#endif + +#if (CRYPTOPP_ARM_AES_AVAILABLE) && !defined(CRYPTOPP_APPLE_CLANG_VERSION) # include "arm_acle.h" #endif