diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-11-20 00:25:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-11-20 21:37:37 +0100 |
| commit | 7b439c9baf719b135922e6c6b53472915fed3573 (patch) | |
| tree | 96493aefa814e5d2bcd73d1bab057d8e6f62d643 /src/lib | |
| parent | 9b5cff118fe03649c0c404b35f2900ff36008637 (diff) | |
Verify encrypted DCPs (more) correctly (#2659).
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/verify_dcp_job.cc | 21 | ||||
| -rw-r--r-- | src/lib/verify_dcp_job.h | 3 |
2 files changed, 21 insertions, 3 deletions
diff --git a/src/lib/verify_dcp_job.cc b/src/lib/verify_dcp_job.cc index e054fae3a..5e50ec51d 100644 --- a/src/lib/verify_dcp_job.cc +++ b/src/lib/verify_dcp_job.cc @@ -19,6 +19,7 @@ */ +#include "config.h" #include "cross.h" #include "verify_dcp_job.h" #include "content.h" @@ -35,9 +36,10 @@ using namespace boost::placeholders; #endif -VerifyDCPJob::VerifyDCPJob (vector<boost::filesystem::path> directories) +VerifyDCPJob::VerifyDCPJob(vector<boost::filesystem::path> directories, vector<boost::filesystem::path> kdms) : Job (shared_ptr<Film>()) , _directories (directories) + , _kdms(kdms) { } @@ -76,7 +78,22 @@ VerifyDCPJob::update_stage (string s, optional<boost::filesystem::path> path) void VerifyDCPJob::run () { - _notes = dcp::verify(_directories, bind(&VerifyDCPJob::update_stage, this, _1, _2), bind(&VerifyDCPJob::set_progress, this, _1, false), {}, libdcp_resources_path() / "xsd"); + vector<dcp::DecryptedKDM> decrypted_kdms; + auto key = Config::instance()->decryption_chain()->key(); + if (key) { + for (auto kdm: _kdms) { + decrypted_kdms.push_back(dcp::DecryptedKDM{dcp::EncryptedKDM(dcp::file_to_string(kdm)), *key}); + } + } + + _notes = dcp::verify( + _directories, + decrypted_kdms, + bind(&VerifyDCPJob::update_stage, this, _1, _2), + bind(&VerifyDCPJob::set_progress, this, _1, false), + {}, + libdcp_resources_path() / "xsd" + ); bool failed = false; for (auto i: _notes) { diff --git a/src/lib/verify_dcp_job.h b/src/lib/verify_dcp_job.h index b00f0128b..61a347507 100644 --- a/src/lib/verify_dcp_job.h +++ b/src/lib/verify_dcp_job.h @@ -29,7 +29,7 @@ class Content; class VerifyDCPJob : public Job { public: - explicit VerifyDCPJob (std::vector<boost::filesystem::path> directories); + VerifyDCPJob(std::vector<boost::filesystem::path> directories, std::vector<boost::filesystem::path> kdms); ~VerifyDCPJob (); std::string name () const override; @@ -44,5 +44,6 @@ private: void update_stage (std::string s, boost::optional<boost::filesystem::path> path); std::vector<boost::filesystem::path> _directories; + std::vector<boost::filesystem::path> _kdms; std::vector<dcp::VerificationNote> _notes; }; |