Merge pull request #6949 from bigbrett/zd16925

fix WOLFSSL_CALLBACK memory error
This commit is contained in:
JacobBarthelmeh 2023-11-08 23:35:32 -07:00 committed by GitHub
commit 2b1c61a013
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions

View File

@ -3392,7 +3392,14 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
} while (err == WC_PENDING_E);
}
#else
(void)nonBlocking;
if (nonBlocking) {
#ifdef WOLFSSL_DTLS
if (doDTLS) {
wolfSSL_dtls_set_using_nonblock(ssl, 1);
}
#endif
tcp_set_nonblocking(&clientfd);
}
ret = NonBlockingSSL_Accept(ssl);
#endif
#ifdef WOLFSSL_EARLY_DATA

View File

@ -26872,7 +26872,7 @@ int PickHashSigAlgo(WOLFSSL* ssl, const byte* hashSigAlgo, word32 hashSigAlgoSz)
/* add data, put in buffer if bigger than static buffer */
info->packets[info->numberPackets].valueSz = totalSz;
if (totalSz < MAX_VALUE_SZ) {
XMEMCPY(info->packets[info->numberPackets].value, data + lateRL,
XMEMCPY(info->packets[info->numberPackets].value + lateRL, data,
sz);
}
else {