summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-12-10 20:34:35 +0000
committerCarl Hetherington <cth@carlh.net>2018-12-10 20:34:35 +0000
commitec1bc8a03a2946738b7a4319daee4cf9e566e094 (patch)
tree15b1285ea49096fcf3e8c89fbeae80eaaf6c6d46
parentdceecebd37d5e1b5c098ad1358310d3f276c703c (diff)
Accept chains in files as well as individual certificates.
-rw-r--r--ChangeLog5
-rw-r--r--src/tools/dcpomatic_kdm_cli.cc3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a1211294..0ef01127e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-10 Carl Hetherington <cth@carlh.net>
+
+ * Accept certificate chains to dcpomatic2_kdm_cli as well
+ as single certificates.
+
2018-12-08 Carl Hetherington <cth@carlh.net>
* Prototype system to allow in-place translations.
diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index b258d68f1..84eb989ee 100644
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -504,7 +504,8 @@ int main (int argc, char* argv[])
case 'C':
{
/* Make a new screen and add it to the current cinema */
- shared_ptr<Screen> screen (new Screen (screen_description, dcp::Certificate (dcp::file_to_string (optarg)), vector<TrustedDevice>()));
+ dcp::CertificateChain chain (dcp::file_to_string(optarg));
+ shared_ptr<Screen> screen (new Screen (screen_description, chain.leaf(), vector<TrustedDevice>()));
if (cinema) {
cinema->add_screen (screen);
}