From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 30 Sep 2021 13:16:48 +0000 (+0200)
Subject: swanctl: Clear config from memory
X-Git-Tag: 5.9.4dr3~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de442491d9bfb04b841f6a80edffcdfbb982dcf1;p=thirdparty%2Fstrongswan.git

swanctl: Clear config from memory

The 'secrets' section in the config file may contain passwords/PINs.
---

diff --git a/src/swanctl/commands/load_all.c b/src/swanctl/commands/load_all.c
index d0032467ac..1b1cf2a8fb 100644
--- a/src/swanctl/commands/load_all.c
+++ b/src/swanctl/commands/load_all.c
@@ -86,7 +86,7 @@ static int load_all(vici_conn_t *conn)
 		ret = load_conns_cfg(conn, format, cfg);
 	}
 
-	cfg->destroy(cfg);
+	cfg->destroy_clear(cfg);
 
 	return ret;
 }
diff --git a/src/swanctl/commands/load_authorities.c b/src/swanctl/commands/load_authorities.c
index 832509bf4d..95a29f7dd5 100644
--- a/src/swanctl/commands/load_authorities.c
+++ b/src/swanctl/commands/load_authorities.c
@@ -345,7 +345,7 @@ static int load_authorities(vici_conn_t *conn)
 
 	ret = load_authorities_cfg(conn, format, cfg);
 
-	cfg->destroy(cfg);
+	cfg->destroy_clear(cfg);
 
 	return ret;
 }
diff --git a/src/swanctl/commands/load_conns.c b/src/swanctl/commands/load_conns.c
index 47e434956b..76d78a0d7d 100644
--- a/src/swanctl/commands/load_conns.c
+++ b/src/swanctl/commands/load_conns.c
@@ -462,7 +462,7 @@ static int load_conns(vici_conn_t *conn)
 
 	ret = load_conns_cfg(conn, format, cfg);
 
-	cfg->destroy(cfg);
+	cfg->destroy_clear(cfg);
 
 	return ret;
 }
diff --git a/src/swanctl/commands/load_creds.c b/src/swanctl/commands/load_creds.c
index c6c24d2337..3c58f3bdcc 100644
--- a/src/swanctl/commands/load_creds.c
+++ b/src/swanctl/commands/load_creds.c
@@ -990,7 +990,7 @@ static int load_creds(vici_conn_t *conn)
 
 	ret = load_creds_cfg(conn, format, cfg, clear, noprompt);
 
-	cfg->destroy(cfg);
+	cfg->destroy_clear(cfg);
 
 	return ret;
 }
diff --git a/src/swanctl/commands/load_pools.c b/src/swanctl/commands/load_pools.c
index a3bbcfd3ae..f698c07c77 100644
--- a/src/swanctl/commands/load_pools.c
+++ b/src/swanctl/commands/load_pools.c
@@ -285,7 +285,7 @@ static int load_pools(vici_conn_t *conn)
 
 	ret = load_pools_cfg(conn, format, cfg);
 
-	cfg->destroy(cfg);
+	cfg->destroy_clear(cfg);
 
 	return ret;
 }