summaryrefslogtreecommitdiffstats
path: root/ssl/d1_pkt.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-08-27 12:10:12 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-08-27 12:10:12 +0000
commitc6dd154b3e410f72e09ff472fe4e70ebf02173f8 (patch)
treee55bf904880067f1e9fcd4acf84676d127779e57 /ssl/d1_pkt.c
parent74b5feea7bbe0b8223aabaad04c159709936989f (diff)
oops, revert previous patch
Diffstat (limited to 'ssl/d1_pkt.c')
-rw-r--r--ssl/d1_pkt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 1fd58bf598..ee67561a89 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -957,6 +957,7 @@ start:
!(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) &&
!s->s3->renegotiate)
{
+ s->new_session = 1;
ssl3_renegotiate(s);
if (ssl3_renegotiate_check(s))
{
@@ -1163,6 +1164,7 @@ start:
#else
s->state = s->server ? SSL_ST_ACCEPT : SSL_ST_CONNECT;
#endif
+ s->renegotiate=1;
s->new_session=1;
}
i=s->handshake_func(s);