===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/s_client.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- src/usr.bin/openssl/s_client.c	2017/08/12 21:04:33	1.33
+++ src/usr.bin/openssl/s_client.c	2018/02/07 04:57:06	1.34
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_client.c,v 1.33 2017/08/12 21:04:33 jsing Exp $ */
+/* $OpenBSD: s_client.c,v 1.34 2018/02/07 04:57:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1212,15 +1212,11 @@
 			print_stuff(bio_c_out, con, 1);
 		SSL_free(con);
 	}
-	if (ctx != NULL)
-		SSL_CTX_free(ctx);
-	if (cert)
-		X509_free(cert);
-	if (key)
-		EVP_PKEY_free(key);
+	SSL_CTX_free(ctx);
+	X509_free(cert);
+	EVP_PKEY_free(key);
 	free(pass);
-	if (vpm)
-		X509_VERIFY_PARAM_free(vpm);
+	X509_VERIFY_PARAM_free(vpm);
 	freezero(cbuf, BUFSIZZ);
 	freezero(sbuf, BUFSIZZ);
 	freezero(mbuf, BUFSIZZ);
@@ -1405,8 +1401,7 @@
 		}
 	}
 	BIO_printf(bio, "---\n");
-	if (peer != NULL)
-		X509_free(peer);
+	X509_free(peer);
 	/* flush, or debugging output gets mixed with http response */
 	(void) BIO_flush(bio);
 }