From: Dr. Stephen Henson Date: Fri, 24 Jul 2009 11:52:32 +0000 (+0000) Subject: PR: 1993 X-Git-Tag: OpenSSL_1_0_0-beta4~131 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d7406b1528ab639349ea13dece383799972deb71;p=oweals%2Fopenssl.git PR: 1993 Fix from 0.9.8-stable. --- 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; }