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
goto end;
}
- /* else we have data */
if ( ((www == 1) && (strncmp("GET ",buf,4) == 0)) ||
((www == 2) && (strncmp("GET /stats ",buf,10) == 0)))
{
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");
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 */
#endif
err:
-
+ERR_print_errors(bio_err);
if (ret >= 0)
BIO_printf(bio_s_out,"ACCEPT\n");
projects / openssl / commitdiff