generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove unnecessary NULL checks

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-06-20 15:37:22 +01:00
parent bc9567cdc9
commit 85fb6fdaed
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssl/s3_enc.c
View File

@ -477,8 +477,7 @@ void ssl3_cleanup_key_block(SSL *s)
void ssl3_init_finished_mac(SSL *s) void ssl3_init_finished_mac(SSL *s)
{ {
BIO_free(s->s3->handshake_buffer); BIO_free(s->s3->handshake_buffer);
if (s->s3->handshake_dgst) ssl3_free_digest_list(s);
ssl3_free_digest_list(s);
s->s3->handshake_buffer = BIO_new(BIO_s_mem()); s->s3->handshake_buffer = BIO_new(BIO_s_mem());
(void)BIO_set_close(s->s3->handshake_buffer, BIO_CLOSE); (void)BIO_set_close(s->s3->handshake_buffer, BIO_CLOSE);
} }

7
ssl/s3_lib.c
View File

@ -2906,8 +2906,7 @@ void ssl3_free(SSL *s)
OPENSSL_clear_free(s->s3->tmp.pms, s->s3->tmp.pmslen); OPENSSL_clear_free(s->s3->tmp.pms, s->s3->tmp.pmslen);
OPENSSL_free(s->s3->tmp.peer_sigalgs); OPENSSL_free(s->s3->tmp.peer_sigalgs);
BIO_free(s->s3->handshake_buffer); BIO_free(s->s3->handshake_buffer);
if (s->s3->handshake_dgst) ssl3_free_digest_list(s);
ssl3_free_digest_list(s);
OPENSSL_free(s->s3->alpn_selected); OPENSSL_free(s->s3->alpn_selected);
#ifndef OPENSSL_NO_SRP #ifndef OPENSSL_NO_SRP
@ -2943,9 +2942,7 @@ void ssl3_clear(SSL *s)
init_extra = s->s3->init_extra; init_extra = s->s3->init_extra;
BIO_free(s->s3->handshake_buffer); BIO_free(s->s3->handshake_buffer);
s->s3->handshake_buffer = NULL; s->s3->handshake_buffer = NULL;
if (s->s3->handshake_dgst) { ssl3_free_digest_list(s);
ssl3_free_digest_list(s);
}
if (s->s3->alpn_selected) { if (s->s3->alpn_selected) {
OPENSSL_free(s->s3->alpn_selected); OPENSSL_free(s->s3->alpn_selected);