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.

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

20241210-fixes #8272

Merged
merged 1 commit into from
Dec 10, 2024
Merged

20241210-fixes #8272

merged 1 commit into from
Dec 10, 2024

Conversation

douzzer
Copy link
Contributor

@douzzer douzzer commented Dec 10, 2024

add support for WOLFSSL_NO_OPTIONS_H:

  • activate WOLFSSL_NO_OPTIONS_H in linuxkm/Kbuild for in-module test.o and benchmark.o.
  • refine explanatory comments in settings.h re WOLFSSL_USE_OPTIONS_H, WOLFSSL_NO_OPTIONS_H, and WOLFSSL_CUSTOM_CONFIG.
  • add safety catch to options.h/options.h.in to inhibit inclusion if defined(WOLFSSL_NO_OPTIONS_H).
  • for good measure, add explicit check for WOLFSSL_NO_OPTIONS_H to wolfcrypt/benchmark/benchmark.c and wolfcrypt/test/test.c.

tested with wolfssl-multi-test.sh ... check-source-text check-configure quantum-safe-wolfssl-all-g++-latest-debug cmake-defaults make-dist-clean-check quantum-safe-wolfssl-all-crypto-only-noasm-linuxkm-insmod quantum-safe-wolfssl-all-crypto-only-intelasm-sp-asm-linuxkm-insmod linuxkm-all-fips-140-3 linuxkm-all-fips-140-3-dev-dyn-hash linuxkm-benchmarks-insmod linuxkm-legacy-3.16 linuxkm-legacy-4.4-insmod linuxkm-mainline-intelasm-sp-asm-pie-gcc-latest-insmod

* activate WOLFSSL_NO_OPTIONS_H in linuxkm/Kbuild for in-module test.o and benchmark.o.
* refine explanatory comments in settings.h re WOLFSSL_USE_OPTIONS_H, WOLFSSL_NO_OPTIONS_H, and WOLFSSL_CUSTOM_CONFIG.
* add safety catch to options.h/options.h.in to inhibit inclusion if defined(WOLFSSL_NO_OPTIONS_H).
* for good measure, add explicit check for WOLFSSL_NO_OPTIONS_H to wolfcrypt/benchmark/benchmark.c and wolfcrypt/test/test.c.
@douzzer douzzer self-assigned this Dec 10, 2024
@douzzer
Copy link
Contributor Author

douzzer commented Dec 10, 2024

retest this please (PRB-disable-options.txt_9: "FAIL scripts/openssl.test" PRB-dtls.txt_24: "FAIL scripts/unit.test" PRB-medium-runtime.txt: "java.io.IOException: Unexpected termination of the channel")

@douzzer douzzer assigned wolfSSL-Bot and unassigned douzzer Dec 10, 2024
@JacobBarthelmeh JacobBarthelmeh merged commit 1208a74 into wolfSSL:master Dec 10, 2024
145 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