summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2012-01-04 14:25:10 +0000
committerDr. Stephen Henson <steve@openssl.org>2012-01-04 14:25:10 +0000
commit0c214e01535fb5e4d14f5fd24bd91b948f6c0535 (patch)
treed5b287dc116fa80c4dbc149c44fb3bb4876e527a
parent6c61cfbe03fdc8dd33a13c0691492485bca485a6 (diff)
Submitted by: Adam Langley <agl@chromium.org>
Reviewed by: steve Fix memory leaks.
-rw-r--r--ssl/s3_srvr.c1
-rw-r--r--ssl/t1_lib.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 89822de8f0..4850a9a957 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -1952,6 +1952,7 @@ int ssl3_get_client_key_exchange(SSL *s)
if (i <= 0)
{
SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
+ BN_clear_free(pub);
goto err;
}
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 92cac13002..cc97258ae5 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -575,6 +575,12 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
sdata = data;
if (dsize > 0)
{
+ if (s->tlsext_ocsp_exts)
+ {
+ sk_X509_EXTENSION_pop_free(s->tlsext_ocsp_exts,
+ X509_EXTENSION_free);
+ }
+
s->tlsext_ocsp_exts =
d2i_X509_EXTENSIONS(NULL,
&sdata, dsize);