Warn when loading certificates from files that have other stuff after the certificate (#805).

3 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 3c27542c6..f0912162b 100644
--- 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 5c01a713a..693496ef4 100644
--- 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 af4a04e2e..d0c7ffb72 100644
--- 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 ();