wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-01-28 19:59:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5483 from embhorn/zd14659

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2022-08-22 14:28:29 +02:00
committed by GitHub
parent 26c61f8e0f 3d8562f07b
commit 0dbd0ffb4e
8 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bio.c
View File

@@ -1865,7 +1865,7 @@ int wolfSSL_BIO_meth_set_create(WOLFSSL_BIO_METHOD *biom,
int wolfSSL_BIO_meth_set_destroy(WOLFSSL_BIO_METHOD *biom,
wolfSSL_BIO_meth_destroy_cb biom_destroy)
{
WOLFSSL_STUB("wolfSSL_BIO_meth_set_destroy");
WOLFSSL_ENTER("wolfSSL_BIO_meth_set_destroy");
if (biom) {
biom->freeCb = biom_destroy;
return WOLFSSL_SUCCESS;
@@ -3194,7 +3194,8 @@ void wolfSSL_BIO_clear_retry_flags(WOLFSSL_BIO* bio)
WOLFSSL_ENTER("wolfSSL_BIO_clear_retry_flags");
if (bio)
bio->flags &= ~(WOLFSSL_BIO_FLAG_READ|WOLFSSL_BIO_FLAG_RETRY);
bio->flags &= ~(WOLFSSL_BIO_FLAG_READ | WOLFSSL_BIO_FLAG_WRITE |
WOLFSSL_BIO_FLAG_RETRY);
}
int wolfSSL_BIO_should_retry(WOLFSSL_BIO *bio)

22
src/internal.c
View File

@@ -24585,21 +24585,7 @@ int PickHashSigAlgo(WOLFSSL* ssl, const byte* hashSigAlgo, word32 hashSigAlgoSz)
/* Initialize TimeoutInfo */
void InitTimeoutInfo(TimeoutInfo* info)
{
int i;
info->timeoutName[0] = 0;
info->flags = 0;
for (i = 0; i < MAX_PACKETS_HANDSHAKE; i++) {
info->packets[i].packetName[0] = 0;
info->packets[i].timestamp.tv_sec = 0;
info->packets[i].timestamp.tv_usec = 0;
info->packets[i].bufferValue = 0;
info->packets[i].valueSz = 0;
}
info->numberPackets = 0;
info->timeoutValue.tv_sec = 0;
info->timeoutValue.tv_usec = 0;
XMEMSET(info, 0, sizeof(TimeoutInfo));
}
@@ -24608,12 +24594,12 @@ int PickHashSigAlgo(WOLFSSL* ssl, const byte* hashSigAlgo, word32 hashSigAlgoSz)
{
int i;
(void)heap;
for (i = 0; i < MAX_PACKETS_HANDSHAKE; i++)
for (i = 0; i < MAX_PACKETS_HANDSHAKE; i++) {
if (info->packets[i].bufferValue) {
XFREE(info->packets[i].bufferValue, heap, DYNAMIC_TYPE_INFO);
info->packets[i].bufferValue = 0;
info->packets[i].bufferValue = NULL;
}
}
}
/* Add packet name to previously added packet info */

6
src/ssl.c
View File

@@ -14854,10 +14854,12 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
ssl->timeoutInfo.timeoutValue.tv_usec = timeout.tv_usec;
(toCb)(&ssl->timeoutInfo);
}
/* clean up */
FreeTimeoutInfo(&ssl->timeoutInfo, ssl->heap);
ssl->toInfoOn = 0;
}
/* clean up buffers allocated by AddPacketInfo */
FreeTimeoutInfo(&ssl->timeoutInfo, ssl->heap);
if (hsCb) {
FinishHandShakeInfo(&ssl->handShakeInfo);
(hsCb)(&ssl->handShakeInfo);