Cleanup: extract encrypt() call from Film::make_kdm().

7 files changed, 36 insertions, 75 deletions

diff --git a/test/atmos_test.cc b/test/atmos_test.cc
index c2b0cb6d8..170736825 100644
--- a/test/atmos_test.cc
+++ b/test/atmos_test.cc
@@ -74,16 +74,11 @@ BOOST_AUTO_TEST_CASE (atmos_encrypted_passthrough_test)
 
 	BOOST_REQUIRE (!mxf_atmos_files_same(ref, dcp_file(film, "atmos")));
 
-	auto kdm = film->make_kdm (
-		Config::instance()->decryption_chain()->leaf(),
-		vector<string>(),
-		dcp_file(film, "cpl"),
-		dcp::LocalTime(),
-		dcp::LocalTime(),
-		dcp::Formulation::MODIFIED_TRANSITIONAL_1,
-		false,
-		optional<int>()
-		);
+	auto signer = Config::instance()->signer_chain();
+	BOOST_REQUIRE(signer->valid());
+
+	auto const decrypted_kdm = film->make_kdm(dcp_file(film, "cpl"), dcp::LocalTime(), dcp::LocalTime());
+	auto const kdm = decrypted_kdm.encrypt(signer, Config::instance()->decryption_chain()->leaf(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, false, {});
 
 	auto content2 = make_shared<DCPContent>(film->dir(film->dcp_name()));
 	content2->add_kdm (kdm);
diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc
index c9474b998..a37b60ee8 100644
--- a/test/dcp_decoder_test.cc
+++ b/test/dcp_decoder_test.cc
@@ -69,16 +69,11 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	dcp::DCP encrypted_dcp (encrypted->dir(encrypted->dcp_name()));
 	encrypted_dcp.read ();
 
-	auto kdm = encrypted->make_kdm (
-		Config::instance()->decryption_chain()->leaf(),
-		vector<string>(),
-		encrypted_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 decrypted_kdm = encrypted->make_kdm(encrypted_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 kdm = decrypted_kdm.encrypt(signer, Config::instance()->decryption_chain()->leaf(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0);
 
 	/* Add just the OV to a new project, move it around a bit and check that
 	   the _reels get reused.
diff --git a/test/dcp_digest_file_test.cc b/test/dcp_digest_file_test.cc
index 16fe4a5bb..d67c734c1 100644
--- a/test/dcp_digest_file_test.cc
+++ b/test/dcp_digest_file_test.cc
@@ -80,15 +80,11 @@ BOOST_AUTO_TEST_CASE (dcp_digest_file_test2)
 	auto ov_cpl = find_cpl.cpls()[0]->file();
 	BOOST_REQUIRE (static_cast<bool>(ov_cpl));
 
-	auto kdm = ov->make_kdm (
-		Config::instance()->decryption_chain()->leaf(),
-		{},
-		ov_cpl.get(),
-		dcp::LocalTime(), dcp::LocalTime(),
-		dcp::Formulation::MODIFIED_TRANSITIONAL_1,
-		true,
-		0
-		);
+	auto signer = Config::instance()->signer_chain();
+	BOOST_REQUIRE(signer->valid());
+
+	auto decrypted_kdm = ov->make_kdm(ov_cpl.get(), dcp::LocalTime(), dcp::LocalTime());
+	auto kdm = decrypted_kdm.encrypt(signer, Config::instance()->decryption_chain()->leaf(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0);
 
 	auto ov_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
 	ov_dcp->add_kdm (kdm);
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);
diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index e4545b7b0..acac79051 100644
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -74,15 +74,11 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 
 	Config::instance()->set_decryption_chain (make_shared<dcp::CertificateChain>(openssl_path(), CERTIFICATE_VALIDITY_PERIOD));
 
-	auto 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 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 kdm = decrypted_kdm.encrypt(signer, Config::instance()->decryption_chain()->leaf(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0);
 
 	auto B = new_test_film ("import_dcp_test2");
 	B->set_container (Ratio::from_id ("185"));
diff --git a/test/remake_id_test.cc b/test/remake_id_test.cc
index 0a29f9461..816a43feb 100644
--- a/test/remake_id_test.cc
+++ b/test/remake_id_test.cc
@@ -84,17 +84,12 @@ BOOST_AUTO_TEST_CASE (remake_id_test2)
 	}
 	BOOST_REQUIRE(cpl);
 
+	auto signer = Config::instance()->signer_chain();
+	BOOST_REQUIRE(signer->valid());
+
 	/* Make a DKDM */
-	auto kdm = film->make_kdm (
-		Config::instance()->decryption_chain()->leaf(),
-		vector<string>(),
-		*cpl,
-		dcp::LocalTime ("2030-01-01T01:00:00+00:00"),
-		dcp::LocalTime ("2031-01-01T01:00:00+00:00"),
-		dcp::Formulation::MODIFIED_TRANSITIONAL_1,
-		true,
-		0
-		);
+	auto const decrypted_kdm = film->make_kdm(*cpl, dcp::LocalTime ("2030-01-01T01:00:00+00:00"), dcp::LocalTime ("2031-01-01T01:00:00+00:00"));
+	auto const kdm = decrypted_kdm.encrypt(signer, Config::instance()->decryption_chain()->leaf(), {}, dcp::Formulation::MODIFIED_TRANSITIONAL_1, true, 0);
 
 	/* Import the DCP into a new film */
 	auto dcp_content = make_shared<DCPContent>(film->dir(film->dcp_name()));
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.