Merge "Reduce the number of memory leaks in cert_create" into integration

f2b3ac63 · Paul Beesley · TrustedFirmware Code Review · 04fb777f · 65ec13bc · f2b3ac63
Commit f2b3ac63 authored 5 years ago by Paul Beesley Committed by TrustedFirmware Code Review 5 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 5 additions and 3 deletions
+5 -3
--- a/tools/cert_create/src/ext.c
+++ b/tools/cert_create/src/ext.c
 /*
- * 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;

--- a/tools/cert_create/src/key.c
+++ b/tools/cert_create/src/key.c
 /*
- * 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);

--- a/tools/cert_create/src/main.c
+++ b/tools/cert_create/src/main.c
 /*
- * 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
 */