Merge remote-tracking branch 'github/master' into main

linusklan · Oct 24, 2021 · 3e858c8 · 3e858c8
2 parents 13b0992 + 8c0a5ad
commit 3e858c8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/lib/db_x509.cpp b/lib/db_x509.cpp
@@ -841,6 +841,7 @@ void db_x509::certRenewal(QModelIndexList indexes)
 	CertExtend *dlg = NULL;
 	x509rev r;
 	bool doRevoke = false;
+	bool doReplace = false;
 
 	if (indexes.size() == 0)
 		return;
@@ -866,6 +867,7 @@ void db_x509::certRenewal(QModelIndexList indexes)
 			r = revoke->getRevocation();
 			delete revoke;
 		}
+		doReplace = dlg->replace->isChecked();
 		foreach(idx, indexes) {
 			oldcert = fromIndex<pki_x509>(idx);
 			if (!oldcert)
@@ -891,6 +893,10 @@ void db_x509::certRenewal(QModelIndexList indexes)
 			newcert->sign(signkey, oldcert->getDigest());
 			newcert = dynamic_cast<pki_x509 *>(insert(newcert));
 			createSuccess(newcert);
+
+			// delete old certificate if requested
+			if (doReplace)
+				deletePKI(idx);
 		}
 		if (doRevoke)
 			do_revoke(indexes, r);

diff --git a/ui/CertExtend.ui b/ui/CertExtend.ui
@@ -215,6 +215,16 @@
      <property name="text">
       <string>Revoke old certificate</string>
      </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="replace">
+     <property name="text">
+      <string>Replace old certificate</string>
+     </property>
      <property name="checked">
       <bool>true</bool>
      </property>