X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fvf_kdm_test.cc;h=665cf72a086895922659d516f2a23a721f1b17d2;hb=4f2fcd8a163ec540dc1676801d355710584d9138;hp=e52b11e674abaa91d3e9d512cecedffa470a01b3;hpb=da38c8a0156808595be0aae1b1490069a663fb78;p=dcpomatic.git

diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc
index e52b11e67..665cf72a0 100644
--- a/test/vf_kdm_test.cc
+++ b/test/vf_kdm_test.cc
@@ -41,7 +41,6 @@
 
 
 using std::make_shared;
-using std::shared_ptr;
 using std::string;
 using std::vector;
 
@@ -69,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 */
 
@@ -98,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.