wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-29 18:27:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to improve read error handling.

Browse Source 
* Improved `GetInputData` handling of non -1 return codes.
* Adds support for handling `WOLFSSL_CBIO_ERR_TIMEOUT` return code in non-DTLS case.
This commit is contained in:
David Garske
2019-06-21 08:37:07 -07:00
parent b957415609
commit ef64cd300c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/internal.c
View File

@ -6900,17 +6900,18 @@ retry:
ssl->options.isClosed = 1;
return -1;
#ifdef WOLFSSL_DTLS
case WOLFSSL_CBIO_ERR_TIMEOUT:
#ifdef WOLFSSL_DTLS
if (IsDtlsNotSctpMode(ssl) &&
!ssl->options.handShakeDone &&
DtlsMsgPoolTimeout(ssl) == 0 &&
DtlsMsgPoolSend(ssl, 0) == 0) {
/* retry read for DTLS during handshake only */
goto retry;
}
return -1;
#endif
return -1;
default:
return recvd;
@ -12864,12 +12865,12 @@ static int GetInputData(WOLFSSL *ssl, word32 size)
ssl->buffers.inputBuffer.buffer +
ssl->buffers.inputBuffer.length,
inSz);
if (in == -1)
return SOCKET_ERROR_E;
if (in == WANT_READ)
return WANT_READ;
if (in < 0)
return SOCKET_ERROR_E;
if (in > inSz)
return RECV_OVERFLOW_E;