Move decryption {ex,im}port code to a new file.

4 files changed, 118 insertions, 35 deletions

diff --git a/src/lib/export_decryption_settings.cc b/src/lib/export_decryption_settings.cc
new file mode 100644
index 000000000..1ba791251
--- /dev/null
+++ b/src/lib/export_decryption_settings.cc
@@ -0,0 +1,83 @@
+/*
+    Copyright (C) 2025 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "config.h"
+#include "dcpomatic_assert.h"
+#include "exceptions.h"
+#include <dcp/certificate_chain.h>
+#include <dcp/file.h>
+
+
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+
+
+void
+export_decryption_chain_and_key(shared_ptr<const dcp::CertificateChain> chain, boost::filesystem::path const& path)
+{
+	dcp::File f(path, "w");
+	if (!f) {
+		throw OpenFileError(path, f.open_error(), OpenFileError::WRITE);
+	}
+
+	auto const certs = chain->chain();
+	f.checked_write(certs.c_str(), certs.length());
+	auto const key = chain->key();
+	DCPOMATIC_ASSERT(key);
+	f.checked_write(key->c_str(), key->length());
+}
+
+
+shared_ptr<dcp::CertificateChain>
+import_decryption_chain_and_key(boost::filesystem::path const& path)
+{
+	auto new_chain = make_shared<dcp::CertificateChain>();
+
+	dcp::File f(path, "r");
+	if (!f) {
+		throw OpenFileError(f.path(), f.open_error(), OpenFileError::WRITE);
+	}
+
+	string current;
+	while (!f.eof()) {
+		char buffer[128];
+		if (f.gets(buffer, 128) == 0) {
+			break;
+		}
+		current += buffer;
+
+		if (strncmp(buffer, "-----END CERTIFICATE-----", 25) == 0) {
+			new_chain->add(dcp::Certificate(current));
+			current = "";
+		} else if (strncmp(buffer, "-----END RSA PRIVATE KEY-----", 29) == 0) {
+			new_chain->set_key(current);
+			current = "";
+		}
+	}
+
+	if (!new_chain->chain_valid() || !new_chain->private_key_valid()) {
+		return {};
+	}
+
+	return new_chain;
+}
+
diff --git a/src/lib/export_decryption_settings.h b/src/lib/export_decryption_settings.h
new file mode 100644
index 000000000..630aa06f1
--- /dev/null
+++ b/src/lib/export_decryption_settings.h
@@ -0,0 +1,28 @@
+/*
+    Copyright (C) 2025 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include <dcp/certificate_chain.h>
+#include <boost/filesystem.hpp>
+#include <memory>
+
+
+extern void export_decryption_chain_and_key(std::shared_ptr<const dcp::CertificateChain> chain, boost::filesystem::path const& path);
+extern std::shared_ptr<dcp::CertificateChain> import_decryption_chain_and_key(boost::filesystem::path const& path);
diff --git a/src/lib/wscript b/src/lib/wscript
index 2e7b0339c..a6a6d96fc 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -101,6 +101,7 @@ sources = """
           examine_ffmpeg_subtitles_job.cc
           exceptions.cc
           export_config.cc
+          export_decryption_settings.cc
           fcpxml.cc
           fcpxml_content.cc
           fcpxml_decoder.cc
diff --git a/src/wx/keys_preferences_page.cc b/src/wx/keys_preferences_page.cc
index b8bb8e2dc..2f29e8192 100644
--- a/src/wx/keys_preferences_page.cc
+++ b/src/wx/keys_preferences_page.cc
@@ -28,6 +28,7 @@
 #include "wx_util.h"
 #include "wx_variant.h"
 #include "lib/exceptions.h"
+#include "lib/export_decryption_settings.h"
 #include "lib/util.h"
 #include <dcp/file.h>
 
@@ -162,6 +163,7 @@ KeysPage::signing_advanced()
 	editor.ShowModal();
 }
 
+
 void
 KeysPage::export_decryption_chain_and_key()
 {
@@ -174,19 +176,10 @@ KeysPage::export_decryption_chain_and_key()
 		return;
 	}
 
-	boost::filesystem::path path(wx_to_std(dialog.GetPath()));
-	dcp::File f(path, "w");
-	if (!f) {
-		throw OpenFileError(path, f.open_error(), OpenFileError::WRITE);
-	}
-
-	auto const chain = Config::instance()->decryption_chain()->chain();
-	f.checked_write(chain.c_str(), chain.length());
-	auto const key = Config::instance()->decryption_chain()->key();
-	DCPOMATIC_ASSERT(key);
-	f.checked_write(key->c_str(), key->length());
+	::export_decryption_chain_and_key(Config::instance()->decryption_chain(), wx_to_std(dialog.GetPath()));
 }
 
+
 void
 KeysPage::import_decryption_chain_and_key()
 {
@@ -207,36 +200,14 @@ KeysPage::import_decryption_chain_and_key()
 		return;
 	}
 
-	auto new_chain = make_shared<dcp::CertificateChain>();
-
-	dcp::File f(wx_to_std(dialog.GetPath()), "r");
-	if (!f) {
-		throw OpenFileError(f.path(), f.open_error(), OpenFileError::WRITE);
-	}
-
-	string current;
-	while (!f.eof()) {
-		char buffer[128];
-		if (f.gets(buffer, 128) == 0) {
-			break;
-		}
-		current += buffer;
-		if (strncmp(buffer, "-----END CERTIFICATE-----", 25) == 0) {
-			new_chain->add(dcp::Certificate(current));
-			current = "";
-		} else if (strncmp(buffer, "-----END RSA PRIVATE KEY-----", 29) == 0) {
-			new_chain->set_key(current);
-			current = "";
-		}
-	}
-
-	if (new_chain->chain_valid() && new_chain->private_key_valid()) {
+	if (auto new_chain = ::import_decryption_chain_and_key(wx_to_std(dialog.GetPath()))) {
 		Config::instance()->set_decryption_chain(new_chain);
 	} else {
 		error_dialog(_panel, variant::wx::insert_dcpomatic(_("Invalid %s export file")));
 	}
 }
 
+
 bool
 KeysPage::nag_alter_decryption_chain()
 {