From c9beabec633f1cc45215bc550b7370c475785a2b Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 29 Sep 2014 09:30:31 +0000
Subject: When freeing the config, explicitly call ressl_config_clear_keys()
 rather than rerolling our own key clearing code.

ok tedu@
---
 src/lib/libressl/ressl_config.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libressl/ressl_config.c b/src/lib/libressl/ressl_config.c
index 319bba330d..106527c109 100644
--- a/src/lib/libressl/ressl_config.c
+++ b/src/lib/libressl/ressl_config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ressl_config.c,v 1.10 2014/09/28 14:46:09 jsing Exp $ */
+/* $OpenBSD: ressl_config.c,v 1.11 2014/09/29 09:30:31 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -84,16 +84,17 @@ ressl_config_free(struct ressl_config *config)
 {
 	if (config == NULL)
 		return;
+
+	ressl_config_clear_keys(config);
+
 	free((char *)config->ca_file);
 	free((char *)config->ca_path);
 	free((char *)config->cert_file);
 	free(config->cert_mem);
 	free((char *)config->ciphers);
 	free((char *)config->key_file);
-	if (config->key_mem != NULL) {
-		explicit_bzero(config->key_mem, config->key_len);
-		free(config->key_mem);
-	}
+	free(config->key_mem);
+
 	free(config);
 }
 
-- 
cgit v1.2.3-55-g6feb