commit 85fb6fdaed74d6091817ce5da17fcc737f36a51f
author Dr. Stephen Henson <steve@openssl.org> Sat Jun 20 15:37:22 2015 +0100
committer Dr. Stephen Henson <steve@openssl.org> Sun Jun 21 15:29:22 2015 +0100
tree 02ed2d2a5f063c31177026df5d1e9e4bb6c88dfb
parent bc9567cdc9a56b5c904e075e3b929076c1e7583c

remove unnecessary NULL checks

Reviewed-by: Rich Salz <rsalz@openssl.org>

ssl/s3_enc.c

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index dd93e25..bde19e1 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -477,8 +477,7 @@
 void ssl3_init_finished_mac(SSL *s)
 {
     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());
     (void)BIO_set_close(s->s3->handshake_buffer, BIO_CLOSE);
 }

ssl/s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 8784642..0307801 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -2906,8 +2906,7 @@
     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);
+    ssl3_free_digest_list(s);
     OPENSSL_free(s->s3->alpn_selected);
 
 #ifndef OPENSSL_NO_SRP
@@ -2943,9 +2942,7 @@
     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);
-    }
+    ssl3_free_digest_list(s);
 
     if (s->s3->alpn_selected) {
         OPENSSL_free(s->s3->alpn_selected);