PR: 1993

Fix from 0.9.8-stable.

diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c
index dcca4dbd8b5abb7f4bebe7407fde577bb3ec107e..0274745d3ca644a0db9532d58f3ae04a461ddd1e 100644 (file)
--- 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 b9909b417bf13f941899e49aea6c795d360bea8b..d9a81140ea536a04e844729bcc571ec339d7c14f 100644 (file)
--- 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;
                }