Commit c2c1d8a4 authored by Matt Caswell's avatar Matt Caswell
Browse files

Call the info callback on all handshake done events 



Fixes #5721

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5874)
parent ded4a83d

ssl/statem/statem_lib.c

+12 −5
Original line number Diff line number Diff line
@@ -1033,6 +1033,10 @@ WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst, int clearbufs, int stop) 
            && s->post_handshake_auth == SSL_PHA_REQUESTED)

        s->post_handshake_auth = SSL_PHA_EXT_SENT;



    /*

     * Only set if there was a Finished message and this isn't after a TLSv1.3

     * post handshake exchange

     */

    if (s->statem.cleanuphand) {

        /* skipped if we just sent a HelloRequest */

        s->renegotiate = 0;
@@ -1069,11 +1073,6 @@ WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst, int clearbufs, int stop) 
                              &discard, s->session_ctx->lock);

        }



        if (s->info_callback != NULL)

            cb = s->info_callback;

        else if (s->ctx->info_callback != NULL)

            cb = s->ctx->info_callback;



        if (cb != NULL)

            cb(s, SSL_CB_HANDSHAKE_DONE, 1);
@@ -1086,6 +1085,14 @@ WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst, int clearbufs, int stop) 
        }

    }



    if (s->info_callback != NULL)

        cb = s->info_callback;

    else if (s->ctx->info_callback != NULL)

        cb = s->ctx->info_callback;



    if (cb != NULL)

        cb(s, SSL_CB_HANDSHAKE_DONE, 1);



    if (!stop)

        return WORK_FINISHED_CONTINUE;