X509_free(3) is NULL-safe, so remove NULL checks before its calls.

ok doug@

1 files changed, 3 insertions, 5 deletions

diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index c992406ca8..10b6312834 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_srvr.c,v 1.124 2016/01/27 02:06:16 beck Exp $ */
+/* $OpenBSD: s3_srvr.c,v 1.125 2016/03/11 07:08:45 mmcc Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2376,8 +2376,7 @@ ssl3_get_client_certificate(SSL *s)
                 }
         }
 
-        if (s->session->peer != NULL) /* This should not be needed */
-                X509_free(s->session->peer);
+        X509_free(s->session->peer);
         s->session->peer = sk_X509_shift(sk);
         s->session->verify_result = s->verify_result;
 
@@ -2414,8 +2413,7 @@ f_err:
                 ssl3_send_alert(s, SSL3_AL_FATAL, al);
         }
 err:
-        if (x != NULL)
-                X509_free(x);
+        X509_free(x);
         if (sk != NULL)
                 sk_X509_pop_free(sk, X509_free);
         return (ret);