Commit 229185e6 authored by Matt Caswell's avatar Matt Caswell
Browse files

Remove the special case processing for finished construction 



tls_construct_finished() used to have different arguments to all of the
other construction functions. It doesn't anymore, so there is no neeed to
treat it as a special case.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 4a01c59f

ssl/statem/statem_clnt.c

+5 −17
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ int ossl_statem_client_construct_message(SSL *s, WPACKET *pkt) 
{

    OSSL_STATEM *st = &s->statem;

    int (*confunc) (SSL *s, WPACKET *pkt) = NULL;

    int ret = 1, mt;

    int mt;



    switch (st->hand_state) {

    default:
@@ -556,26 +556,14 @@ int ossl_statem_client_construct_message(SSL *s, WPACKET *pkt) 
        break;

#endif

    case TLS_ST_CW_FINISHED:

        confunc = tls_construct_finished;

        mt = SSL3_MT_FINISHED;

        break;

    }



    if (!ssl_set_handshake_header(s, pkt, mt)) {

        SSLerr(SSL_F_OSSL_STATEM_CLIENT_CONSTRUCT_MESSAGE,

               ERR_R_INTERNAL_ERROR);

        return 0;

    }



    if (st->hand_state == TLS_ST_CW_FINISHED)

        ret = tls_construct_finished(s, pkt,

                                     s->method->

                                     ssl3_enc->client_finished_label,

                                     s->method->

                                     ssl3_enc->client_finished_label_len);

    else

        ret = confunc(s, pkt);



    if (!ret || !ssl_close_construct_packet(s, pkt, mt)) {

    if (!ssl_set_handshake_header(s, pkt, mt)

            || !confunc(s, pkt)

            || !ssl_close_construct_packet(s, pkt, mt)) {

        SSLerr(SSL_F_OSSL_STATEM_CLIENT_CONSTRUCT_MESSAGE,

               ERR_R_INTERNAL_ERROR);

        return 0;

ssl/statem/statem_lib.c

+11 −1
Original line number Diff line number Diff line
@@ -71,9 +71,19 @@ int tls_close_construct_packet(SSL *s, WPACKET *pkt, int htype) 
    return 1;

}



int tls_construct_finished(SSL *s, WPACKET *pkt, const char *sender, int slen)

int tls_construct_finished(SSL *s, WPACKET *pkt)

{

    int i;

    const char *sender;

    int slen;



    if (s->server) {

        sender = s->method->ssl3_enc->server_finished_label;

        slen = s->method->ssl3_enc->server_finished_label_len;

    } else {

        sender = s->method->ssl3_enc->client_finished_label;

        slen = s->method->ssl3_enc->client_finished_label_len;

    }



    i = s->method->ssl3_enc->final_finish_mac(s,

                                              sender, slen,

ssl/statem/statem_locl.h

+1 −2
Original line number Diff line number Diff line
@@ -78,8 +78,7 @@ __owur MSG_PROCESS_RETURN tls_process_finished(SSL *s, PACKET *pkt); 
__owur int tls_construct_change_cipher_spec(SSL *s, WPACKET *pkt);

__owur int dtls_construct_change_cipher_spec(SSL *s, WPACKET *pkt);



__owur int tls_construct_finished(SSL *s, WPACKET *pkt, const char *sender,

                                  int slen);

__owur int tls_construct_finished(SSL *s, WPACKET *pkt);

__owur WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst);

__owur WORK_STATE dtls_wait_for_dry(SSL *s);

ssl/statem/statem_srvr.c

+5 −17
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ int ossl_statem_server_construct_message(SSL *s, WPACKET *pkt) 
{

    OSSL_STATEM *st = &s->statem;

    int (*confunc) (SSL *s, WPACKET *pkt) = NULL;

    int ret = 1, mt;

    int mt;



    switch (st->hand_state) {

    default:
@@ -684,26 +684,14 @@ int ossl_statem_server_construct_message(SSL *s, WPACKET *pkt) 
        break;



    case TLS_ST_SW_FINISHED:

        confunc = tls_construct_finished;

        mt = SSL3_MT_FINISHED;

        break;

    }



    if (!ssl_set_handshake_header(s, pkt, mt)) {

        SSLerr(SSL_F_OSSL_STATEM_SERVER_CONSTRUCT_MESSAGE,

               ERR_R_INTERNAL_ERROR);

        return 0;

    }



    if (st->hand_state == TLS_ST_SW_FINISHED)

        ret = tls_construct_finished(s, pkt,

                                     s->method->

                                     ssl3_enc->server_finished_label,

                                     s->method->

                                     ssl3_enc->server_finished_label_len);

    else if (confunc != NULL)

        ret = confunc(s, pkt);



    if (!ret || !ssl_close_construct_packet(s, pkt, mt)) {

    if (!ssl_set_handshake_header(s, pkt, mt)

            || (confunc != NULL && !confunc(s, pkt))

            || !ssl_close_construct_packet(s, pkt, mt)) {

        SSLerr(SSL_F_OSSL_STATEM_SERVER_CONSTRUCT_MESSAGE,

               ERR_R_INTERNAL_ERROR);

        return 0;