From: Bodo Möller <bodo@openssl.org>
Date: Thu, 15 Jun 2006 19:00:34 +0000 (+0000)
Subject: Call 'print_stuff' even if a handshake failed.
X-Git-Tag: OpenSSL_0_9_8k^2~1246
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b166f13eb575e891575fe386b1ec57f01c6c9a6b;p=oweals%2Fopenssl.git

Call 'print_stuff' even if a handshake failed.
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 8eeb726981..d105a7413e 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -925,10 +925,10 @@ re_start:
 				{
 				in_init=0;
 #ifndef OPENSSL_NO_TLSEXT
-	if (servername != NULL && !SSL_session_reused(con))
-		{
-		BIO_printf(bio_c_out,"Server did %sacknowledge servername extension.\n",tlsextcbp.ack?"":"not ");
-		}
+				if (servername != NULL && !SSL_session_reused(con))
+					{
+					BIO_printf(bio_c_out,"Server did %sacknowledge servername extension.\n",tlsextcbp.ack?"":"not ");
+					}
 #endif
 				print_stuff(bio_c_out,con,full_log);
 				if (full_log > 0) full_log--;
@@ -1261,6 +1261,8 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
 			}
 		}
 shut:
+	if (in_init)
+		print_stuff(bio_c_out,con,full_log);
 	SSL_shutdown(con);
 	SHUTDOWN(SSL_get_fd(con));
 	ret=0;