commit 85842b8edb1f3cf18cb525f068d9c105b09563fe
author Dave Rodgman <dave.rodgman@arm.com> Wed Jun 21 11:22:09 2023 +0100
committer Dave Rodgman <dave.rodgman@arm.com> Wed Jun 21 11:22:09 2023 +0100
tree 76f6f42f39f54fea646ec355eb32c3599cf28737
parent 517e891e5550cb889c5374bd8dad7e26e9f3245e

Be strict about pointer size in mbedtls_get_unaligned_volatile_uint32

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>

library/constant_time.c

diff --git a/library/constant_time.c b/library/constant_time.c
index 89d7b4f..fb14c9c 100644
--- a/library/constant_time.c
+++ b/library/constant_time.c
@@ -63,7 +63,8 @@
  * only used here.
  */
 #if defined(MBEDTLS_EFFICIENT_UNALIGNED_ACCESS) && defined(MBEDTLS_HAVE_ASM)
-#if defined(__arm__) || defined(__thumb__) || defined(__thumb2__) || defined(__aarch64__)
+#if ((defined(__arm__) || defined(__thumb__) || defined(__thumb2__)) && (SIZE_MAX == 0xffffffff)) || \
+    (defined(__aarch64__) && ((SIZE_MAX == 0xffffffff) || (SIZE_MAX == 0xffffffffffffffff)))
 #define MBEDTLS_EFFICIENT_UNALIGNED_VOLATILE_ACCESS
 #endif
 #endif