Skip to content

20241121-fixes#8211

Merged
JacobBarthelmeh merged 1 commit intowolfSSL:masterfrom
douzzer:20241121-fixes
Nov 22, 2024
Merged

20241121-fixes#8211
JacobBarthelmeh merged 1 commit intowolfSSL:masterfrom
douzzer:20241121-fixes

Conversation

@douzzer
Copy link
Copy Markdown
Contributor

@douzzer douzzer commented Nov 22, 2024

wolfssl/wolfcrypt/error-crypt.h, wolfcrypt/src/error.c: add WC_FAILURE ("wolfCrypt generic failure") with value -1, for traceable error return of -1 in wolfCrypt.

configure.ac: add OPENSSL_EXTRA to --enable-wolfsentry.

linuxkm/linuxkm_wc_port.h, linuxkm/module_hooks.c, wolfssl/ssl.h: accommodate backward dependencies for wolfSSL_X509_NAME_add_entry_by_NID, wolfSSL_X509_NAME_free, and wolfSSL_X509_NAME_new_ex.

linuxkm/lkcapi_glue.c: if CONFIG_CRYPTO_MANAGER, assert match of CONFIG_CRYPTO_FIPS and HAVE_FIPS.

src/ssl_crypto.c, wolfcrypt/src/wc_lms.c, wolfcrypt/src/wc_lms_impl.c, wolfcrypt/src/wc_xmss.c, wolfcrypt/test/test.c: add casts for XMALLOC()s.

src/ssl_crypto.c: in wolfSSL_AES_decrypt(), fix gate for wc_AesDecryptDirect() return type.

wolfcrypt/test/test.c: smallstack refactor in test_dilithium_decode_level().

tests/api.c: fix uninited vars in test_wc_dilithium_der().

tested with FIPS_DEV_BRANCH=local:20241121-WC_FAILURE-and-HAVE_EMBEDDED_AGENT wolfssl-multi-test.sh ... super-quick-check fips-140-3-v6-optest-acvp-sp-asm fips-140-3-ready-optest-acvp-sp-asm fips-140-3-dev-optest-acvp-sp-asm fips-140-3-dev-optest-acvp-sp-asm-trace-errcodes fips-140-3-dev-optest-acvp-sp-noasm fips-140-3-dev-optest-acvp-sp-asm-gcc-latest fips-140-3-dev-optest-acvp-sp-asm-gcc-latest-no-sha-1 fips-140-2-optest fips-140-2-openssl-all fips-140-3-pilot-all fips-140-3-pilot-optest-acvp-sp-asm fips-140-3-all linuxkm-all-fips-140-3 linuxkm-all-fips-140-3-dev-dyn-hash linuxkm-fips-dev-static-hash-intelasm-LKCAPI-insmod-crypto-fuzzer linuxkm-mainline-intelasm-sp-asm-pie-gcc-latest-insmod wolfssl-with-wolfsentry quantum-safe-wolfssl-all-noasm-stack-sizes

…E ("wolfCrypt generic failure") with value -1, for traceable error return of -1 in wolfCrypt.

configure.ac: add OPENSSL_EXTRA to --enable-wolfsentry.

linuxkm/linuxkm_wc_port.h, linuxkm/module_hooks.c, wolfssl/ssl.h: accommodate backward dependencies for wolfSSL_X509_NAME_add_entry_by_NID, wolfSSL_X509_NAME_free, and wolfSSL_X509_NAME_new_ex.

linuxkm/lkcapi_glue.c: if CONFIG_CRYPTO_MANAGER, assert match of CONFIG_CRYPTO_FIPS and HAVE_FIPS.

src/ssl_crypto.c, wolfcrypt/src/wc_lms.c, wolfcrypt/src/wc_lms_impl.c, wolfcrypt/src/wc_xmss.c, wolfcrypt/test/test.c: add missing casts for XMALLOC()s.

src/ssl_crypto.c: in wolfSSL_AES_decrypt(), fix gate for wc_AesDecryptDirect() return type.

wolfcrypt/test/test.c: smallstack refactor in test_dilithium_decode_level().

tests/api.c: fix uninited vars and "embedding a directive within macro arguments is not portable" in test_wc_dilithium_der().
@douzzer
Copy link
Copy Markdown
Contributor Author

douzzer commented Nov 22, 2024

retest this please (python port test "test_ssl failed")

@douzzer
Copy link
Copy Markdown
Contributor Author

douzzer commented Nov 22, 2024

Note python test failure is unrelated to this PR.

Copy link
Copy Markdown
Contributor

@bigbrett bigbrett left a comment

Choose a reason for hiding this comment

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

nice @douzzer, you beat me to those dilithium fixes - had the same ones queued up in a PR, I was just investigating a valgrind issue.

@dgarske
Copy link
Copy Markdown
Member

dgarske commented Nov 22, 2024

FYI Test failure in on Python test. The PR Aidan and I did in wolfSSL/osp#211 clearly didn't work. I'll reproduce locally and get another patch put up.

@JacobBarthelmeh JacobBarthelmeh merged commit c5d7dc3 into wolfSSL:master Nov 22, 2024
@douzzer
Copy link
Copy Markdown
Contributor Author

douzzer commented Nov 22, 2024

@bigbrett yeah I had the definite feeling I was drag racing with you on those 😜

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.

5 participants