From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 25 May 2011 12:24:43 +0000 (+0000)
Subject: PR: 2505
X-Git-Tag: OpenSSL_1_0_1-beta1~304
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a8cb8177f6af3409296fdf8fe661efc5c0f0a23d;p=oweals%2Fopenssl.git

PR: 2505
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>
Reviewed by: steve

Fix DTLS session resumption timer bug.
---

diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c
index 255c19d761..aacfacf4b5 100644
--- a/ssl/d1_clnt.c
+++ b/ssl/d1_clnt.c
@@ -407,7 +407,8 @@ int dtls1_connect(SSL *s)
 
 		case SSL3_ST_CW_CHANGE_A:
 		case SSL3_ST_CW_CHANGE_B:
-			dtls1_start_timer(s);
+			if (!s->hit)
+				dtls1_start_timer(s);
 			ret=dtls1_send_change_cipher_spec(s,
 				SSL3_ST_CW_CHANGE_A,SSL3_ST_CW_CHANGE_B);
 			if (ret <= 0) goto end;
@@ -442,7 +443,8 @@ int dtls1_connect(SSL *s)
 
 		case SSL3_ST_CW_FINISHED_A:
 		case SSL3_ST_CW_FINISHED_B:
-			dtls1_start_timer(s);
+			if (!s->hit)
+				dtls1_start_timer(s);
 			ret=dtls1_send_finished(s,
 				SSL3_ST_CW_FINISHED_A,SSL3_ST_CW_FINISHED_B,
 				s->method->ssl3_enc->client_finished_label,