summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-07-24 11:52:55 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-07-24 11:52:55 +0000
commit0f65d5eba521bd8b72cad309bbfd688a35295017 (patch)
tree6112a54cd78879285512d38141ee1131eaedadee /ssl
parent15877618196a827d59c6e014359e5b021b4baf0b (diff)
PR: 1993
Fix from 0.9.8-stable.
Diffstat (limited to 'ssl')
-rw-r--r--ssl/d1_clnt.c2
-rw-r--r--ssl/d1_pkt.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c
index dcca4dbd8b..0274745d3c 100644
--- a/ssl/d1_clnt.c
+++ b/ssl/d1_clnt.c
@@ -223,6 +223,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 b9909b417b..d9a81140ea 100644
--- a/ssl/d1_pkt.c
+++ b/ssl/d1_pkt.c
@@ -775,7 +775,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;
}