diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-01-29 00:07:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-02-11 22:26:38 +0100 |
| commit | e18630852de1ac02c23c74cbe7643845b6f4bd17 (patch) | |
| tree | 9860c35db04509b5edf818d4ad6667b0c59651de /test/vf_kdm_test.cc | |
| parent | 6ca8f63ff524330bf58877ffe963466495e46758 (diff) | |
Cleanup: extract encrypt() call from Film::make_kdm().
Diffstat (limited to 'test/vf_kdm_test.cc')
| -rw-r--r-- | test/vf_kdm_test.cc | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc index 259f54031..665cf72a0 100644 --- a/test/vf_kdm_test.cc +++ b/test/vf_kdm_test.cc @@ -68,15 +68,11 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test) Config::instance()->set_decryption_chain (make_shared<dcp::CertificateChain>(openssl_path(), CERTIFICATE_VALIDITY_PERIOD)); - auto A_kdm = A->make_kdm ( - Config::instance()->decryption_chain()->leaf(), - vector<string>(), - A_dcp.cpls().front()->file().get(), - dcp::LocalTime("2030-07-21T00:00:00+00:00"), - dcp::LocalTime("2031-07-21T00:00:00+00:00"), - dcp::Formulation::MODIFIED_TRANSITIONAL_1, - true, 0 - ); + auto signer = Config::instance()->signer_chain(); + BOOST_REQUIRE(signer->valid()); + + auto const A_decrypted_kdm = A->make_kdm(A_dcp.cpls().front()->file().get(), dcp::LocalTime("2030-07-21T00:00:00+00:00"), dcp::LocalTime("2031-07-21T00:00:00+00:00")); + auto const A_kdm = A_decrypted_kdm.encrypt(signer, Config::instance()->decryption_chain()->leaf(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0); /* Import A into a new project, with the required KDM, and make a VF that refers to it */ @@ -97,15 +93,8 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test) dcp::DCP B_dcp ("build/test/vf_kdm_test_vf/" + B->dcp_name()); B_dcp.read (); - auto B_kdm = B->make_kdm ( - Config::instance()->decryption_chain()->leaf (), - vector<string>(), - B_dcp.cpls().front()->file().get(), - dcp::LocalTime ("2030-07-21T00:00:00+00:00"), - dcp::LocalTime ("2031-07-21T00:00:00+00:00"), - dcp::Formulation::MODIFIED_TRANSITIONAL_1, - true, 0 - ); + auto const B_decrypted_kdm = B->make_kdm(B_dcp.cpls().front()->file().get(), dcp::LocalTime ("2030-07-21T00:00:00+00:00"), dcp::LocalTime ("2031-07-21T00:00:00+00:00")); + auto const B_kdm = B_decrypted_kdm.encrypt(signer, Config::instance()->decryption_chain()->leaf(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0); /* Import the OV and VF into a new project with the KDM that was created for the VF. This KDM should decrypt assets from the OV too. |