mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sanity check on send fatal alert return

Browse Source
This commit is contained in:
JacobBarthelmeh 2023-06-14 11:08:56 -07:00
parent 82cc988226
commit 9e0c13bbdb
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/internal.c
View File

@ -16065,13 +16065,13 @@ static int DoHandShakeMsg(WOLFSSL* ssl, byte* input, word32* inOutIdx,
#endif /* !WOLFSSL_NO_TLS12 */ #endif /* !WOLFSSL_NO_TLS12 */
#ifdef WOLFSSL_EXTRA_ALERTS #ifdef WOLFSSL_EXTRA_ALERTS
void SendFatalAlertOnly(WOLFSSL *ssl, int error) int SendFatalAlertOnly(WOLFSSL *ssl, int error)
{ {
int why; int why;
/* already sent a more specific fatal alert */ /* already sent a more specific fatal alert */
if (ssl->alert_history.last_tx.level == alert_fatal) if (ssl->alert_history.last_tx.level == alert_fatal)
return; return 0;
switch (error) { switch (error) {
/* not fatal errors */ /* not fatal errors */
@ -16081,12 +16081,12 @@ void SendFatalAlertOnly(WOLFSSL *ssl, int error)
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
case WC_PENDING_E: case WC_PENDING_E:
#endif #endif
return; return 0;
/* peer already disconnected and ssl is possibly in bad state /* peer already disconnected and ssl is possibly in bad state
* don't try to send an alert */ * don't try to send an alert */
case SOCKET_ERROR_E: case SOCKET_ERROR_E:
return; return error;
case BUFFER_ERROR: case BUFFER_ERROR:
case ASN_PARSE_E: case ASN_PARSE_E:
@ -16114,14 +16114,15 @@ void SendFatalAlertOnly(WOLFSSL *ssl, int error)
break; break;
} }
SendAlert(ssl, alert_fatal, why); return SendAlert(ssl, alert_fatal, why);
} }
#else #else
void SendFatalAlertOnly(WOLFSSL *ssl, int error) int SendFatalAlertOnly(WOLFSSL *ssl, int error)
{ {
(void)ssl; (void)ssl;
(void)error; (void)error;
/* no op */ /* no op */
return 0;
} }
#endif /* WOLFSSL_EXTRA_ALERTS */ #endif /* WOLFSSL_EXTRA_ALERTS */
@ -16555,7 +16556,9 @@ int DtlsMsgDrain(WOLFSSL* ssl)
DtlsTxMsgListClean(ssl); DtlsTxMsgListClean(ssl);
} }
else if (!IsAtLeastTLSv1_3(ssl->version)) { else if (!IsAtLeastTLSv1_3(ssl->version)) {
SendFatalAlertOnly(ssl, ret); if (SendFatalAlertOnly(ssl, ret) == SOCKET_ERROR_E) {
ret = SOCKET_ERROR_E;
}
} }
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
if (ret == WC_PENDING_E) { if (ret == WC_PENDING_E) {
@ -19874,8 +19877,12 @@ default:
ssl->buffers.inputBuffer.buffer, ssl->buffers.inputBuffer.buffer,
&ssl->buffers.inputBuffer.idx, &ssl->buffers.inputBuffer.idx,
ssl->buffers.inputBuffer.length); ssl->buffers.inputBuffer.length);
if (ret != 0) if (ret != 0) {
SendFatalAlertOnly(ssl, ret); if (SendFatalAlertOnly(ssl, ret)
== SOCKET_ERROR_E) {
ret = SOCKET_ERROR_E;
}
}
} }
#endif #endif
#ifdef WOLFSSL_DTLS13 #ifdef WOLFSSL_DTLS13
@ -19912,8 +19919,10 @@ default:
ssl->buffers.inputBuffer.buffer, ssl->buffers.inputBuffer.buffer,
&ssl->buffers.inputBuffer.idx, &ssl->buffers.inputBuffer.idx,
ssl->buffers.inputBuffer.length); ssl->buffers.inputBuffer.length);
if (ret != 0) if (ret != 0) {
SendFatalAlertOnly(ssl, ret); if (SendFatalAlertOnly(ssl, ret) == SOCKET_ERROR_E)
ret = SOCKET_ERROR_E;
}
#else #else
ret = BUFFER_ERROR; ret = BUFFER_ERROR;
#endif #endif

2
wolfssl/internal.h
View File

@ -5834,7 +5834,7 @@ WOLFSSL_LOCAL int ReceiveData(WOLFSSL* ssl, byte* output, int sz, int peek);
WOLFSSL_LOCAL int SendFinished(WOLFSSL* ssl); WOLFSSL_LOCAL int SendFinished(WOLFSSL* ssl);
WOLFSSL_LOCAL int RetrySendAlert(WOLFSSL* ssl); WOLFSSL_LOCAL int RetrySendAlert(WOLFSSL* ssl);
WOLFSSL_LOCAL int SendAlert(WOLFSSL* ssl, int severity, int type); WOLFSSL_LOCAL int SendAlert(WOLFSSL* ssl, int severity, int type);
WOLFSSL_LOCAL void SendFatalAlertOnly(WOLFSSL *ssl, int error); WOLFSSL_LOCAL int SendFatalAlertOnly(WOLFSSL *ssl, int error);
WOLFSSL_LOCAL int ProcessReply(WOLFSSL* ssl); WOLFSSL_LOCAL int ProcessReply(WOLFSSL* ssl);
WOLFSSL_LOCAL int ProcessReplyEx(WOLFSSL* ssl, int allowSocketErr); WOLFSSL_LOCAL int ProcessReplyEx(WOLFSSL* ssl, int allowSocketErr);