Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for arm64_32 (aka ILP32) on Clang #7808

Merged
merged 15 commits into from
Jun 27, 2023
Merged

Fix for arm64_32 (aka ILP32) on Clang #7808

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b19f584
Fix for arm64_32 (aka ILP32) on Clang
daverodgman Jun 20, 2023
04cb9ac
Fix for arm64_32 (aka ILP32) on Clang (attempt 2)
daverodgman Jun 21, 2023
b67db91
Separate ILP32 and normal-aarch64 code paths
daverodgman Jun 21, 2023
517e891
Changelog
daverodgman Jun 21, 2023
85842b8
Be strict about pointer size in mbedtls_get_unaligned_volatile_uint32
daverodgman Jun 21, 2023
63e89b4
Use UINTPTR_MAX not SIZE_MAX
daverodgman Jun 21, 2023
140fa15
Improve changelog
daverodgman Jun 21, 2023
c54f25e
code style
daverodgman Jun 21, 2023
0400ae2
Fix pointer constraint in bn_mul.h
daverodgman Jun 21, 2023
b5b6939
Remove redundant checks in constant_time.c
daverodgman Jun 21, 2023
5b5dd01
code style
daverodgman Jun 21, 2023
e6c9996
Work around updating pointers from ILP32
daverodgman Jun 21, 2023
4e5c63d
Improve documentation in bn_mul.h
daverodgman Jun 23, 2023
9e868be
Fix clang warning from -Wasm-operand-widths
daverodgman Jun 27, 2023
8c5fae2
Add explanatory comment
daverodgman Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ChangeLog.d/fix-ilp32.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Bugfix
* Fix a compile failure in the constant_time module when building
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor, not worth updating just for that:

Suggested change
* Fix a compile failure in the constant_time module when building
* Fix a compilation failure in the constant_time module when building

for watchos (i.e. for Aarch64 ILP32). Reported by Paulo Coutinho
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor, perhaps updating just for that: watchos is not really material here, what's material is arm64_32. Suggested wording: “when building for arm64_32, e.g. for watchOS”.

in #7787.
10 changes: 9 additions & 1 deletion library/constant_time.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@
* 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__)) && (UINTPTR_MAX == 0xfffffffful)) || \
(defined(__aarch64__) && ((UINTPTR_MAX == 0xffffffffull) || (UINTPTR_MAX == 0xffffffffffffffffull)))
/* We check pointer sizes to avoid issues with them not matching register size requirements */
#define MBEDTLS_EFFICIENT_UNALIGNED_VOLATILE_ACCESS
#endif
#endif
Expand All @@ -79,7 +81,13 @@ static inline uint32_t mbedtls_get_unaligned_volatile_uint32(volatile const unsi
#if defined(__arm__) || defined(__thumb__) || defined(__thumb2__)
asm volatile ("ldr %0, [%1]" : "=r" (r) : "r" (p) :);
#elif defined(__aarch64__)
#if (UINTPTR_MAX == 0xfffffffful)
/* ILP32: Specify the pointer operand slightly differently, as per #7787. */
asm volatile ("ldr %w0, [%1]" : "=r" (r) : "p" (p) :);
#elif (UINTPTR_MAX == 0xffffffffffffffffull)
/* aarch64 with 64-bit pointers */
asm volatile ("ldr %w0, [%1]" : "=r" (r) : "r" (p) :);
#endif
#endif
return r;
}
Expand Down