From ed475c8d9fbe2c417bd3248c4596c2b2bde0fef6 Mon Sep 17 00:00:00 2001
From: Christian Hohnstaedt <christian@hohnstaedt.de>
Date: Sun, 31 Jul 2022 11:18:19 +0200
Subject: [PATCH] Close #327: "Dump database" dumps everything to everywhere

Select the items to be dumped to the currently selected
directory.
---
 lib/db_base.cpp | 6 ++++--
 lib/pki_evp.cpp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/db_base.cpp b/lib/db_base.cpp
index 1fc445e6..b1adcbe6 100644
--- a/lib/db_base.cpp
+++ b/lib/db_base.cpp
@@ -377,8 +377,10 @@ void db_base::dump(const QString &dir) const
 	}
 
 	try {
-		foreach(pki_base *pki, Store.getAll<pki_base>())
-			pki->writeDefault(dirname);
+		foreach(pki_base *pki, Store.getAll<pki_base>()) {
+			if (pkitype.contains(pki->getType()))
+				pki->writeDefault(dirname);
+		}
 	}
 	catch (errorEx &err) {
 		XCA_ERROR(err);
diff --git a/lib/pki_evp.cpp b/lib/pki_evp.cpp
index 3f7fcd4a..98edb19e 100644
--- a/lib/pki_evp.cpp
+++ b/lib/pki_evp.cpp
@@ -764,7 +764,7 @@ void pki_evp::writeDefault(const QString &dirname) const
 {
 	XFile file(get_dump_filename(dirname, ".pem"));
 	file.open_key();
-	writeKey(file, pki_evp::passwd[0] ? EVP_des_ede3_cbc() : NULL,
+	writeKey(file, pki_evp::passwd.isEmpty() ? NULL : EVP_des_ede3_cbc(),
 			mycb, true);
 }