From: Martin Olsson <martin@minimum.se>
Date: Thu, 4 Sep 2014 16:42:34 +0000 (-0400)
Subject: RT2842: Remove spurious close-comment marker.
X-Git-Tag: OpenSSL_1_0_2-beta3~49
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9c096d0bbf548b79827db0e68a3728f712a00682;p=oweals%2Fopenssl.git

RT2842: Remove spurious close-comment marker.

Also, I (rsalz) changed "#ifdef undef" to "#if 0"

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
(cherry picked from commit 6b0dc6eff1a59274730802db923d55802378d011)
---

diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c
index 03b6cf9673..f166bcdedf 100644
--- a/ssl/s2_clnt.c
+++ b/ssl/s2_clnt.c
@@ -417,12 +417,11 @@ static int get_server_hello(SSL *s)
 		}
 	else
 		{
-#ifdef undef
+#if 0
 		/* very bad */
 		memset(s->session->session_id,0,
 			SSL_MAX_SSL_SESSION_ID_LENGTH_IN_BYTES);
 		s->session->session_id_length=0;
-		*/
 #endif
 
 		/* we need to do this in case we were trying to reuse a