generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oops, revert previous patch

Browse Source
This commit is contained in:
Dr. Stephen Henson
2010-08-27 12:10:12 +00:00
parent 74b5feea7b
commit c6dd154b3e
9 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ssl/s3_srvr.c
View File

@@ -218,7 +218,7 @@ int ssl3_accept(SSL *s)
switch (s->state)
{
case SSL_ST_RENEGOTIATE:
s->new_session=1;
s->renegotiate=1;
/* s->state=SSL_ST_ACCEPT; */
case SSL_ST_BEFORE:
@@ -316,7 +316,7 @@ int ssl3_accept(SSL *s)
ret=ssl3_get_client_hello(s);
if (ret <= 0) goto end;
s->new_session = 2;
s->renegotiate = 2;
s->state=SSL3_ST_SW_SRVR_HELLO_A;
s->init_num=0;
break;
@@ -673,11 +673,12 @@ int ssl3_accept(SSL *s)
s->init_num=0;
if (s->new_session == 2) /* skipped if we just sent a HelloRequest */
if (s->renegotiate == 2) /* skipped if we just sent a HelloRequest */
{
/* actually not necessarily a 'new' session unless
* SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is set */
s->renegotiate=0;
s->new_session=0;
ssl_update_cache(s,SSL_SESS_CACHE_SERVER);