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

AT_HWCAP2 not always defined #1682

Merged
merged 2 commits into from
Jul 1, 2024
Merged

AT_HWCAP2 not always defined #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e90aab
AT_HWCAP2 not always defined
justsmth Jun 30, 2024
abe2889
Fix other platforms
justsmth Jul 1, 2024
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
2 changes: 2 additions & 0 deletions crypto/fipsmodule/cpucap/cpu_arm_freebsd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ void OPENSSL_cpuid_setup(void) {
// left at zero. The rest of this function will then gracefully report
// the features are absent.
elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
#if defined(AT_HWCAP2)
elf_aux_info(AT_HWCAP2, &hwcap2, sizeof(hwcap2));
#endif

// Matching OpenSSL, only report other features if NEON is present.
if (hwcap & HWCAP_NEON) {
Expand Down
4 changes: 4 additions & 0 deletions crypto/fipsmodule/cpucap/cpu_arm_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,11 @@ void OPENSSL_cpuid_setup(void) {
// this is now rare (see Chrome's Net.NeedsHWCAP2Workaround metric), but AES
// and PMULL extensions are very useful, so we still carry the workaround
// for now.
#if defined(AT_HWCAP2)
unsigned long hwcap2 = getauxval(AT_HWCAP2);
#else
unsigned long hwcap2 = 0;
#endif
if (hwcap2 == 0) {
hwcap2 = crypto_get_arm_hwcap2_from_cpuinfo(&cpuinfo);
g_needs_hwcap2_workaround = hwcap2 != 0;
Expand Down
4 changes: 4 additions & 0 deletions crypto/fipsmodule/cpucap/cpu_ppc64le.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@ static void handle_cpu_env(unsigned long *out, const char *in) {
extern uint8_t OPENSSL_cpucap_initialized;

void OPENSSL_cpuid_setup(void) {
#if defined(AT_HWCAP2)
OPENSSL_ppc64le_hwcap2 = getauxval(AT_HWCAP2);
#else
OPENSSL_ppc64le_hwcap2 = 0;
#endif
OPENSSL_cpucap_initialized = 1;

// OPENSSL_ppccap is a 64-bit hex string which may start with "0x".
Expand Down
Loading