5c062c1ba9
- fix leak in error handling of d2i_SSL_SESSION()
29 lines
992 B
Diff
29 lines
992 B
Diff
Index: openssl/ssl/d1_clnt.c
|
|
RCS File: /v/openssl/cvs/openssl/ssl/d1_clnt.c,v
|
|
rcsdiff -q -kk '-r1.16.2.10' '-r1.16.2.11' -u '/v/openssl/cvs/openssl/ssl/d1_clnt.c,v' 2>/dev/null
|
|
--- openssl/ssl/d1_clnt.c 2009/07/15 11:32:57 1.16.2.10
|
|
+++ openssl/ssl/d1_clnt.c 2009/07/24 11:52:32 1.16.2.11
|
|
@@ -223,6 +223,8 @@
|
|
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:
|
|
Index: openssl/ssl/d1_pkt.c
|
|
RCS File: /v/openssl/cvs/openssl/ssl/d1_pkt.c,v
|
|
rcsdiff -q -kk '-r1.27.2.13' '-r1.27.2.14' -u '/v/openssl/cvs/openssl/ssl/d1_pkt.c,v' 2>/dev/null
|
|
--- openssl/ssl/d1_pkt.c 2009/07/13 11:44:04 1.27.2.13
|
|
+++ openssl/ssl/d1_pkt.c 2009/07/24 11:52:32 1.27.2.14
|
|
@@ -775,7 +775,7 @@
|
|
/* 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;
|
|
}
|
|
|