X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp.cc;h=f506d5c70bf2d4b9bc839fa25f71e6057a145c62;hb=372555641062f5c7c6e4a1d5f67cfaf12a2c6799;hp=6d5c0b2910ba5e6a78b41a75b5c873f8db81ea12;hpb=df28b0e939bd0f12ae31e6f7ba94fa954496b3b8;p=dcpomatic.git

diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index 6d5c0b291..f506d5c70 100644
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,12 +20,20 @@
 
 #include "dcp.h"
 #include "config.h"
+#include "film.h"
+#include "log.h"
+#include "dcpomatic_log.h"
+#include "compose.hpp"
 #include "dcp_content.h"
 #include <dcp/dcp.h>
 #include <dcp/decrypted_kdm.h>
+#include <dcp/exceptions.h>
 #include <boost/foreach.hpp>
 
+#include "i18n.h"
+
 using std::list;
+using std::string;
 using boost::shared_ptr;
 
 /** Find all the CPLs in our directories, cross-add assets and return the CPLs */
@@ -35,13 +43,12 @@ DCP::cpls () const
 	list<shared_ptr<dcp::DCP> > dcps;
 	list<shared_ptr<dcp::CPL> > cpls;
 
+	LOG_GENERAL ("Reading %1 DCP directories", _dcp_content->directories().size());
 	BOOST_FOREACH (boost::filesystem::path i, _dcp_content->directories()) {
 		shared_ptr<dcp::DCP> dcp (new dcp::DCP (i));
 		dcp->read (false, 0, true);
-		if (_dcp_content->kdm ()) {
-			dcp->add (dcp::DecryptedKDM (_dcp_content->kdm().get(), Config::instance()->decryption_chain()->key().get ()));
-		}
 		dcps.push_back (dcp);
+		LOG_GENERAL ("Reading DCP %1: %2 CPLs", i.string(), dcp->cpls().size());
 		BOOST_FOREACH (shared_ptr<dcp::CPL> i, dcp->cpls()) {
 			cpls.push_back (i);
 		}
@@ -50,7 +57,30 @@ DCP::cpls () const
 	BOOST_FOREACH (shared_ptr<dcp::DCP> i, dcps) {
 		BOOST_FOREACH (shared_ptr<dcp::DCP> j, dcps) {
 			if (i != j) {
-				i->resolve_refs (j->assets ());
+				i->resolve_refs (j->assets (true));
+			}
+		}
+	}
+
+	if (_dcp_content->kdm ()) {
+		BOOST_FOREACH (shared_ptr<dcp::DCP> i, dcps) {
+			try {
+				i->add (dcp::DecryptedKDM (_dcp_content->kdm().get(), Config::instance()->decryption_chain()->key().get ()));
+			} catch (dcp::KDMDecryptionError& e) {
+				/* Flesh out the error a bit */
+				string const kdm_subject_name = _dcp_content->kdm()->recipient_x509_subject_name();
+				bool on_chain = false;
+				shared_ptr<const dcp::CertificateChain> dc = Config::instance()->decryption_chain();
+				BOOST_FOREACH (dcp::Certificate i, dc->root_to_leaf()) {
+					if (i.subject() == kdm_subject_name) {
+						on_chain = true;
+					}
+				}
+				if (!on_chain) {
+					throw KDMError (_("KDM was not made for DCP-o-matic's decryption certificate."), e.what());
+				} else if (on_chain && kdm_subject_name != dc->leaf().subject()) {
+					throw KDMError (_("KDM was made for DCP-o-matic but not for its leaf certificate."), e.what());
+				}
 			}
 		}
 	}