Commit 64f9f406 authored by Matt Caswell's avatar Matt Caswell
Browse files

Handle SSL_shutdown while in init more appropriately #2 



Previous commit 7bb196a7 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 7bb196a7 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: default avatarViktor Dukhovni <viktor@openssl.org>
parent a173a7ee

include/openssl/ssl.h

+0 −1
Original line number Diff line number Diff line
@@ -1993,7 +1993,6 @@ void ERR_load_SSL_strings(void); 
# define SSL_F_SSL3_SETUP_KEY_BLOCK                       157

# define SSL_F_SSL3_SETUP_READ_BUFFER                     156

# define SSL_F_SSL3_SETUP_WRITE_BUFFER                    291

# define SSL_F_SSL3_SHUTDOWN                              396

# define SSL_F_SSL3_WRITE_BYTES                           158

# define SSL_F_SSL3_WRITE_PENDING                         159

# define SSL_F_SSL_ACCEPT                                 390

ssl/s3_lib.c

+0 −15
Original line number Diff line number Diff line
@@ -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

         */

ssl/ssl_err.c

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ static ERR_STRING_DATA SSL_str_functs[] = { 
    {ERR_FUNC(SSL_F_SSL3_SETUP_KEY_BLOCK), "ssl3_setup_key_block"},

    {ERR_FUNC(SSL_F_SSL3_SETUP_READ_BUFFER), "ssl3_setup_read_buffer"},

    {ERR_FUNC(SSL_F_SSL3_SETUP_WRITE_BUFFER), "ssl3_setup_write_buffer"},

    {ERR_FUNC(SSL_F_SSL3_SHUTDOWN), "ssl3_shutdown"},

    {ERR_FUNC(SSL_F_SSL3_WRITE_BYTES), "ssl3_write_bytes"},

    {ERR_FUNC(SSL_F_SSL3_WRITE_PENDING), "ssl3_write_pending"},

    {ERR_FUNC(SSL_F_SSL_ACCEPT), "SSL_accept"},

ssl/ssl_lib.c

+12 −9
Original line number Diff line number Diff line
@@ -1578,6 +1578,7 @@ int SSL_shutdown(SSL *s) 
        return -1;

    }



    if (!SSL_in_init(s)) {

        if((s->mode & SSL_MODE_ASYNC) && ASYNC_get_current_job() == NULL) {

            struct ssl_async_args args;
@@ -1589,8 +1590,10 @@ int SSL_shutdown(SSL *s) 
        } else {

            return s->method->ssl_shutdown(s);

        }



    return s->method->ssl_shutdown(s);

    } else {

        SSLerr(SSL_F_SSL_SHUTDOWN, SSL_R_SHUTDOWN_WHILE_IN_INIT);

        return -1;

    }

}



int SSL_renegotiate(SSL *s)