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

Merge pull request #2663 from embhorn/zd5050

Browse Source 
Clarify wolfSSL_shutdown error on subsequent calls
This commit is contained in:
toddouska
2019-12-17 14:59:35 -08:00
committed by GitHub
parent ab14a26be0 51d5abd63f
commit 06e5e81b1b
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/internal.c
View File

@ -17303,6 +17303,9 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e)
case CLIENT_CERT_CB_ERROR: case CLIENT_CERT_CB_ERROR:
return "Error importing client cert or key from callback"; return "Error importing client cert or key from callback";
case SSL_SHUTDOWN_ALREADY_DONE_E:
return "Shutdown has already occurred";
default : default :
return "unknown error number"; return "unknown error number";
} }

8
src/ssl.c
View File

@ -2884,6 +2884,14 @@ int wolfSSL_shutdown(WOLFSSL* ssl)
} }
} }
#ifdef WOLFSSL_SHUTDOWNONCE
if (ssl->options.isClosed || ssl->options.connReset) {
/* Shutdown has already occurred.
* Caller is free to ignore this error. */
return SSL_SHUTDOWN_ALREADY_DONE_E;
}
#endif
/* call wolfSSL_shutdown again for bidirectional shutdown */ /* call wolfSSL_shutdown again for bidirectional shutdown */
if (ssl->options.sentNotify && !ssl->options.closeNotify) { if (ssl->options.sentNotify && !ssl->options.closeNotify) {
ret = wolfSSL_read(ssl, &tmp, 0); ret = wolfSSL_read(ssl, &tmp, 0);

2
wolfssl/error-ssl.h
View File

@ -165,6 +165,8 @@ enum wolfSSL_ErrorCodes {
TCA_ABSENT_ERROR = -434, /* TLSX TCA ID no response */ TCA_ABSENT_ERROR = -434, /* TLSX TCA ID no response */
TSIP_MAC_DIGSZ_E = -435, /* Invalid MAC size for TSIP */ TSIP_MAC_DIGSZ_E = -435, /* Invalid MAC size for TSIP */
CLIENT_CERT_CB_ERROR = -436, /* Client cert callback error */ CLIENT_CERT_CB_ERROR = -436, /* Client cert callback error */
SSL_SHUTDOWN_ALREADY_DONE_E = -437, /* Shutdown called redundantly */
/* add strings to wolfSSL_ERR_reason_error_string in internal.c !!!!! */ /* add strings to wolfSSL_ERR_reason_error_string in internal.c !!!!! */
/* begin negotiation parameter errors */ /* begin negotiation parameter errors */