Commit 714044cc authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

oops revert test code from previous commit

parent 5598b99f

apps/s_server.c

+0 −14
Original line number Diff line number Diff line
@@ -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')))

					{

ssl/s3_pkt.c

+1 −0
Original line number Diff line number Diff line
@@ -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))