Commit 9c2bed0b authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 2748 

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

Fix possible DTLS timer deadlock.
parent ad83334e

ssl/d1_clnt.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ int dtls1_connect(SSL *s) 
			if (ret <= 0) goto end;

			else

				{

				dtls1_stop_timer(s);

				if (s->hit)

					s->state=SSL3_ST_CR_FINISHED_A;

				else
@@ -354,6 +353,7 @@ int dtls1_connect(SSL *s) 
		case SSL3_ST_CR_SRVR_DONE_B:

			ret=ssl3_get_server_done(s);

			if (ret <= 0) goto end;

			dtls1_stop_timer(s);

			if (s->s3->tmp.cert_req)

				s->state=SSL3_ST_CW_CERT_A;

			else

ssl/d1_srvr.c

+3 −4
Original line number Diff line number Diff line
@@ -485,15 +485,16 @@ int dtls1_accept(SSL *s) 
			ret = ssl3_check_client_hello(s);

			if (ret <= 0)

				goto end;

			dtls1_stop_timer(s);

			if (ret == 2)

				{

				dtls1_stop_timer(s);

				s->state = SSL3_ST_SR_CLNT_HELLO_C;

				}

			else {

				/* could be sent for a DH cert, even if we

				 * have not asked for it :-) */

				ret=ssl3_get_client_certificate(s);

				if (ret <= 0) goto end;

				dtls1_stop_timer(s);

				s->init_num=0;

				s->state=SSL3_ST_SR_KEY_EXCH_A;

			}
@@ -503,7 +504,6 @@ int dtls1_accept(SSL *s) 
		case SSL3_ST_SR_KEY_EXCH_B:

			ret=ssl3_get_client_key_exchange(s);

			if (ret <= 0) goto end;

			dtls1_stop_timer(s);

			s->state=SSL3_ST_SR_CERT_VRFY_A;

			s->init_num=0;
@@ -540,7 +540,6 @@ int dtls1_accept(SSL *s) 
			/* we should decide if we expected this one */

			ret=ssl3_get_cert_verify(s);

			if (ret <= 0) goto end;

			dtls1_stop_timer(s);



			s->state=SSL3_ST_SR_FINISHED_A;

			s->init_num=0;