Skip to content

Regression test fixes #8677

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.

Sign up for GitHub

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

Merged
dgarske merged 2 commits into from
Apr 17, 2025
Merged

Regression test fixes #8677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ac05de
Regression test fixes
SparkiDev Apr 16, 2025
4f3ce18
Memory Zero checks: add check call
SparkiDev Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/dtls13.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1545,11 +1545,14 @@ static int Dtls13RtxSendBuffered(WOLFSSL* ssl)
byte* output;
int isLast;
int sendSz;
#ifndef NO_ASN_TIME
word32 now;
#endif
int ret;

WOLFSSL_ENTER("Dtls13RtxSendBuffered");

#ifndef NO_ASN_TIME
now = LowResTimer();
if (now - ssl->dtls13Rtx.lastRtx < DTLS13_MIN_RTX_INTERVAL) {
#ifdef WOLFSSL_DEBUG_TLS
Expand All @@ -1559,6 +1562,7 @@ static int Dtls13RtxSendBuffered(WOLFSSL* ssl)
}

ssl->dtls13Rtx.lastRtx = now;
#endif

r = ssl->dtls13Rtx.rtxRecords;
prevNext = &ssl->dtls13Rtx.rtxRecords;
Expand Down Expand Up @@ -1955,6 +1959,9 @@ int Dtls13DeriveSnKeys(WOLFSSL* ssl, int provision)

end:
ForceZero(key_dig, MAX_PRF_DIG);
#ifdef WOLFSSL_CHECK_MEM_ZERO
wc_MemZero_Check(key_dig, sizeof(key_dig));
#endif
return ret;
}

Expand Down
6 changes: 6 additions & 0 deletions tests/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47887,6 +47887,12 @@ static int test_tls13_apis(void)
#elif defined(HAVE_ECC)
const char* ourCert = eccCertFile;
const char* ourKey = eccKeyFile;
#elif defined(HAVE_ED25519)
const char* ourCert = edCertFile;
const char* ourKey = edKeyFile;
#elif defined(HAVE_ED448)
const char* ourCert = ed448CertFile;
const char* ourKey = ed448KeyFile;
#endif
#endif
#endif
Expand Down
5 changes: 3 additions & 2 deletions wolfcrypt/src/asn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38392,7 +38392,8 @@ static int DecodeBasicOcspResponse(byte* source, word32* ioIndex,
if (DecodeCerts(source, &idx, resp, size) < 0)
return ASN_PARSE_E;

ret = OcspCheckCert(resp, noVerify, noVerifySignature, cm, heap);
ret = OcspCheckCert(resp, noVerify, noVerifySignature,
(WOLFSSL_CERT_MANAGER*)cm, heap);
if (ret == 0) {
sigValid = 1;
}
Expand All @@ -38407,7 +38408,7 @@ static int DecodeBasicOcspResponse(byte* source, word32* ioIndex,
if (!noVerifySignature && !sigValid) {
Signer* ca;
SignatureCtx sigCtx;
ca = OcspFindSigner(resp, cm);
ca = OcspFindSigner(resp, (WOLFSSL_CERT_MANAGER*)cm);
if (ca == NULL)
return ASN_NO_SIGNER_E;

Expand Down
4 changes: 2 additions & 2 deletions wolfssl/wolfcrypt/mem_track.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ static WC_INLINE int StackSizeCheck(struct func_args* args, thread_func tf)
#endif

#ifdef PTHREAD_STACK_MIN
if (stackSize < PTHREAD_STACK_MIN)
if (stackSize < (size_t)PTHREAD_STACK_MIN)
stackSize = PTHREAD_STACK_MIN;
#endif

Expand Down Expand Up @@ -677,7 +677,7 @@ static WC_INLINE int StackSizeCheck_launch(struct func_args* args,
struct stack_size_debug_context* shim_args;

#ifdef PTHREAD_STACK_MIN
if (stackSize < PTHREAD_STACK_MIN)
if (stackSize < (size_t)PTHREAD_STACK_MIN)
stackSize = PTHREAD_STACK_MIN;
#endif

Expand Down