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

internal: move SendAlerts outside of GetRecordHeader

Browse Source 
This will give a chance to DTLS logic to ignore an error.
This commit is contained in:
Marco Oliverio
2023-03-09 09:48:33 +00:00
parent aabd665e73
commit 84d8245e58
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/internal.c
View File

@@ -10530,9 +10530,6 @@ static int GetRecordHeader(WOLFSSL* ssl, word32* inOutIdx,
#endif /* WOLFSSL_DTLS13 */ #endif /* WOLFSSL_DTLS13 */
else { else {
WOLFSSL_MSG("SSL version error"); WOLFSSL_MSG("SSL version error");
/* send alert per RFC5246 Appendix E. Backward Compatibility */
if (ssl->options.side == WOLFSSL_CLIENT_END)
SendAlert(ssl, alert_fatal, wolfssl_alert_protocol_version);
WOLFSSL_ERROR_VERBOSE(VERSION_ERROR); WOLFSSL_ERROR_VERBOSE(VERSION_ERROR);
return VERSION_ERROR; /* only use requested version */ return VERSION_ERROR; /* only use requested version */
} }
@@ -10541,7 +10538,6 @@ static int GetRecordHeader(WOLFSSL* ssl, word32* inOutIdx,
/* record layer length check */ /* record layer length check */
#ifdef HAVE_MAX_FRAGMENT #ifdef HAVE_MAX_FRAGMENT
if (*size > (ssl->max_fragment + MAX_COMP_EXTRA + MAX_MSG_EXTRA)) { if (*size > (ssl->max_fragment + MAX_COMP_EXTRA + MAX_MSG_EXTRA)) {
SendAlert(ssl, alert_fatal, record_overflow);
WOLFSSL_ERROR_VERBOSE(LENGTH_ERROR); WOLFSSL_ERROR_VERBOSE(LENGTH_ERROR);
return LENGTH_ERROR; return LENGTH_ERROR;
} }
@@ -19351,8 +19347,25 @@ int ProcessReplyEx(WOLFSSL* ssl, int allowSocketErr)
continue; continue;
} }
#endif #endif
if (ret != 0) if (ret != 0) {
switch (ret) {
case VERSION_ERROR:
/* send alert per RFC5246 Appendix E. Backward
* Compatibility */
if (ssl->options.side == WOLFSSL_CLIENT_END)
SendAlert(ssl, alert_fatal,
wolfssl_alert_protocol_version);
break;
#ifdef HAVE_MAX_FRAGMENT
case LENGTH_ERROR:
SendAlert(ssl, alert_fatal, record_overflow);
break;
#endif /* HAVE_MAX_FRAGMENT */
default:
break;
}
return ret; return ret;
}
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
if (IsAtLeastTLSv1_3(ssl->version) && IsEncryptionOn(ssl, 0) && if (IsAtLeastTLSv1_3(ssl->version) && IsEncryptionOn(ssl, 0) &&