using boost::shared_ptr;
using boost::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> >
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));
- list<shared_ptr<dcp::DCPReadError> > errors;
- dcp->read (_tolerant, &errors, true);
+ list<dcp::VerificationNote> notes;
+ dcp->read (¬es, true);
if (!_tolerant) {
- /** We accept and ignore EmptyAssetPathError but everything else is bad */
- BOOST_FOREACH (shared_ptr<dcp::DCPReadError> j, errors) {
- if (dynamic_pointer_cast<dcp::EmptyAssetPathError>(j)) {
+ /** 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::EMPTY_ASSET_PATH || j.code() == dcp::VerificationNote::EXTERNAL_ASSET) {
LOG_WARNING("Empty path in ASSETMAP of %1", i.string());
} else {
- boost::throw_exception(*j.get());
+ boost::throw_exception(dcp::ReadError(dcp::note_to_string(j)));
}
}
}
}
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);
}