summaryrefslogtreecommitdiff
path: root/test/encryption_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-01-29 00:07:10 +0100
committerCarl Hetherington <cth@carlh.net>2023-02-11 22:26:38 +0100
commite18630852de1ac02c23c74cbe7643845b6f4bd17 (patch)
tree9860c35db04509b5edf818d4ad6667b0c59651de /test/encryption_test.cc
parent6ca8f63ff524330bf58877ffe963466495e46758 (diff)
Cleanup: extract encrypt() call from Film::make_kdm().
Diffstat (limited to 'test/encryption_test.cc')
-rw-r--r--test/encryption_test.cc15
1 files changed, 5 insertions, 10 deletions
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index b7703f4e9..9cadd087e 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -55,16 +55,11 @@ BOOST_AUTO_TEST_CASE (smpte_dcp_with_subtitles_can_be_decrypted)
auto cpl = dcp.cpls()[0];
BOOST_REQUIRE (cpl->file());
- auto kdm = film->make_kdm (
- Config::instance()->decryption_chain()->leaf(),
- {},
- *cpl->file(),
- dcp::LocalTime(),
- dcp::LocalTime(),
- dcp::Formulation::MODIFIED_TRANSITIONAL_1,
- true,
- 0
- );
+ auto signer = Config::instance()->signer_chain();
+ BOOST_REQUIRE(signer->valid());
+
+ auto const decrypted_kdm = film->make_kdm(*cpl->file(), dcp::LocalTime(), dcp::LocalTime());
+ auto const kdm = decrypted_kdm.encrypt(signer, Config::instance()->decryption_chain()->leaf(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0);
auto dcp_content = make_shared<DCPContent>(film->dir(film->dcp_name()));
dcp_content->add_kdm (kdm);