/*
- Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "download_certificate_panel.h"
#include "download_certificate_dialog.h"
#include "lib/signal_manager.h"
+#include "lib/compose.hpp"
#include <dcp/util.h>
+#include <dcp/certificate_chain.h>
#include <dcp/exceptions.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
+using std::string;
using boost::function;
using boost::optional;
_overall_sizer->Add (_table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
- add_label_to_sizer (_table, this, _("Serial number"), true);
+ add_label_to_sizer (_table, this, _("Serial number"), true, 0, wxALIGN_CENTER_VERTICAL);
_serial = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (300, -1));
_table->Add (_serial, 1, wxEXPAND);
_overall_sizer->SetSizeHints (this);
}
-void
-DownloadCertificatePanel::load (boost::filesystem::path file)
+
+optional<string>
+DownloadCertificatePanel::load_certificate (boost::filesystem::path file)
{
try {
_certificate = dcp::Certificate (dcp::file_to_string (file));
} catch (dcp::MiscError& e) {
- error_dialog (this, _("Could not read certificate file."), std_to_wx(e.what()));
+ return String::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what());
+ }
+ return optional<string>();
+}
+
+
+optional<string>
+DownloadCertificatePanel::load_certificate_from_chain (boost::filesystem::path file)
+{
+ try {
+ _certificate = dcp::CertificateChain (dcp::file_to_string(file)).leaf();
+ } catch (dcp::MiscError& e) {
+ return String::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what());
}
+ return optional<string>();
}
+
optional<dcp::Certificate>
DownloadCertificatePanel::certificate () const
{