X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp.cc;h=8baf489d1c2b71d353d69c167b405ef2e3883abb;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=48b704777423d8a7c20e75dbb27a6efc8cc7e67a;hpb=fea83d9ef5d02149f857a11de79ed266773fd5a1;p=dcpomatic.git

diff --git a/src/lib/dcp.cc b/src/lib/dcp.cc
index 48b704777..8baf489d1 100644
--- a/src/lib/dcp.cc
+++ b/src/lib/dcp.cc
@@ -34,33 +34,9 @@
 
 using std::list;
 using std::string;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 
-dcp::DecryptedKDM
-DCP::decrypted_kdm () const
-{
-	try {
-		return dcp::DecryptedKDM (_dcp_content->kdm().get(), Config::instance()->decryption_chain()->key().get());
-	} catch (dcp::KDMDecryptionError& e) {
-		/* Try to 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());
-		} else {
-			throw;
-		}
-	}
-}
 
 /** Find all the CPLs in our directories, cross-add assets and return the CPLs */
 list<shared_ptr<dcp::CPL> >
@@ -75,12 +51,12 @@ DCP::cpls () const
 		list<dcp::VerificationNote> notes;
 		dcp->read (&notes, true);
 		if (!_tolerant) {
-			/** We accept and ignore EmptyAssetPathError but everything else is bad */
+			/** We accept and ignore EMPTY_ASSET_PATH and EXTERNAL_ASSET but everything else is bad */
 			BOOST_FOREACH (dcp::VerificationNote j, notes) {
-				if (j.code() == dcp::VerificationNote::Code::EMPTY_ASSET_PATH) {
+				if (j.code() == dcp::VerificationNote::EMPTY_ASSET_PATH || j.code() == dcp::VerificationNote::EXTERNAL_ASSET) {
 					LOG_WARNING("Empty path in ASSETMAP of %1", i.string());
 				} else {
-					boost::throw_exception(dcp::DCPReadError(dcp::note_to_string(j)));
+					boost::throw_exception(dcp::ReadError(dcp::note_to_string(j)));
 				}
 			}
 		}
@@ -100,7 +76,7 @@ DCP::cpls () const
 	}
 
 	if (_dcp_content->kdm ()) {
-		dcp::DecryptedKDM k = decrypted_kdm ();
+		dcp::DecryptedKDM k = decrypt_kdm_with_helpful_error (_dcp_content->kdm().get());
 		BOOST_FOREACH (shared_ptr<dcp::DCP> i, dcps) {
 			i->add (k);
 		}