Handle SSL_shutdown while in init more appropriately
Calling SSL_shutdown while in init previously gave a "1" response, meaning everything was successfully closed down (even though it wasn't). Better is to send our close_notify, but fail when trying to receive one. The problem with doing a shutdown while in the middle of a handshake is that once our close_notify is sent we shouldn't really do anything else (including process handshake/CCS messages) until we've received a close_notify back from the peer. However the peer might send a CCS before acting on our close_notify - so we won't be able to read it because we're not acting on CCS messages! Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
15
ssl/s3_lib.c
15
ssl/s3_lib.c
@@ -4340,6 +4340,21 @@ int ssl3_shutdown(SSL *s)
|
||||
}
|
||||
#endif
|
||||
} else if (!(s->shutdown & SSL_RECEIVED_SHUTDOWN)) {
|
||||
if (SSL_in_init(s)) {
|
||||
/*
|
||||
* We can't shutdown properly if we are in the middle of a
|
||||
* handshake. Doing so is problematic because the peer may send a
|
||||
* CCS before it acts on our close_notify. However we should not
|
||||
* continue to process received handshake messages or CCS once our
|
||||
* close_notify has been sent. Therefore any close_notify from
|
||||
* the peer will be unreadable because we have not moved to the next
|
||||
* cipher state. Its best just to avoid this can-of-worms. Return
|
||||
* an error if we are wanting to wait for a close_notify from the
|
||||
* peer and we are in init.
|
||||
*/
|
||||
SSLerr(SSL_F_SSL3_SHUTDOWN, SSL_R_SHUTDOWN_WHILE_IN_INIT);
|
||||
return -1;
|
||||
}
|
||||
/*
|
||||
* If we are waiting for a close from our peer, we are closed
|
||||
*/
|
||||
|
Reference in New Issue
Block a user