nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-10 13:13:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correctly detect ARM builds when listing CPU features in headers

Browse Source
This commit is contained in:
Mounir IDRASSI 2023-06-30 00:34:16 +02:00
parent df62c0227c
commit d2efeaffe7
No known key found for this signature in database
GPG Key ID: 02C30AE90FAE4A6F
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Common/Crypto.c
View File

@ -1180,7 +1180,7 @@ BOOL IsAesHwCpuSupported ()
} }
return state && !HwEncryptionDisabled; return state && !HwEncryptionDisabled;
#elif defined (_M_ARM64) #elif defined (_M_ARM64) || defined(__arm__) || defined (__arm64__) || defined (__aarch64__)
return 0; return 0;
#else #else
return (HasAESNI() && !HwEncryptionDisabled)? TRUE : FALSE; return (HasAESNI() && !HwEncryptionDisabled)? TRUE : FALSE;
@ -1463,7 +1463,7 @@ void VcUnprotectKeys (PCRYPTO_INFO pCryptoInfo, uint64 encID)
#endif #endif
#ifdef _M_ARM64 #if defined(_M_ARM64) || defined(__arm__) || defined (__arm64__) || defined (__aarch64__)
/* dummy implementation that should never be called */ /* dummy implementation that should never be called */
void aes_hw_cpu_decrypt(const byte* ks, byte* data) void aes_hw_cpu_decrypt(const byte* ks, byte* data)
{ {

8
src/Crypto/config.h
View File

@ -113,13 +113,13 @@
#define CRYPTOPP_X64_ASM_AVAILABLE #define CRYPTOPP_X64_ASM_AVAILABLE
#endif #endif
#if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || defined(__SSE2__)) && !defined(_M_ARM) && !defined(_M_ARM64) #if !defined(CRYPTOPP_DISABLE_SSE2) && (defined(CRYPTOPP_MSVC6PP_OR_LATER) || defined(__SSE2__)) && !defined(_M_ARM) && !defined(_M_ARM64) && !defined(__arm__) && !defined(__aarch64__) && !defined(__arm64__)
#define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 1 #define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 1
#else #else
#define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 0 #define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 0
#endif #endif
#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SSSE3) && !defined(_M_ARM) && !defined(_M_ARM64) && ( \ #if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SSSE3) && !defined(_M_ARM) && !defined(_M_ARM64) && !defined(__arm__) && !defined(__aarch64__) && !defined(__arm64__) && ( \
defined(__SSSE3__) || (_MSC_VER >= 1500) || \ defined(__SSSE3__) || (_MSC_VER >= 1500) || \
(CRYPTOPP_GCC_VERSION >= 40300) || (__INTEL_COMPILER >= 1000) || (__SUNPRO_CC >= 0x5110) || \ (CRYPTOPP_GCC_VERSION >= 40300) || (__INTEL_COMPILER >= 1000) || (__SUNPRO_CC >= 0x5110) || \
(CRYPTOPP_LLVM_CLANG_VERSION >= 20300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40000)) (CRYPTOPP_LLVM_CLANG_VERSION >= 20300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40000))
@ -128,7 +128,7 @@
#define CRYPTOPP_SSSE3_AVAILABLE 0 #define CRYPTOPP_SSSE3_AVAILABLE 0
# endif # endif
#if !defined(CRYPTOPP_DISABLE_SSSE3) && (defined(__SSSE3__) || (_MSC_VER >= 1500)) && !defined(_M_ARM) && !defined(_M_ARM64) #if !defined(CRYPTOPP_DISABLE_SSSE3) && (defined(__SSSE3__) || (_MSC_VER >= 1500)) && !defined(_M_ARM) && !defined(_M_ARM64) && !defined(__arm__) && !defined(__aarch64__) && !defined(__arm64__)
#define CRYPTOPP_BOOL_SSSE3_INTRINSICS_AVAILABLE 1 #define CRYPTOPP_BOOL_SSSE3_INTRINSICS_AVAILABLE 1
#else #else
#define CRYPTOPP_BOOL_SSSE3_INTRINSICS_AVAILABLE 0 #define CRYPTOPP_BOOL_SSSE3_INTRINSICS_AVAILABLE 0
@ -146,7 +146,7 @@
#define CRYPTOPP_BOOL_ALIGN16 0 #define CRYPTOPP_BOOL_ALIGN16 0
#endif #endif
#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE && (defined(__SSE4_1__) || defined(__INTEL_COMPILER) || defined(_MSC_VER)) #if CRYPTOPP_BOOL_SSSE3_INTRINSICS_AVAILABLE && (defined(__SSE4_1__) || defined(__INTEL_COMPILER) || defined(_MSC_VER))
#define CRYPTOPP_BOOL_SSE41_INTRINSICS_AVAILABLE 1 #define CRYPTOPP_BOOL_SSE41_INTRINSICS_AVAILABLE 1
#else #else
#define CRYPTOPP_BOOL_SSE41_INTRINSICS_AVAILABLE 0 #define CRYPTOPP_BOOL_SSE41_INTRINSICS_AVAILABLE 0