Skip to content

Commit db3ab5a

Browse files
authored
Merge pull request #8566 from kareem-wolfssl/zd19572
Only perform ARM assembly CPUID checks if support was enabled at build time.
2 parents 4e60e9f + 6c47249 commit db3ab5a

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

wolfcrypt/src/cpuid.c

+12
Original file line numberDiff line numberDiff line change
@@ -163,22 +163,34 @@
163163
if (!cpuid_check) {
164164
word64 hwcaps = getauxval(AT_HWCAP);
165165

166+
#ifndef WOLFSSL_ARMASM_NO_HW_CRYPTO
166167
if (hwcaps & HWCAP_AES)
167168
cpuid_flags |= CPUID_AES;
168169
if (hwcaps & HWCAP_PMULL)
169170
cpuid_flags |= CPUID_PMULL;
170171
if (hwcaps & HWCAP_SHA2)
171172
cpuid_flags |= CPUID_SHA256;
173+
#endif
174+
#ifdef WOLFSSL_ARMASM_CRYPTO_SHA512
172175
if (hwcaps & HWCAP_SHA512)
173176
cpuid_flags |= CPUID_SHA512;
177+
#endif
178+
#ifndef WOLFSSL_AARCH64_NO_SQRDMLSH
174179
if (hwcaps & HWCAP_ASIMDRDM)
175180
cpuid_flags |= CPUID_RDM;
181+
#endif
182+
#ifdef WOLFSSL_ARMASM_CRYPTO_SHA3
176183
if (hwcaps & HWCAP_SHA3)
177184
cpuid_flags |= CPUID_SHA3;
185+
#endif
186+
#ifdef WOLFSSL_ARMASM_CRYPTO_SM3
178187
if (hwcaps & HWCAP_SM3)
179188
cpuid_flags |= CPUID_SM3;
189+
#endif
190+
#ifdef WOLFSSL_ARMASM_CRYPTO_SM4
180191
if (hwcaps & HWCAP_SM4)
181192
cpuid_flags |= CPUID_SM4;
193+
#endif
182194

183195
cpuid_check = 1;
184196
}

0 commit comments

Comments
 (0)