#include "lib/cross.h"
#include "lib/exceptions.h"
#include <dcp/exceptions.h>
-#include <dcp/signer.h>
+#include <dcp/certificate_chain.h>
#include <wx/stdpaths.h>
#include <wx/preferences.h>
#include <wx/filepicker.h>
_language->Append (wxT ("Svenska"));
_language->Append (wxT ("Русский"));
_language->Append (wxT ("Polski"));
+ _language->Append (wxT ("Danske"));
table->Add (_language);
wxStaticText* restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to see language changes)"), false);
checked_set (_set_language, config->language ());
if (config->language().get_value_or ("") == "fr") {
- _language->SetSelection (3);
+ checked_set (_language, 3);
} else if (config->language().get_value_or ("") == "it") {
- _language->SetSelection (4);
+ checked_set (_language, 4);
} else if (config->language().get_value_or ("") == "es") {
- _language->SetSelection (2);
+ checked_set (_language, 2);
} else if (config->language().get_value_or ("") == "sv") {
- _language->SetSelection (6);
+ checked_set (_language, 6);
} else if (config->language().get_value_or ("") == "de") {
- _language->SetSelection (0);
+ checked_set (_language, 0);
} else if (config->language().get_value_or ("") == "nl") {
- _language->SetSelection (5);
+ checked_set (_language, 5);
} else if (config->language().get_value_or ("") == "ru") {
- _language->SetSelection (7);
+ checked_set (_language, 7);
} else if (config->language().get_value_or ("") == "pl") {
checked_set (_language, 8);
+ } else if (config->language().get_value_or ("") == "da") {
+ checked_set (_language, 9);
} else {
_language->SetSelection (1);
}
case 8:
Config::instance()->set_language ("pl");
break;
+ case 9:
+ Config::instance()->set_language ("da");
+ break;
}
}
private:
void setup ()
{
- wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Certificate chain for signing DCPs and KDMs:"));
- _panel->GetSizer()->Add (m, 0, wxALL, _border);
+ wxFont subheading_font (*wxNORMAL_FONT);
+ subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
+
+ {
+ wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Signing DCPs and KDMs"));
+ m->SetFont (subheading_font);
+ _panel->GetSizer()->Add (m, 0, wxALL, _border);
+ }
wxBoxSizer* certificates_sizer = new wxBoxSizer (wxHORIZONTAL);
_panel->GetSizer()->Add (certificates_sizer, 0, wxLEFT | wxRIGHT, _border);
int r = 0;
- _remake_certificates = new wxButton (_panel, wxID_ANY, _("Re-make certificates..."));
- table->Add (_remake_certificates, wxGBPosition (r, 0), wxGBSpan (1, 3));
- ++r;
-
- add_label_to_grid_bag_sizer (table, _panel, _("Private key for leaf certificate"), true, wxGBPosition (r, 0));
+ add_label_to_grid_bag_sizer (table, _panel, _("Leaf private key"), true, wxGBPosition (r, 0));
_signer_private_key = new wxStaticText (_panel, wxID_ANY, wxT (""));
wxFont font = _signer_private_key->GetFont ();
font.SetFamily (wxFONTFAMILY_TELETYPE);
table->Add (_load_signer_private_key, wxGBPosition (r, 2));
++r;
- add_label_to_grid_bag_sizer (table, _panel, _("Certificate for decrypting DCPs"), true, wxGBPosition (r, 0));
+ _remake_certificates = new wxButton (_panel, wxID_ANY, _("Re-make certificates and key..."));
+ table->Add (_remake_certificates, wxGBPosition (r, 0), wxGBSpan (1, 3));
+ ++r;
+
+ {
+ wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Decrypting DCPs"));
+ m->SetFont (subheading_font);
+ table->Add (m, wxGBPosition (r, 0), wxGBSpan (1, 3), wxTOP, _border * 1.5);
+ ++r;
+ }
+
+ add_label_to_grid_bag_sizer (table, _panel, _("Certificate"), true, wxGBPosition (r, 0));
_decryption_certificate = new wxStaticText (_panel, wxID_ANY, wxT (""));
_decryption_certificate->SetFont (font);
table->Add (_decryption_certificate, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
table->Add (_load_decryption_certificate, wxGBPosition (r, 2));
++r;
- add_label_to_grid_bag_sizer (table, _panel, _("Private key for decrypting DCPs"), true, wxGBPosition (r, 0));
+ add_label_to_grid_bag_sizer (table, _panel, _("Private key"), true, wxGBPosition (r, 0));
_decryption_private_key = new wxStaticText (_panel, wxID_ANY, wxT (""));
_decryption_private_key->SetFont (font);
table->Add (_decryption_private_key, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
void config_changed ()
{
- _signer.reset (new dcp::Signer (*Config::instance()->signer().get ()));
+ _signer.reset (new dcp::CertificateChain (*Config::instance()->signer().get ()));
update_certificate_list ();
update_signer_private_key ();
if (d->ShowModal() == wxID_OK) {
try {
dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ())));
- _signer->certificates().add (c);
+ _signer->add (c);
Config::instance()->set_signer (_signer);
update_certificate_list ();
} catch (dcp::MiscError& e) {
}
_certificates->DeleteItem (i);
- _signer->certificates().remove (i);
+ _signer->remove (i);
Config::instance()->set_signer (_signer);
update_sensitivity ();
void update_certificate_list ()
{
_certificates->DeleteAllItems ();
- dcp::CertificateChain::List certs = _signer->certificates().root_to_leaf ();
+ dcp::CertificateChain::List certs = _signer->root_to_leaf ();
size_t n = 0;
for (dcp::CertificateChain::List::const_iterator i = certs.begin(); i != certs.end(); ++i) {
wxListItem item;
void remake_certificates ()
{
- dcp::CertificateChain chain = Config::instance()->signer()->certificates ();
+ shared_ptr<const dcp::CertificateChain> chain = Config::instance()->signer();
string intermediate_common_name;
- if (chain.root_to_leaf().size() >= 3) {
- dcp::CertificateChain::List all = chain.root_to_leaf ();
+ if (chain->root_to_leaf().size() >= 3) {
+ dcp::CertificateChain::List all = chain->root_to_leaf ();
dcp::CertificateChain::List::iterator i = all.begin ();
++i;
intermediate_common_name = i->subject_common_name ();
MakeSignerChainDialog* d = new MakeSignerChainDialog (
_panel,
- chain.root().subject_organization_name (),
- chain.root().subject_organizational_unit_name (),
- chain.root().subject_common_name (),
+ chain->root().subject_organization_name (),
+ chain->root().subject_organizational_unit_name (),
+ chain->root().subject_common_name (),
intermediate_common_name,
- chain.leaf().subject_common_name ()
+ chain->leaf().subject_common_name ()
);
if (d->ShowModal () == wxID_OK) {
_signer.reset (
- new dcp::Signer (
+ new dcp::CertificateChain (
openssl_path (),
d->organisation (),
d->organisational_unit (),
void update_signer_private_key ()
{
- checked_set (_signer_private_key, dcp::private_key_fingerprint (_signer->key ()));
+ checked_set (_signer_private_key, dcp::private_key_fingerprint (_signer->key().get ()));
}
void load_signer_private_key ()
wxStaticText* _decryption_private_key;
wxButton* _load_decryption_private_key;
wxButton* _export_decryption_certificate;
- shared_ptr<dcp::Signer> _signer;
+ shared_ptr<dcp::CertificateChain> _signer;
};
class TMSPage : public StandardPage
projects / dcpomatic.git / blobdiff