Supporters update.

[dcpomatic.git] / test / encryption_test.cc

diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 5a4a078da81f1224960df35869b19fd6cfdc6e34..9cadd087e04cf34da9c032c12860b058211b07c3 100644 (file)
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -35,8 +35,8 @@ using std::make_shared;
 
 BOOST_AUTO_TEST_CASE (smpte_dcp_with_subtitles_can_be_decrypted)
 {
-       auto content = content_factory("test/data/15s.srt").front();
-       auto film = new_test_film2 ("smpte_dcp_with_subtitles_can_be_decrypted", { content });
+       auto content = content_factory("test/data/15s.srt");
+       auto film = new_test_film2 ("smpte_dcp_with_subtitles_can_be_decrypted", content);
        film->set_interop (false);
        film->set_encrypted (true);
        make_and_verify_dcp (
@@ -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);