projects / oweals / openssl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1e27847)
typo
authorDr. Stephen Henson <steve@openssl.org>
Wed, 27 Jan 2010 14:05:39 +0000 (14:05 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 27 Jan 2010 14:05:39 +0000 (14:05 +0000)
CHANGES patch | blob | history
apps/s_server.c patch | blob | history

diff --git a/CHANGES b/CHANGES
index d6d863a447c5e16c210a582e0003d06d64ec62ef..a08a98679987255ab76722f23d8ee65d42659530 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -884,7 +884,7 @@
 
  Changes between 0.9.8l (?) and 0.9.8m (?)  [xx XXX xxxx]
 
-  *) The code that handled flusing of data in SSL/TLS originally used the
+  *) The code that handled flushing of data in SSL/TLS originally used the
      BIO_CTRL_INFO ctrl to see if any data was pending first. This caused
      the problem outlined in PR#1949. The fix suggested there however can
      trigger problems with buggy BIO_CTRL_WPENDING (e.g. some versions
diff --git a/apps/s_server.c b/apps/s_server.c
index 6de433299cf501bcfcc1770defa24c1971ddcdd6..af1c5630d35e3ca064cdb6b48ef5be419a1f1c8e 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2397,7 +2397,6 @@ 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)))
                        {
@@ -2406,6 +2405,25 @@ 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,"<HTML><BODY BGCOLOR=\"#ffffff\">\n");
                        BIO_puts(io,"<pre>\n");
@@ -2417,6 +2435,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
                                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 */
@@ -2640,7 +2659,7 @@ end:
 #endif
 
 err:
-
+ERR_print_errors(bio_err);
        if (ret >= 0)
                BIO_printf(bio_s_out,"ACCEPT\n");
 
Unnamed repository; edit this file 'description' to name the repository.