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

don't return closed alert if peer sends fatal alert; respond to closed alert with closed alert

Browse Source
This commit is contained in:
John Safranek
2013-04-01 13:37:25 -07:00
parent a572967017
commit 44352b5673
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/internal.c
View File

@@ -4154,6 +4154,9 @@ static int DoAlert(CYASSL* ssl, byte* input, word32* inOutIdx, int* type)
ssl->alert_history.last_rx.code = code; ssl->alert_history.last_rx.code = code;
ssl->alert_history.last_rx.level = level; ssl->alert_history.last_rx.level = level;
*type = code; *type = code;
if (level == alert_fatal) {
ssl->options.isClosed = 1; /* Don't send close_notify */
}
CYASSL_MSG("Got alert"); CYASSL_MSG("Got alert");
if (*type == close_notify) { if (*type == close_notify) {
@@ -5180,7 +5183,6 @@ int ReceiveData(CYASSL* ssl, byte* output, int sz, int peek)
CYASSL_ERROR(ssl->error); CYASSL_ERROR(ssl->error);
if (ssl->error == ZERO_RETURN) { if (ssl->error == ZERO_RETURN) {
CYASSL_MSG("Zero return, no more data coming"); CYASSL_MSG("Zero return, no more data coming");
ssl->options.isClosed = 1; /* Don't send close_notify */
return 0; /* no more data coming */ return 0; /* no more data coming */
} }
if (ssl->error == SOCKET_ERROR_E) { if (ssl->error == SOCKET_ERROR_E) {
@@ -5248,6 +5250,9 @@ int SendAlert(CYASSL* ssl, int severity, int type)
input[1] = (byte)type; input[1] = (byte)type;
ssl->alert_history.last_tx.code = type; ssl->alert_history.last_tx.code = type;
ssl->alert_history.last_tx.level = severity; ssl->alert_history.last_tx.level = severity;
if (severity == alert_fatal) {
ssl->options.isClosed = 1; /* Don't send close_notify */
}
/* only send encrypted alert if handshake actually complete, otherwise /* only send encrypted alert if handshake actually complete, otherwise
other side may not be able to handle it */ other side may not be able to handle it */