From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 24 Jan 2010 13:52:38 +0000 (+0000)
Subject: oops revert test code from previous commit
X-Git-Tag: OpenSSL_0_9_8m~40
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=714044cc0369c9672a5908bd003d2f4958a1ac66;p=oweals%2Fopenssl.git

oops revert test code from previous commit
---

diff --git a/apps/s_server.c b/apps/s_server.c
index f44bf5e840..88b308ca38 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1836,20 +1836,6 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 					continue;
 					/* strcpy(buf,"server side RE-NEGOTIATE\n"); */
 					}
-				if ((buf[0] == 'X') &&
-					((buf[1] == '\n') || (buf[1] == '\r')))
-					{
-					SSL_renegotiate(con);
-					i=SSL_do_handshake(con);
-					printf("SSL_do_handshake1 -> %d\n",i);
-					if (SSL_get_state(con) != SSL_ST_OK)
-						printf("Bad State\n");
-					con->state = SSL_ST_ACCEPT;
-					i=SSL_do_handshake(con);
-					printf("SSL_do_handshake2 -> %d\n",i);
-					i=0; /*13; */
-					continue;
-					}
 				if ((buf[0] == 'R') &&
 					((buf[1] == '\n') || (buf[1] == '\r')))
 					{
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 66ff3fdb54..a2ba5748d5 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -979,6 +979,7 @@ start:
 		(s->session != NULL) && (s->session->cipher != NULL))
 		{
 		s->s3->handshake_fragment_len = 0;
+
 		if ((s->s3->handshake_fragment[1] != 0) ||
 			(s->s3->handshake_fragment[2] != 0) ||
 			(s->s3->handshake_fragment[3] != 0))