From 25645b5251b77133c782e26e5ee577bd010b4413 Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Tue, 7 Apr 2026 12:47:02 -0700 Subject: [PATCH 01/10] F-2192 - https://fenrir.wolfssl.com/finding/2192 - Add negative test for AES-SIV authentication tag verification --- wolfcrypt/test/test.c | 23 +++++++++++++++++++++++ wolfssl/version.h | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index ff297d7142f..4dbf2ba912a 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -66715,6 +66715,29 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t aes_siv_test(void) } } + /* Negative test: corrupted SIV must be rejected with AES_SIV_AUTH_E. */ + { + ret = wc_AesSivEncrypt(testVectors[0].key, testVectors[0].keySz, + testVectors[0].assoc1, testVectors[0].assoc1Sz, + testVectors[0].nonce, testVectors[0].nonceSz, + testVectors[0].plaintext, + testVectors[0].plaintextSz, siv, + computedCiphertext); + if (ret != 0) { + return WC_TEST_RET_ENC_EC(ret); + } + /* Corrupt one byte of the SIV tag. */ + siv[0] ^= 0x01; + ret = wc_AesSivDecrypt(testVectors[0].key, testVectors[0].keySz, + testVectors[0].assoc1, testVectors[0].assoc1Sz, + testVectors[0].nonce, testVectors[0].nonceSz, + computedCiphertext, testVectors[0].plaintextSz, + siv, computedPlaintext); + if (ret != AES_SIV_AUTH_E) { + return WC_TEST_RET_ENC_EC(ret); + } + } + return 0; } #endif diff --git a/wolfssl/version.h b/wolfssl/version.h index 903bc3f4fb7..a93c997f466 100644 --- a/wolfssl/version.h +++ b/wolfssl/version.h @@ -28,8 +28,8 @@ extern "C" { #endif -#define LIBWOLFSSL_VERSION_STRING "5.9.0" -#define LIBWOLFSSL_VERSION_HEX 0x05009000 +#define LIBWOLFSSL_VERSION_STRING "5.8.4" +#define LIBWOLFSSL_VERSION_HEX 0x05008004 #ifdef __cplusplus } From 9f1445940e4ed5bb6d848dea15082105d56ea6aa Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Tue, 7 Apr 2026 12:52:04 -0700 Subject: [PATCH 02/10] F-2193 - https://fenrir.wolfssl.com/finding/2193 - Add negative test for ASCON AEAD128 authentication tag verification --- tests/api/test_ascon.c | 33 +++++++++++++++++++++++++++++++ wolfcrypt/test/test.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/tests/api/test_ascon.c b/tests/api/test_ascon.c index 18db754ea6c..661a8ab7444 100644 --- a/tests/api/test_ascon.c +++ b/tests/api/test_ascon.c @@ -180,6 +180,39 @@ int test_ascon_aead128(void) } } + /* Negative test: corrupted tag must be rejected with ASCON_AUTH_E. */ + { + byte key[ASCON_AEAD128_KEY_SZ]; + byte nonce[ASCON_AEAD128_NONCE_SZ]; + byte pt[4] = { 0x00, 0x01, 0x02, 0x03 }; + byte ct[4]; + byte tag[ASCON_AEAD128_TAG_SZ]; + byte buf[4]; + + XMEMSET(key, 0xAA, sizeof(key)); + XMEMSET(nonce, 0xBB, sizeof(nonce)); + + ExpectIntEQ(wc_AsconAEAD128_Init(asconAEAD), 0); + ExpectIntEQ(wc_AsconAEAD128_SetKey(asconAEAD, key), 0); + ExpectIntEQ(wc_AsconAEAD128_SetNonce(asconAEAD, nonce), 0); + ExpectIntEQ(wc_AsconAEAD128_SetAD(asconAEAD, NULL, 0), 0); + ExpectIntEQ(wc_AsconAEAD128_EncryptUpdate(asconAEAD, ct, pt, + sizeof(pt)), 0); + ExpectIntEQ(wc_AsconAEAD128_EncryptFinal(asconAEAD, tag), 0); + + /* Corrupt one byte of the tag. */ + tag[0] ^= 0x01; + + ExpectIntEQ(wc_AsconAEAD128_Init(asconAEAD), 0); + ExpectIntEQ(wc_AsconAEAD128_SetKey(asconAEAD, key), 0); + ExpectIntEQ(wc_AsconAEAD128_SetNonce(asconAEAD, nonce), 0); + ExpectIntEQ(wc_AsconAEAD128_SetAD(asconAEAD, NULL, 0), 0); + ExpectIntEQ(wc_AsconAEAD128_DecryptUpdate(asconAEAD, buf, ct, + sizeof(ct)), 0); + ExpectIntEQ(wc_AsconAEAD128_DecryptFinal(asconAEAD, tag), + ASCON_AUTH_E); + } + wc_AsconAEAD128_Free(asconAEAD); #endif return EXPECT_RESULT(); diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index 4dbf2ba912a..20232572625 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -11009,6 +11009,51 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t ascon_aead128_test(void) } } + /* Negative test: corrupted tag must be rejected with ASCON_AUTH_E. */ + { + byte tkey[ASCON_AEAD128_KEY_SZ]; + byte tnonce[ASCON_AEAD128_NONCE_SZ]; + byte tpt[4] = { 0x00, 0x01, 0x02, 0x03 }; + byte tct[4]; + byte ttag[ASCON_AEAD128_TAG_SZ]; + byte tbuf[4]; + + XMEMSET(tkey, 0xAA, sizeof(tkey)); + XMEMSET(tnonce, 0xBB, sizeof(tnonce)); + + err = wc_AsconAEAD128_Init(&asconAEAD); + if (err != 0) return WC_TEST_RET_ENC_EC(err); + err = wc_AsconAEAD128_SetKey(&asconAEAD, tkey); + if (err != 0) return WC_TEST_RET_ENC_EC(err); + err = wc_AsconAEAD128_SetNonce(&asconAEAD, tnonce); + if (err != 0) return WC_TEST_RET_ENC_EC(err); + err = wc_AsconAEAD128_SetAD(&asconAEAD, NULL, 0); + if (err != 0) return WC_TEST_RET_ENC_EC(err); + err = wc_AsconAEAD128_EncryptUpdate(&asconAEAD, tct, tpt, sizeof(tpt)); + if (err != 0) return WC_TEST_RET_ENC_EC(err); + err = wc_AsconAEAD128_EncryptFinal(&asconAEAD, ttag); + if (err != 0) return WC_TEST_RET_ENC_EC(err); + + /* Corrupt one byte of the tag. */ + ttag[0] ^= 0x01; + + err = wc_AsconAEAD128_Init(&asconAEAD); + if (err != 0) return WC_TEST_RET_ENC_EC(err); + err = wc_AsconAEAD128_SetKey(&asconAEAD, tkey); + if (err != 0) return WC_TEST_RET_ENC_EC(err); + err = wc_AsconAEAD128_SetNonce(&asconAEAD, tnonce); + if (err != 0) return WC_TEST_RET_ENC_EC(err); + err = wc_AsconAEAD128_SetAD(&asconAEAD, NULL, 0); + if (err != 0) return WC_TEST_RET_ENC_EC(err); + err = wc_AsconAEAD128_DecryptUpdate(&asconAEAD, tbuf, tct, sizeof(tct)); + if (err != 0) return WC_TEST_RET_ENC_EC(err); + err = wc_AsconAEAD128_DecryptFinal(&asconAEAD, ttag); + if (err != ASCON_AUTH_E) { + return WC_TEST_RET_ENC_EC(err); + } + wc_AsconAEAD128_Clear(&asconAEAD); + } + return 0; } #endif /* HAVE_ASCON */ From e4daa2b7d788d546ce44ea3bfd7557d103d64462 Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Tue, 7 Apr 2026 12:59:20 -0700 Subject: [PATCH 03/10] F-2194 - https://fenrir.wolfssl.com/finding/2194 - Add negative test for AES Key Unwrap IV verification --- wolfcrypt/test/test.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index 20232572625..bcfe77a010e 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -19381,6 +19381,25 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t aeskeywrap_test(void) return WC_TEST_RET_ENC_I(i); } + /* Negative test: corrupted wrapped data must be rejected with + * BAD_KEYWRAP_IV_E. */ + { + wrapSz = wc_AesKeyWrap(test_wrap[0].kek, test_wrap[0].kekLen, + test_wrap[0].data, test_wrap[0].dataLen, + output, sizeof(output), NULL); + if (wrapSz < 0) + return WC_TEST_RET_ENC_EC(wrapSz); + + /* Corrupt one byte of the wrapped data. */ + output[0] ^= 0x01; + + plainSz = wc_AesKeyUnWrap(test_wrap[0].kek, test_wrap[0].kekLen, + output, (word32)wrapSz, + plain, sizeof(plain), NULL); + if (plainSz != BAD_KEYWRAP_IV_E) + return WC_TEST_RET_ENC_EC(plainSz); + } + return 0; } #endif /* HAVE_AES_KEYWRAP */ From 9bff4465f8227a18aad7cf2a4b56767236d7d3cf Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Tue, 7 Apr 2026 13:01:16 -0700 Subject: [PATCH 04/10] F-2202 - https://fenrir.wolfssl.com/finding/2202 - Add negative test for SRP VerifyPeersProof authentication check --- wolfcrypt/test/test.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index bcfe77a010e..ac724e28da5 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -27675,6 +27675,37 @@ static wc_test_ret_t srp_test_digest(SrpType dgstType) if (!r) r = wc_SrpVerifyPeersProof(cli, serverProof, serverProofSz); + /* Negative test: corrupted proof must be rejected with SRP_VERIFY_E. */ + if (!r) { + int rNeg; + Srp cli2[1]; + + XMEMSET(cli2, 0, sizeof(Srp)); + rNeg = wc_SrpInit_ex(cli2, dgstType, SRP_CLIENT_SIDE, HEAP_HINT, + devId); + if (!rNeg) rNeg = wc_SrpSetUsername(cli2, username, usernameSz); + if (!rNeg) rNeg = wc_SrpSetParams(cli2, N, sizeof(N), + g, sizeof(g), salt, sizeof(salt)); + if (!rNeg) rNeg = wc_SrpSetPassword(cli2, password, passwordSz); + if (!rNeg) rNeg = wc_SrpGetPublic(cli2, clientPubKey, &clientPubKeySz); + if (!rNeg) rNeg = wc_SrpComputeKey(cli2, clientPubKey, clientPubKeySz, + serverPubKey, serverPubKeySz); + if (!rNeg) rNeg = wc_SrpGetProof(cli2, clientProof, &clientProofSz); + + /* Corrupt the server proof before verifying. */ + serverProof[0] ^= 0x01; + if (!rNeg) { + rNeg = wc_SrpVerifyPeersProof(cli2, serverProof, serverProofSz); + if (rNeg != SRP_VERIFY_E) { + r = WC_TEST_RET_ENC_EC(rNeg); + } + } + else { + r = WC_TEST_RET_ENC_EC(rNeg); + } + wc_SrpTerm(cli2); + } + wc_SrpTerm(cli); wc_SrpTerm(srv); From 9022b37727c22eb30ebc27e5a182d7573d899c0d Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Tue, 7 Apr 2026 13:05:30 -0700 Subject: [PATCH 05/10] F-2203 - https://fenrir.wolfssl.com/finding/2203 - Add negative test for ECC ECIES HMAC authentication tag verification --- wolfcrypt/test/test.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index ac724e28da5..f0f74aeeea9 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -39039,6 +39039,15 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t ecc_test_buffers(void) ERROR_OUT(WC_TEST_RET_ENC_EC(ret), done); if (XMEMCMP(plain, in, inLen)) ERROR_OUT(WC_TEST_RET_ENC_NC, done); + + /* Negative test: corrupt HMAC tag in encrypted msg, expect + * HASH_TYPE_E from wc_ecc_decrypt. */ + out[x - 1] ^= 0x01; + y = sizeof(plain); + ret = wc_ecc_decrypt(servKey, tmpKey, out, x, plain, &y, NULL); + if (ret != WC_NO_ERR_TRACE(HASH_TYPE_E)) + ERROR_OUT(WC_TEST_RET_ENC_EC(ret), done); + ret = 0; /* reset ret for following tests */ } #endif From 0b1a986d4e2d795cbac943f7e51bb18e3f71b5bd Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Tue, 7 Apr 2026 13:08:57 -0700 Subject: [PATCH 06/10] F-2207 - https://fenrir.wolfssl.com/finding/2207 - Add ForceZero of ECC private key before free in PKCS#11 --- wolfcrypt/src/wc_pkcs11.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wolfcrypt/src/wc_pkcs11.c b/wolfcrypt/src/wc_pkcs11.c index e44e2a500d1..c23213f4ae9 100644 --- a/wolfcrypt/src/wc_pkcs11.c +++ b/wolfcrypt/src/wc_pkcs11.c @@ -1539,6 +1539,8 @@ static int Pkcs11CreateEccPrivateKey(CK_OBJECT_HANDLE* privateKey, ret = WC_HW_E; } } + if (priv != NULL) + ForceZero(priv, privLen); XFREE(priv, private_key->heap, DYNAMIC_TYPE_TMP_BUFFER); } From 86e1368c4e3ee1cf89c69d7862a801d2972db77d Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Tue, 7 Apr 2026 13:10:12 -0700 Subject: [PATCH 07/10] F-2208 - https://fenrir.wolfssl.com/finding/2208 - Add ForceZero of RSA private exponent before free in Xilinx path --- wolfcrypt/src/rsa.c | 2 ++ wolfssl/version.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wolfcrypt/src/rsa.c b/wolfcrypt/src/rsa.c index 4fb4393f0b4..3ebcd0d43cc 100644 --- a/wolfcrypt/src/rsa.c +++ b/wolfcrypt/src/rsa.c @@ -2212,6 +2212,8 @@ static int wc_RsaFunctionSync(const byte* in, word32 inLen, byte* out, #endif } + if (d != NULL) + ForceZero(d, dSz); XFREE(d, key->heap, DYNAMIC_TYPE_PRIVATE_KEY); } #endif diff --git a/wolfssl/version.h b/wolfssl/version.h index a93c997f466..903bc3f4fb7 100644 --- a/wolfssl/version.h +++ b/wolfssl/version.h @@ -28,8 +28,8 @@ extern "C" { #endif -#define LIBWOLFSSL_VERSION_STRING "5.8.4" -#define LIBWOLFSSL_VERSION_HEX 0x05008004 +#define LIBWOLFSSL_VERSION_STRING "5.9.0" +#define LIBWOLFSSL_VERSION_HEX 0x05009000 #ifdef __cplusplus } From 7e9e355279eef3467f060ee88b925a2e8da7afdb Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Tue, 7 Apr 2026 13:34:46 -0700 Subject: [PATCH 08/10] Use small stack so we dont exeed stack limit on linux cases --- wolfcrypt/test/test.c | 64 +++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 23 deletions(-) diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index f0f74aeeea9..3ee2b11cbe5 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -27678,32 +27678,50 @@ static wc_test_ret_t srp_test_digest(SrpType dgstType) /* Negative test: corrupted proof must be rejected with SRP_VERIFY_E. */ if (!r) { int rNeg; - Srp cli2[1]; - - XMEMSET(cli2, 0, sizeof(Srp)); - rNeg = wc_SrpInit_ex(cli2, dgstType, SRP_CLIENT_SIDE, HEAP_HINT, - devId); - if (!rNeg) rNeg = wc_SrpSetUsername(cli2, username, usernameSz); - if (!rNeg) rNeg = wc_SrpSetParams(cli2, N, sizeof(N), - g, sizeof(g), salt, sizeof(salt)); - if (!rNeg) rNeg = wc_SrpSetPassword(cli2, password, passwordSz); - if (!rNeg) rNeg = wc_SrpGetPublic(cli2, clientPubKey, &clientPubKeySz); - if (!rNeg) rNeg = wc_SrpComputeKey(cli2, clientPubKey, clientPubKeySz, - serverPubKey, serverPubKeySz); - if (!rNeg) rNeg = wc_SrpGetProof(cli2, clientProof, &clientProofSz); - - /* Corrupt the server proof before verifying. */ - serverProof[0] ^= 0x01; - if (!rNeg) { - rNeg = wc_SrpVerifyPeersProof(cli2, serverProof, serverProofSz); - if (rNeg != SRP_VERIFY_E) { + #if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC) + Srp* cli2 = (Srp*)XMALLOC(sizeof *cli2, HEAP_HINT, + DYNAMIC_TYPE_TMP_BUFFER); + if (cli2 == NULL) { + r = WC_TEST_RET_ENC_NC; + } + #else + Srp cli2_buf[1]; + Srp* cli2 = cli2_buf; + #endif + if (!r) { + XMEMSET(cli2, 0, sizeof *cli2); + rNeg = wc_SrpInit_ex(cli2, dgstType, SRP_CLIENT_SIDE, HEAP_HINT, + devId); + if (!rNeg) rNeg = wc_SrpSetUsername(cli2, username, usernameSz); + if (!rNeg) rNeg = wc_SrpSetParams(cli2, N, sizeof(N), + g, sizeof(g), salt, + sizeof(salt)); + if (!rNeg) rNeg = wc_SrpSetPassword(cli2, password, passwordSz); + if (!rNeg) rNeg = wc_SrpGetPublic(cli2, clientPubKey, + &clientPubKeySz); + if (!rNeg) rNeg = wc_SrpComputeKey(cli2, clientPubKey, + clientPubKeySz, serverPubKey, + serverPubKeySz); + if (!rNeg) rNeg = wc_SrpGetProof(cli2, clientProof, + &clientProofSz); + + /* Corrupt the server proof before verifying. */ + serverProof[0] ^= 0x01; + if (!rNeg) { + rNeg = wc_SrpVerifyPeersProof(cli2, serverProof, + serverProofSz); + if (rNeg != SRP_VERIFY_E) { + r = WC_TEST_RET_ENC_EC(rNeg); + } + } + else { r = WC_TEST_RET_ENC_EC(rNeg); } + wc_SrpTerm(cli2); } - else { - r = WC_TEST_RET_ENC_EC(rNeg); - } - wc_SrpTerm(cli2); + #if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC) + XFREE(cli2, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); + #endif } wc_SrpTerm(cli); From df9e55664a6c3a0e576eff3c3d8a9c79b70e22b5 Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Tue, 7 Apr 2026 14:01:53 -0700 Subject: [PATCH 09/10] Reset sizes consumed by the first exchange --- wolfcrypt/test/test.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index 3ee2b11cbe5..78b51c7671e 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -27690,6 +27690,9 @@ static wc_test_ret_t srp_test_digest(SrpType dgstType) #endif if (!r) { XMEMSET(cli2, 0, sizeof *cli2); + /* Reset sizes consumed by the first exchange. */ + clientPubKeySz = SRP_TEST_BUFFER_SIZE; + clientProofSz = SRP_MAX_DIGEST_SIZE; rNeg = wc_SrpInit_ex(cli2, dgstType, SRP_CLIENT_SIDE, HEAP_HINT, devId); if (!rNeg) rNeg = wc_SrpSetUsername(cli2, username, usernameSz); From 6528eb37fdd7287f2c65f8335916a1fcac144c2d Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Tue, 7 Apr 2026 15:30:14 -0700 Subject: [PATCH 10/10] Add WC_NO_ERR_TRACE --- tests/api/test_ascon.c | 2 +- wolfcrypt/test/test.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/api/test_ascon.c b/tests/api/test_ascon.c index 661a8ab7444..ecb2e2c8aa9 100644 --- a/tests/api/test_ascon.c +++ b/tests/api/test_ascon.c @@ -210,7 +210,7 @@ int test_ascon_aead128(void) ExpectIntEQ(wc_AsconAEAD128_DecryptUpdate(asconAEAD, buf, ct, sizeof(ct)), 0); ExpectIntEQ(wc_AsconAEAD128_DecryptFinal(asconAEAD, tag), - ASCON_AUTH_E); + WC_NO_ERR_TRACE(ASCON_AUTH_E)); } wc_AsconAEAD128_Free(asconAEAD); diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index 78b51c7671e..8b52920eedb 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -11048,7 +11048,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t ascon_aead128_test(void) err = wc_AsconAEAD128_DecryptUpdate(&asconAEAD, tbuf, tct, sizeof(tct)); if (err != 0) return WC_TEST_RET_ENC_EC(err); err = wc_AsconAEAD128_DecryptFinal(&asconAEAD, ttag); - if (err != ASCON_AUTH_E) { + if (err != WC_NO_ERR_TRACE(ASCON_AUTH_E)) { return WC_TEST_RET_ENC_EC(err); } wc_AsconAEAD128_Clear(&asconAEAD); @@ -19396,7 +19396,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t aeskeywrap_test(void) plainSz = wc_AesKeyUnWrap(test_wrap[0].kek, test_wrap[0].kekLen, output, (word32)wrapSz, plain, sizeof(plain), NULL); - if (plainSz != BAD_KEYWRAP_IV_E) + if (plainSz != WC_NO_ERR_TRACE(BAD_KEYWRAP_IV_E)) return WC_TEST_RET_ENC_EC(plainSz); } @@ -27713,7 +27713,7 @@ static wc_test_ret_t srp_test_digest(SrpType dgstType) if (!rNeg) { rNeg = wc_SrpVerifyPeersProof(cli2, serverProof, serverProofSz); - if (rNeg != SRP_VERIFY_E) { + if (rNeg != WC_NO_ERR_TRACE(SRP_VERIFY_E)) { r = WC_TEST_RET_ENC_EC(rNeg); } } @@ -66858,7 +66858,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t aes_siv_test(void) testVectors[0].nonce, testVectors[0].nonceSz, computedCiphertext, testVectors[0].plaintextSz, siv, computedPlaintext); - if (ret != AES_SIV_AUTH_E) { + if (ret != WC_NO_ERR_TRACE(AES_SIV_AUTH_E)) { return WC_TEST_RET_ENC_EC(ret); } }