Skip to content

Conversation

@douzzer
Copy link
Contributor

@douzzer douzzer commented Oct 22, 2025

fixes for autotools config around armasm AES/SHA refactor in #9284:

in configure.ac, add BUILD_FIPS_V5_PLUS and BUILD_FIPS_V6_PLUS conditionals, and fix BUILD_FIPS_V6 conditional to match v6 only;

in src/include.am, add LEGACY_ARMASM_foo and NEW_ARMASM_foo helper variables, restore pre-PR9284 armasm clauses, and add or update several FIPS gates as needed;

add empty wolfcrypt/src/port/arm/{armv8-aes.c,armv8-sha256.c,armv8-sha512.c} to mollify autotools, and in wolfcrypt/src/include.am, restore them to EXTRA_DIST if FIPS v5 or v6.

wolfcrypt/src/sha256.c: in wc_Sha256HashBlock(), use ByteReverseWords() rather than a series of ByteReverseWord32() to get WOLFSSL_USE_ALIGN.

.wolfssl_known_macro_extras: snip out a couple no-longer-needed extras.

tested with wolfssl-multi-test.sh ... check-source-text cross-aarch64-armasm-fips-140-3-v6-unittest-sanitizer

additional testing with make-dist-clean-check quantum-safe-wolfssl-cross-aarch64-armasm-unittest-sanitizer cross-aarch64-armasm-fips-140-3-v6-unittest-sanitizer all-crypto-openssl-extra-coexist-fips-v5-pilot fips-140-3-v5-ready-optest-acvp-intelasm fips-140-3-v5-dev-all

SparkiDev
SparkiDev previously approved these changes Oct 22, 2025
…9284: in configure.ac, add BUILD_FIPS_V5_PLUS and BUILD_FIPS_V6_PLUS conditionals, and fix BUILD_FIPS_V6 conditional to match v6 only;

in src/include.am, add LEGACY_ARMASM_foo and NEW_ARMASM_foo helper variables, restore pre-PR9284 armasm clauses, and add or update several FIPS gates as needed;

add empty wolfcrypt/src/port/arm/{armv8-aes.c,armv8-sha256.c,armv8-sha512.c} to mollify autotools, and in wolfcrypt/src/include.am, restore them to EXTRA_DIST if FIPS v5 or v6.
…() rather than a series of ByteReverseWord32() to get WOLFSSL_USE_ALIGN.
@douzzer douzzer force-pushed the 20251022-FIPS-armasm-autotools-fixup branch from 12c6cac to 3bd5a30 Compare October 23, 2025 04:00
@douzzer douzzer requested a review from SparkiDev October 23, 2025 04:11
@douzzer
Copy link
Contributor Author

douzzer commented Oct 23, 2025

retest this please
(git pull glitches)

@dgarske dgarske merged commit f376512 into wolfSSL:master Oct 23, 2025
269 of 270 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants