summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiroslav Franc <mfranc@gmx.com>2016-07-14 17:14:08 +0200
committerRich Salz <rsalz@openssl.org>2016-07-16 12:32:34 -0400
commit563c1ec61848073e3739dd126cf1950e338c820d (patch)
treebd464f937e002f73ba6b9b8976f2dbc6b387e093
parent28e90f69fbcdcd3c06359a53adceb2dbdfaba614 (diff)
fix memory leaks
Reviewed-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1313)
-rw-r--r--crypto/ec/ecp_mont.c1
-rw-r--r--ssl/ssl_rsa.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/crypto/ec/ecp_mont.c b/crypto/ec/ecp_mont.c
index a9c6040937..994cc1d0ff 100644
--- a/crypto/ec/ecp_mont.c
+++ b/crypto/ec/ecp_mont.c
@@ -178,6 +178,7 @@ int ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p,
}
err:
+ BN_free(one);
BN_CTX_free(new_ctx);
BN_MONT_CTX_free(mont);
return ret;
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index aad65ead89..bb4e872ab4 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -110,6 +110,7 @@ int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa)
RSA_up_ref(rsa);
if (EVP_PKEY_assign_RSA(pkey, rsa) <= 0) {
RSA_free(rsa);
+ EVP_PKEY_free(pkey);
return 0;
}
@@ -452,6 +453,7 @@ int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa)
RSA_up_ref(rsa);
if (EVP_PKEY_assign_RSA(pkey, rsa) <= 0) {
RSA_free(rsa);
+ EVP_PKEY_free(pkey);
return 0;
}