Skip to content

20250313-various-fixes#8563

Merged
kaleb-himes merged 2 commits intowolfSSL:masterfrom
douzzer:20250313-various-fixes
Mar 14, 2025
Merged

20250313-various-fixes#8563
kaleb-himes merged 2 commits intowolfSSL:masterfrom
douzzer:20250313-various-fixes

Conversation

@douzzer
Copy link
Copy Markdown
Contributor

@douzzer douzzer commented Mar 14, 2025

configure.ac:

  • sense assert.h and define WOLFSSL_HAVE_ASSERT_H accordingly.
  • force off enable_aesgcm_stream if 32 bit armasm or riscv-asm (not yet implemented or buildable).
  • add AM_CONDITIONAL([BUILD_CHACHA_NOASM, ...]) when --enable-chacha=noasm.

src/include.am: gate armasm/riscv_asm chacha files on !BUILD_CHACHA_NOASM.

tests/api.c: add missing HAVE_CHACHA&&HAVE_POLY1305 gate around test_TLSX_CA_NAMES_bad_extension().

wolfcrypt/src/chacha.c: tweak WOLFSSL_ARMASM and WOLFSSL_RISCV_ASM codepaths to also depend on !NO_CHACHA_ASM.

wolfssl/wolfcrypt/types.h: in setup for wc_static_assert(), #include <assert.h> if WOLFSSL_HAVE_ASSERT_H, >=C11, or >=C++11.

tested with

wolfssl-multi-test.sh ...
    super-quick-check
    quantum-safe-wolfssl-all-cross-armv7a-armasm-unittest
    quantum-safe-wolfssl-all-cross-armv7a-armasm-unittest-Os
    quantum-safe-wolfssl-all-cross-armv7a-armasm-unittest-Os-smallstack
    quantum-safe-wolfssl-all-cross-armv7a-noasm-unittest-Os-smallstack
    lean-fips-dev-armv7-small-armasm
    lean-fips-dev-armv7-small-armasm-sanitizer
    cross-armv6zk-all-armasm
    cross-riscv64-all-asm
    cross-armv7a-all-armasm-testsuite-sanitizer
    cross-armv7a-armasm-fips-140-3-dev-sp-all-testsuite-sanitizer
    cross-armv6zk-all-asm-testwolfcrypt-sanitizer
    cross-armv7a-all-armasm-testwolfcrypt-sanitizer

* sense assert.h and define WOLFSSL_HAVE_ASSERT_H accordingly.
* force off enable_aesgcm_stream if 32 bit armasm or riscv-asm (not yet implemented or buildable).
* add AM_CONDITIONAL([BUILD_CHACHA_NOASM, ...]) when --enable-chacha=noasm.

src/include.am: gate armasm/riscv_asm chacha files on !BUILD_CHACHA_NOASM.

tests/api.c: add missing HAVE_CHACHA&&HAVE_POLY1305 gate around test_TLSX_CA_NAMES_bad_extension().

wolfcrypt/src/chacha.c: tweak WOLFSSL_ARMASM and WOLFSSL_RISCV_ASM codepaths to also depend on !NO_CHACHA_ASM.

wolfssl/wolfcrypt/types.h: in setup for wc_static_assert(), #include <assert.h> if WOLFSSL_HAVE_ASSERT_H, >=C11, or >=C++11.
SparkiDev
SparkiDev previously approved these changes Mar 14, 2025
…ERT_H && !WOLFSSL_NO_ASSERT_H.

wolfssl/wolfcrypt/settings.h: #ifdef WOLFSSL_LINUXKM, #undef WOLFSSL_HAVE_ASSERT_H and #define WOLFSSL_NO_ASSERT_H.
@douzzer
Copy link
Copy Markdown
Contributor Author

douzzer commented Mar 14, 2025

retest this please (java.io.StreamCorruptedException: invalid stream header: 636F7272)

@douzzer douzzer removed their assignment Mar 14, 2025
Comment thread wolfssl/wolfcrypt/types.h
@douzzer douzzer requested a review from kaleb-himes March 14, 2025 16:39
@douzzer
Copy link
Copy Markdown
Contributor Author

douzzer commented Mar 14, 2025

re assert.h, see ZD #19544

Copy link
Copy Markdown
Contributor

@kaleb-himes kaleb-himes left a comment

Choose a reason for hiding this comment

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

Thanks @douzzer

@kaleb-himes kaleb-himes merged commit 6188c9c into wolfSSL:master Mar 14, 2025
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.

4 participants