Warn when loading certificates from files that have other stuff after the certificate...

diff --git a/ChangeLog b/ChangeLog
index 3c27542c6de61cc5eec827fee84352e0ce3e05bf..f0912162bad4ad162c02f1118963235d3dc4adc9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-04-22  c.hetherington  <cth@carlh.net>
 
+       * Warn when loading certificates from files that have
+       other stuff after the certificate (#805).
+
        * Separate left-only and right-only video content
        in the timeline (#845).
 

diff --git a/cscript b/cscript
index 5c01a713aad289ca508ee8f623a0403198f6bc78..693496ef404901e4c35dd24c42bc82cc51eb0846 100644 (file)
--- a/cscript
+++ b/cscript
@@ -229,7 +229,7 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options),
-            ('libdcp', 'f0a6d7b'),
+            ('libdcp', 'ed81e7f'),
             ('libsub', 'b9fb00d'))
 
 def configure_options(target):

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index af4a04e2edd1bbf99ea5fef9c1bbf7c35f752afe..d0c7ffb72413f6701e085b5edb2816bcdf4d138a 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -752,6 +752,13 @@ private:
                if (d->ShowModal() == wxID_OK) {
                        try {
                                dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ())));
+                               if (c.extra_data ()) {
+                                       message_dialog (
+                                               this,
+                                               _("This file contains other certificates (or other data) after its first certificate. "
+                                                 "Only the first certificate will be used.")
+                                               );
+                               }
                                _chain->add (c);
                                _set (_chain);
                                update_certificate_list ();