commit 51b62ef23d9099670aef85892b4dd4bed6226056
author Dave Rodgman <dave.rodgman@arm.com> Wed Mar 08 17:19:29 2023 +0000
committer GitHub <noreply@github.com> Wed Mar 08 17:19:29 2023 +0000
tree 7ede8baeaed0113e62ab789ea4d1add2350df36a
parent 913d9bb921b98736bcdf72fd0f43755a6709c513
parent bbe166e72116848b8ef83108cde1c568a97fa592

Merge pull request #7228 from tom-cosgrove-arm/fix-alignment.h-on-32-bit-systems

Fix mbedtls_bswap64() on 32-bit systems

library/alignment.h

diff --git a/library/alignment.h b/library/alignment.h
index f7330c9..a518a8a 100644
--- a/library/alignment.h
+++ b/library/alignment.h
@@ -217,14 +217,14 @@
 static inline uint64_t mbedtls_bswap64(uint64_t x)
 {
     return
-        (x & 0x00000000000000ff) << 56 |
-        (x & 0x000000000000ff00) << 40 |
-        (x & 0x0000000000ff0000) << 24 |
-        (x & 0x00000000ff000000) <<  8 |
-        (x & 0x000000ff00000000) >>  8 |
-        (x & 0x0000ff0000000000) >> 24 |
-        (x & 0x00ff000000000000) >> 40 |
-        (x & 0xff00000000000000) >> 56;
+        (x & 0x00000000000000ffULL) << 56 |
+        (x & 0x000000000000ff00ULL) << 40 |
+        (x & 0x0000000000ff0000ULL) << 24 |
+        (x & 0x00000000ff000000ULL) <<  8 |
+        (x & 0x000000ff00000000ULL) >>  8 |
+        (x & 0x0000ff0000000000ULL) >> 24 |
+        (x & 0x00ff000000000000ULL) >> 40 |
+        (x & 0xff00000000000000ULL) >> 56;
 }
 #define MBEDTLS_BSWAP64 mbedtls_bswap64
 #endif /* !defined(MBEDTLS_BSWAP64) */