VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2023-06-30 00:34:16 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2023-06-30 00:34:16 +0200
commitd2efeaffe76d97711d49e5065dfb57c213b3ebff (patch)
tree14fcbeb5d17f9c6d6fa6bf8f89f1c3d4f73d8409 /src/Common
parentdf62c0227c40682a69c15d8477b7ddcc0f380678 (diff)
downloadVeraCrypt-d2efeaffe76d97711d49e5065dfb57c213b3ebff.tar.gz
VeraCrypt-d2efeaffe76d97711d49e5065dfb57c213b3ebff.zip
Correctly detect ARM builds when listing CPU features in headers
Diffstat (limited to 'src/Common')
-rw-r--r--src/Common/Crypto.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Common/Crypto.c b/src/Common/Crypto.c
index 10c97e98..e87aea35 100644
--- a/src/Common/Crypto.c
+++ b/src/Common/Crypto.c
@@ -1180,7 +1180,7 @@ BOOL IsAesHwCpuSupported ()
}
return state && !HwEncryptionDisabled;
-#elif defined (_M_ARM64)
+#elif defined (_M_ARM64) || defined(__arm__) || defined (__arm64__) || defined (__aarch64__)
return 0;
#else
return (HasAESNI() && !HwEncryptionDisabled)? TRUE : FALSE;
@@ -1463,7 +1463,7 @@ void VcUnprotectKeys (PCRYPTO_INFO pCryptoInfo, uint64 encID)
#endif
-#ifdef _M_ARM64
+#if defined(_M_ARM64) || defined(__arm__) || defined (__arm64__) || defined (__aarch64__)
/* dummy implementation that should never be called */
void aes_hw_cpu_decrypt(const byte* ks, byte* data)
{