diff options
| author | Matt Caswell <matt@openssl.org> | 2016-02-02 10:05:43 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-02-08 09:29:29 +0000 |
| commit | 64f9f40696f993406e53c16d7c9d815004afd8ad (patch) | |
| tree | c743ac4b05506b4fc7dd01cc72b01172322aba88 /ssl/s3_lib.c | |
| parent | a173a7ee3f51af71c27490247f9a65ff03553e2c (diff) | |
Handle SSL_shutdown while in init more appropriately #2
Previous commit 7bb196a71 attempted to "fix" a problem with the way
SSL_shutdown() behaved whilst in mid-handshake. The original behaviour had
SSL_shutdown() return immediately having taken no action if called mid-
handshake with a return value of 1 (meaning everything was shutdown
successfully). In fact the shutdown has not been successful.
Commit 7bb196a71 changed that to send a close_notify anyway and then
return. This seems to be causing some problems for some applications so
perhaps a better (much simpler) approach is revert to the previous
behaviour (no attempt at a shutdown), but return -1 (meaning the shutdown
was not successful).
This also fixes a bug where SSL_shutdown always returns 0 when shutdown
*very* early in the handshake (i.e. we are still using SSLv23_method).
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 5252d04cb5..1121b8b5b9 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -4327,21 +4327,6 @@ int ssl3_shutdown(SSL *s) return (ret); } } 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 */ |