diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2010-01-19 19:10:03 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2010-01-19 19:10:03 +0000 |
commit | ff2549be1d929a6915623ad583718a62163c9b8a (patch) | |
tree | c9bd6ef03dc42dc2b1dafab665c9df1622db55c7 /ssl | |
parent | 2557c6a812bf7781c5a3d297f8da2642010955eb (diff) |
PR: 2144
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>
Better fix for PR#2144
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/d1_srvr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index a7a9599d0f..499e2bba51 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -264,7 +264,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; @@ -290,7 +289,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; /* HelloVerifyRequests resets Finished MAC */ @@ -300,6 +298,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; |