Commit 85fb6fda authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

remove unnecessary NULL checks 



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

ssl/s3_enc.c

+1 −2
Original line number Diff line number Diff line
@@ -477,7 +477,6 @@ void ssl3_cleanup_key_block(SSL *s) 
void ssl3_init_finished_mac(SSL *s)

{

    BIO_free(s->s3->handshake_buffer);

    if (s->s3->handshake_dgst)

    ssl3_free_digest_list(s);

    s->s3->handshake_buffer = BIO_new(BIO_s_mem());

    (void)BIO_set_close(s->s3->handshake_buffer, BIO_CLOSE);

ssl/s3_lib.c

+2 −5
Original line number Diff line number Diff line
@@ -2906,7 +2906,6 @@ void ssl3_free(SSL *s) 
    OPENSSL_clear_free(s->s3->tmp.pms, s->s3->tmp.pmslen);

    OPENSSL_free(s->s3->tmp.peer_sigalgs);

    BIO_free(s->s3->handshake_buffer);

    if (s->s3->handshake_dgst)

    ssl3_free_digest_list(s);

    OPENSSL_free(s->s3->alpn_selected);
@@ -2943,9 +2942,7 @@ void ssl3_clear(SSL *s) 
    init_extra = s->s3->init_extra;

    BIO_free(s->s3->handshake_buffer);

    s->s3->handshake_buffer = NULL;

    if (s->s3->handshake_dgst) {

    ssl3_free_digest_list(s);

    }



    if (s->s3->alpn_selected) {

        OPENSSL_free(s->s3->alpn_selected);