From c2963f5b872574095b81196f4e15afce380c23c6 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 27 Jan 2010 17:49:33 +0000 Subject: [PATCH] revert wrongly committed test code --- apps/s_server.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/apps/s_server.c b/apps/s_server.c index af1c5630d3..6de433299c 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -2397,6 +2397,7 @@ static int www_body(char *hostname, int s, unsigned char *context) goto end; } + /* else we have data */ if ( ((www == 1) && (strncmp("GET ",buf,4) == 0)) || ((www == 2) && (strncmp("GET /stats ",buf,10) == 0))) { @@ -2405,25 +2406,6 @@ static int www_body(char *hostname, int s, unsigned char *context) STACK_OF(SSL_CIPHER) *sk; static const char *space=" "; - if(strncmp("GET /reneg ",buf,10) == 0) - { - for (;;) - { -fprintf(stderr, "Line: %s\n", buf); - i=BIO_gets(io,buf,bufsize-1); - if (i <= 0) - goto end; - if (buf[0] == '\r' || buf[0] == '\n') - break; - } - sleep(1); - SSL_renegotiate(con); - i=SSL_do_handshake(con); - SSL_renegotiate(con); - i=SSL_do_handshake(con); - printf("SSL_do_handshake -> %d\n",i); - } - BIO_puts(io,"HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n"); BIO_puts(io,"\n"); BIO_puts(io,"

\n");
@@ -2435,7 +2417,6 @@ fprintf(stderr, "Line: %s\n", buf);
 				BIO_write(io," ",1);
 				}
 			BIO_puts(io,"\n");
-			BIO_printf(io, "Secure Renegotiation IS%s supported\n", SSL_get_secure_renegotiation_support(con) ? "" : " NOT");
 
 			/* The following is evil and should not really
 			 * be done */
@@ -2659,7 +2640,7 @@ end:
 #endif
 
 err:
-ERR_print_errors(bio_err);
+
 	if (ret >= 0)
 		BIO_printf(bio_s_out,"ACCEPT\n");
 
-- 
2.25.1