From 8d332778b08cf906206d7fadbeeda8bfdeb03793 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Wed, 15 Apr 2026 21:12:21 -0500 Subject: [PATCH] wolfcrypt/test/test.c: in ed25519_test(), fix RARE_ED_BAD_ENC_E and RARE_ED_BAD_SIG_E macros to use WC_NO_ERR_TRACE() safely; .github/workflows/trackmemory.yml: add --enable-debug-trace-errcodes to a couple scenarios. --- .github/workflows/trackmemory.yml | 4 ++-- wolfcrypt/test/test.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/trackmemory.yml b/.github/workflows/trackmemory.yml index a071b973b3..3f79e01645 100644 --- a/.github/workflows/trackmemory.yml +++ b/.github/workflows/trackmemory.yml @@ -18,9 +18,9 @@ jobs: matrix: config: [ # Add new configs here - '--enable-all CFLAGS="-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY"', + '--enable-all --enable-debug-trace-errcodes CFLAGS="-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY"', '--enable-smallstack --enable-all CFLAGS="-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY"', - '--enable-smallstackcache --enable-smallstack --enable-all CFLAGS="-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY"', + '--enable-smallstackcache --enable-smallstack --enable-all --enable-debug-trace-errcodes CFLAGS="-DWC_RNG_SEED_CB -DWOLFSSL_TRACK_MEMORY -DWOLFSSL_DEBUG_MEMORY"', # Note the below smallstackcache tests are crucial coverage for the Linux kernel # module, when targeting a kernel with the randomness patch (linuxkm/patches/) # applied. diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index f9083b92f6..d639f523a4 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -41506,31 +41506,31 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t ed25519_test(void) ERROR_OUT(WC_TEST_RET_ENC_EC(ret), cleanup); #ifdef WOLFSSL_SE050 - #define RARE_ED_BAD_ENC_E WC_HW_E - #define RARE_ED_BAD_SIG_E WC_HW_E + #define RARE_ED_BAD_ENC_E WC_NO_ERR_TRACE(WC_HW_E) + #define RARE_ED_BAD_SIG_E WC_NO_ERR_TRACE(WC_HW_E) #else - #define RARE_ED_BAD_ENC_E BAD_FUNC_ARG - #define RARE_ED_BAD_SIG_E SIG_VERIFY_E + #define RARE_ED_BAD_ENC_E WC_NO_ERR_TRACE(BAD_FUNC_ARG) + #define RARE_ED_BAD_SIG_E WC_NO_ERR_TRACE(SIG_VERIFY_E) #endif ret = wc_ed25519_verify_msg(rareEd1, sizeof(rareEd1), msgs[0], msgSz[0], &verify, key); - if (ret != WC_NO_ERR_TRACE(RARE_ED_BAD_ENC_E)) + if (ret != RARE_ED_BAD_ENC_E) ERROR_OUT(WC_TEST_RET_ENC_EC(ret), cleanup); ret = wc_ed25519_verify_msg(rareEd2, sizeof(rareEd2), msgs[0], msgSz[0], &verify, key); - if (ret != WC_NO_ERR_TRACE(RARE_ED_BAD_ENC_E)) + if (ret != RARE_ED_BAD_ENC_E) ERROR_OUT(WC_TEST_RET_ENC_EC(ret), cleanup); ret = wc_ed25519_verify_msg(rareEd3, sizeof(rareEd3), msgs[0], msgSz[0], &verify, key); - if (ret != WC_NO_ERR_TRACE(RARE_ED_BAD_ENC_E)) + if (ret != RARE_ED_BAD_ENC_E) ERROR_OUT(WC_TEST_RET_ENC_EC(ret), cleanup); ret = wc_ed25519_verify_msg(rareEd4, sizeof(rareEd4), msgs[0], msgSz[0], &verify, key); - if (ret != WC_NO_ERR_TRACE(RARE_ED_BAD_SIG_E)) + if (ret != RARE_ED_BAD_SIG_E) ERROR_OUT(WC_TEST_RET_ENC_EC(ret), cleanup); #undef RARE_ED_BAD_ENC_E