Accept chains in files as well as individual certificates.

diff --git a/ChangeLog b/ChangeLog
index 6a121129478f9c188a22d5411cd7f0ef6959d060..0ef01127e6700b3b9744e4a9e34273f7336e597a 100644 (file)
--- 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 b258d68f1e44df88d552e70142c6c3febadab29b..84eb989eee1cfeec7821197cd30848dca48de9fb 100644 (file)
--- 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);
                        }