Reduce the number of memory leaks in cert_create

The valgrind checks for cert_create have not been run in a long while -
as such there are a few memory leaks present. This patch fixes a few of
the major ones reported by valgrind. However, a few do remain.

Change-Id: Iab002fb2b0090043287d43fb54a4d18928c2ed85
Signed-off-by: Justin Chadwell <justin.chadwell@arm.com>

diff --git a/tools/cert_create/src/ext.c b/tools/cert_create/src/ext.c
index 055ddbfd07c91c4306e817987f5f58d061e1863e..57fb47d1d40bd58e96c7d83a5cc0d918ab8d7d53 100644 (file)
--- a/tools/cert_create/src/ext.c
+++ b/tools/cert_create/src/ext.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -284,6 +284,7 @@ X509_EXTENSION *ext_new_key(int nid, int crit, EVP_PKEY *k)
        ex = ext_new(nid, crit, p, sz);
 
        /* Clean up */
+       BIO_free(mem);
        OPENSSL_free(p);
 
        return ex;

diff --git a/tools/cert_create/src/key.c b/tools/cert_create/src/key.c
index 871f9ee8b40e39703a8cc08d53d223028e13ad6d..fece7708538f75c3cc62808ae6611157f17a11c4 100644 (file)
--- a/tools/cert_create/src/key.c
+++ b/tools/cert_create/src/key.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -73,6 +73,7 @@ static int key_create_rsa(key_t *key)
                goto err;
        }
 
+       BN_free(e);
        return 1;
 err:
        RSA_free(rsa);

diff --git a/tools/cert_create/src/main.c b/tools/cert_create/src/main.c
index ed566207cd6530ac9005d60175b2f07e67079180..0f588cc8cfab453049368b6cf599b8db077ad560 100644 (file)
--- a/tools/cert_create/src/main.c
+++ b/tools/cert_create/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */