From 73452bfa17b1f526a3d41e625faa003ba8e493f6 Mon Sep 17 00:00:00 2001
From: Christian Hohnstaedt <christian@hohnstaedt.de>
Date: Mon, 29 Oct 2018 17:12:38 +0100
Subject: [PATCH] Close #37: XCA 2: EVP_DecryptFinal_ex:bad decrypt

This error occures when updating a legacy database not
protected by a password (empty password) and setting
a new password during update process.

When importing an old database with an empty password,
don't ask for a new one for the new database.
---
 widgets/MW_database.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/widgets/MW_database.cpp b/widgets/MW_database.cpp
index cf0b5ff1..a32180f1 100644
--- a/widgets/MW_database.cpp
+++ b/widgets/MW_database.cpp
@@ -263,7 +263,7 @@ int MainWindow::init_database(QString dbName)
 	certView->setRootIsDecorated(db_x509::treeview);
 	ret = 1;
 	try {
-		if (pki_evp::passwd.isEmpty()) {
+		if (pki_evp::passwd.isEmpty() && oldDbFile.isEmpty()) {
 			ret = initPass(dbName);
 			if (ret == 2)
 				return ret;