oops revert test code from previous commit

diff --git a/apps/s_server.c b/apps/s_server.c
index f44bf5e8409fa81cbaca1d9d93af76aab14d7909..88b308ca388f397221c0302f9336479f4e938029 100644 (file)
--- 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 66ff3fdb54023ed2b7971c00490f1776238a622f..a2ba5748d5eb4f6b4aca75fb115eb97c75449f50 100644 (file)
--- 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))