Skip to content

Conversation

@douzzer
Copy link
Contributor

@douzzer douzzer commented Oct 24, 2025

wolfcrypt/src/aes.c: define GCM_GMULT_LEN() when WOLFSSL_ARMASM, and fix gating on wolfCrypt_FIPS_AES_sanity (always gate in for FIPS v7+);

wolfcrypt/src/port/af_alg/afalg_aes.c: check for null key arg;

configure.ac: rename BUILD_FIPS_CURRENT to BUILD_FIPS_V2_PLUS (no functional change), and remove unused ARMASM_DIST_SOURCES set up code added in #9332;

src/include.am:

  • set up $(ARMASM_SHA256_C), and use it to properly include wolfcrypt/src/sha256.c alongside armasm when appropriate;
  • fix gating on Curved25519 armasm (BUILD_FIPS_V6_PLUS, not BUILD_FIPS_V6);

tests/api/test_aes.c and wolfcrypt/test/test.c: gate out incompatible coverage for WOLFSSL_AFALG and WOLFSSL_KCAPI (test_wc_AesCbcEncryptDecrypt_MultiBlocks(), test_wc_AesCtrSetKey*(), test_wc_AesCtrEncrypt*(), test_wc_AesGcmEncryptDecrypt_Sizes()).

tested with

wolfssl-multi-test.sh ...
super-quick-check
all-afalg
defaults-afalg
fips-140-3-dev-optest-acvp-sp-asm-gcc-latest-no-sha-1
fips-140-3-dev-kcapi
lean-fips-dev-armv7-small-armasm-sanitizer
lean-fips-dev-aarch64-armasm-sanitizer
cross-aarch64-armasm-fips-140-3-ready-unittest-sanitizer
cross-aarch64-armasm-fips-140-3-dev-all-unittest-sanitizer
cross-armv7a-armasm-fips-140-3-dev-sp-all-testsuite-sanitizer

…fix gating on wolfCrypt_FIPS_AES_sanity (always gate in for FIPS v7+);

wolfcrypt/src/port/af_alg/afalg_aes.c: check for null key arg;

configure.ac: rename BUILD_FIPS_CURRENT to BUILD_FIPS_V2_PLUS (no functional change), and remove unused ARMASM_DIST_SOURCES set up code added in wolfSSL#9332;

src/include.am:
* set up $(ARMASM_SHA256_C), and use it to properly include wolfcrypt/src/sha256.c alongside armasm when appropriate;
* fix gating on Curved25519 armasm (BUILD_FIPS_V6_PLUS, not BUILD_FIPS_V6);

tests/api/test_aes.c and wolfcrypt/test/test.c: gate out incompatible coverage for WOLFSSL_AFALG and WOLFSSL_KCAPI (test_wc_AesCbcEncryptDecrypt_MultiBlocks(), test_wc_AesCtrSetKey*(), test_wc_AesCtrEncrypt*(), test_wc_AesGcmEncryptDecrypt_Sizes()).
@dgarske dgarske merged commit 7524552 into wolfSSL:master Oct 24, 2025
338 of 341 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