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

PR: 2144

Browse Source 
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>

Better fix for PR#2144
This commit is contained in:
Dr. Stephen Henson 2010-01-19 19:11:21 +00:00
parent 28dc54f6d9
commit 04aa7441ab
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssl/d1_srvr.c
View File

@ -266,7 +266,6 @@ int dtls1_accept(SSL *s)
ret=ssl3_get_client_hello(s); ret=ssl3_get_client_hello(s);
if (ret <= 0) goto end; if (ret <= 0) goto end;
dtls1_stop_timer(s); dtls1_stop_timer(s);
s->new_session = 2;
if (ret == 1 && (SSL_get_options(s) & SSL_OP_COOKIE_EXCHANGE)) if (ret == 1 && (SSL_get_options(s) & SSL_OP_COOKIE_EXCHANGE))
s->state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A; 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); ret = dtls1_send_hello_verify_request(s);
if ( ret <= 0) goto end; if ( ret <= 0) goto end;
s->state=SSL3_ST_SW_FLUSH; s->state=SSL3_ST_SW_FLUSH;
s->new_session = 0;
s->s3->tmp.next_state=SSL3_ST_SR_CLNT_HELLO_A; s->s3->tmp.next_state=SSL3_ST_SR_CLNT_HELLO_A;
/* HelloVerifyRequest resets Finished MAC */ /* 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_A:
case SSL3_ST_SW_SRVR_HELLO_B: case SSL3_ST_SW_SRVR_HELLO_B:
s->new_session = 2;
dtls1_start_timer(s); dtls1_start_timer(s);
ret=dtls1_send_server_hello(s); ret=dtls1_send_server_hello(s);
if (ret <= 0) goto end; if (ret <= 0) goto end;