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

Fix for case with ssl->error not being set.

Browse Source
This commit is contained in:
David Garske
2020-08-12 10:00:10 -07:00
parent 03b7ac559a
commit 5f059306fd
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

@@ -17642,7 +17642,8 @@ int SendData(WOLFSSL* ssl, const void* data, int sz)
if (ssl->earlyData != no_early_data) { if (ssl->earlyData != no_early_data) {
if (ssl->options.handShakeState == HANDSHAKE_DONE) { if (ssl->options.handShakeState == HANDSHAKE_DONE) {
WOLFSSL_MSG("handshake complete, trying to send early data"); WOLFSSL_MSG("handshake complete, trying to send early data");
return BUILD_MSG_ERROR; ssl->error = BUILD_MSG_ERROR;
return WOLFSSL_FATAL_ERROR;
} }
#ifdef WOLFSSL_EARLY_DATA_GROUP #ifdef WOLFSSL_EARLY_DATA_GROUP
groupMsgs = 1; groupMsgs = 1;
@@ -17830,7 +17831,7 @@ int ReceiveData(WOLFSSL* ssl, byte* output, int sz, int peek)
return WOLFSSL_CBIO_ERR_WANT_READ; return WOLFSSL_CBIO_ERR_WANT_READ;
} }
#endif #endif
return err; return err;
} }
} }
@@ -17840,7 +17841,7 @@ startScr:
int err; int err;
WOLFSSL_MSG("Need to start scr, server requested"); WOLFSSL_MSG("Need to start scr, server requested");
if ( (err = wolfSSL_Rehandshake(ssl)) != WOLFSSL_SUCCESS) if ( (err = wolfSSL_Rehandshake(ssl)) != WOLFSSL_SUCCESS)
return err; return err;
ssl->secure_renegotiation->startScr = 0; /* only start once */ ssl->secure_renegotiation->startScr = 0; /* only start once */
} }
#endif #endif
@@ -17850,14 +17851,14 @@ startScr:
WOLFSSL_ERROR(ssl->error); WOLFSSL_ERROR(ssl->error);
if (ssl->error == ZERO_RETURN) { if (ssl->error == ZERO_RETURN) {
WOLFSSL_MSG("Zero return, no more data coming"); WOLFSSL_MSG("Zero return, no more data coming");
return 0; /* no more data coming */ return 0; /* no more data coming */
} }
if (ssl->error == SOCKET_ERROR_E) { if (ssl->error == SOCKET_ERROR_E) {
if (ssl->options.connReset || ssl->options.isClosed) { if (ssl->options.connReset || ssl->options.isClosed) {
WOLFSSL_MSG("Peer reset or closed, connection done"); WOLFSSL_MSG("Peer reset or closed, connection done");
ssl->error = SOCKET_PEER_CLOSED_E; ssl->error = SOCKET_PEER_CLOSED_E;
WOLFSSL_ERROR(ssl->error); WOLFSSL_ERROR(ssl->error);
return 0; /* peer reset or closed */ return 0; /* peer reset or closed */
} }
} }
return ssl->error; return ssl->error;