From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 24 Jul 2009 11:50:51 +0000 (+0000)
Subject: PR: 1993
X-Git-Tag: OpenSSL_0_9_8m-beta1~163
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=76a268a43f272550925a49fe975a7c918376a1e0;p=oweals%2Fopenssl.git

PR: 1993
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>
Approved by: steve@openssl.org

DTLS cookie resumption and typo fix.
---

diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c
index 20d6b7c404..d876c5974c 100644
--- a/ssl/d1_clnt.c
+++ b/ssl/d1_clnt.c
@@ -220,6 +220,8 @@ int dtls1_connect(SSL *s)
 			s->init_num=0;
 			/* mark client_random uninitialized */
 			memset(s->s3->client_random,0,sizeof(s->s3->client_random));
+			s->d1->send_cookie = 0;
+			s->hit = 0;
 			break;
 
 		case SSL3_ST_CW_CLNT_HELLO_A:
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c
index 989b5337b5..8059ebd3a4 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -732,7 +732,7 @@ start:
 	/* Check for timeout */
 	if (dtls1_is_timer_expired(s))
 		{
-		if (dtls1_read_failed(s, -1) > 0);
+		if (dtls1_read_failed(s, -1) > 0)
 			goto start;
 		}