summaryrefslogtreecommitdiffstats
path: root/ssl/d1_srvr.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-01-19 19:11:21 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-01-19 19:11:21 +0000
commit04aa7441abdc648e7fb3d8d20755cf0d430fd35c (patch)
treeffb458057263bf1510a359be66b755209e5485fd /ssl/d1_srvr.c
parent28dc54f6d90e952cf96123de4272229f73cf5cd0 (diff)
PR: 2144
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de> Better fix for PR#2144
Diffstat (limited to 'ssl/d1_srvr.c')
-rw-r--r--ssl/d1_srvr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
index f79efe53b7..c11e75abf9 100644
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -266,7 +266,6 @@ int dtls1_accept(SSL *s)
ret=ssl3_get_client_hello(s);
if (ret <= 0) goto end;
dtls1_stop_timer(s);
- s->new_session = 2;
if (ret == 1 && (SSL_get_options(s) & SSL_OP_COOKIE_EXCHANGE))
s->state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A;
@@ -292,7 +291,6 @@ int dtls1_accept(SSL *s)
ret = dtls1_send_hello_verify_request(s);
if ( ret <= 0) goto end;
s->state=SSL3_ST_SW_FLUSH;
- s->new_session = 0;
s->s3->tmp.next_state=SSL3_ST_SR_CLNT_HELLO_A;
/* HelloVerifyRequest resets Finished MAC */
@@ -302,6 +300,7 @@ int dtls1_accept(SSL *s)
case SSL3_ST_SW_SRVR_HELLO_A:
case SSL3_ST_SW_SRVR_HELLO_B:
+ s->new_session = 2;
dtls1_start_timer(s);
ret=dtls1_send_server_hello(s);
if (ret <= 0) goto end;