Commit e43e6b19 authored by Todd Short's avatar Todd Short Committed by Matt Caswell
Browse files

Fix some minor code nits 



Reviewed-by: default avatarBen Kaduk <kaduk@mit.edu>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4964)
parent 658e4879

ssl/statem/extensions.c

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ static int init_srtp(SSL *s, unsigned int context); 
static int final_sig_algs(SSL *s, unsigned int context, int sent);

static int final_early_data(SSL *s, unsigned int context, int sent);

static int final_maxfragmentlen(SSL *s, unsigned int context, int sent);



static int init_post_handshake_auth(SSL *s, unsigned int context);



/* Structure to define a built-in extension */

ssl/statem/statem_clnt.c

+8 −5
Original line number Diff line number Diff line
@@ -395,15 +395,19 @@ static WRITE_TRAN ossl_statem_client13_write_transition(SSL *s) 
     * ossl_statem_client_write_transition().

     */

    switch (st->hand_state) {

    default:

        /* Shouldn't happen */

        SSLfatal(s, SSL_AD_INTERNAL_ERROR,

                 SSL_F_OSSL_STATEM_CLIENT13_WRITE_TRANSITION,

                 ERR_R_INTERNAL_ERROR);

        return WRITE_TRAN_ERROR;



    case TLS_ST_CR_CERT_REQ:

        if (s->post_handshake_auth == SSL_PHA_REQUESTED) {

            st->hand_state = TLS_ST_CW_CERT;

            return WRITE_TRAN_CONTINUE;

        }

        /* Fall through */



    default:

        /* Shouldn't happen */

        /* Shouldn't happen - same as default case */

        SSLfatal(s, SSL_AD_INTERNAL_ERROR,

                 SSL_F_OSSL_STATEM_CLIENT13_WRITE_TRANSITION,

                 ERR_R_INTERNAL_ERROR);
@@ -3367,7 +3371,6 @@ static int ssl3_check_client_certificate(SSL *s) 
    if (s->cert->cert_flags & SSL_CERT_FLAGS_CHECK_TLS_STRICT &&

        !tls1_check_chain(s, NULL, NULL, NULL, -2))

        return 0;



    return 1;

}