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 20d6b7c404e12725456238aa7537bffc1b02f681..d876c5974cec4533883ee3bd68a583d0e625c665 100644 (file)
--- 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 989b5337b5574fca72178da71b03990bf6b3965c..8059ebd3a4f3baf3aba102c749d14509a6954501 100644 (file)
--- 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;
                }