feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #5327 from kareem-wolfssl/connectRetFix

Browse Source 
Fix storage of SendBuffered's return code in wolfSSL_Connect.
This commit is contained in:
David Garske
2022-07-06 17:53:04 -07:00
committed by GitHub
parent b2d1bf96ed 44a49aeefa
commit 90c2f4ad00
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dtls13.c
View File

@ -1969,7 +1969,7 @@ int Dtls13SetRecordNumberKeys(WOLFSSL* ssl, enum encrypt_side side)
{ {
RecordNumberCiphers* enc = NULL; RecordNumberCiphers* enc = NULL;
RecordNumberCiphers* dec = NULL; RecordNumberCiphers* dec = NULL;
byte *encKey, *decKey; byte *encKey = NULL, *decKey = NULL;
int ret; int ret;
if (ssl == NULL) { if (ssl == NULL) {

6
src/ssl.c
View File

@ -11983,7 +11983,8 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
&& ssl->error != WC_PENDING_E && ssl->error != WC_PENDING_E
#endif #endif
) { ) {
if ( (ssl->error = SendBuffered(ssl)) == 0) { ret = SendBuffered(ssl);
if (ret == 0) {
if (ssl->fragOffset == 0 && !ssl->options.buildingMsg) { if (ssl->fragOffset == 0 && !ssl->options.buildingMsg) {
if (advanceState) { if (advanceState) {
ssl->options.connectState++; ssl->options.connectState++;
@ -12501,7 +12502,8 @@ int wolfSSL_DTLS_SetCookieSecret(WOLFSSL* ssl,
&& ssl->error != WC_PENDING_E && ssl->error != WC_PENDING_E
#endif #endif
) { ) {
if ( (ret = SendBuffered(ssl)) == 0) { ret = SendBuffered(ssl);
if (ret == 0) {
/* fragOffset is non-zero when sending fragments. On the last /* fragOffset is non-zero when sending fragments. On the last
* fragment, fragOffset is zero again, and the state can be * fragment, fragOffset is zero again, and the state can be
* advanced. */ * advanced. */