Use IAB rather than ATMOS in ISDCF names (#2482).

[dcpomatic.git] / test / dcp_digest_file_test.cc

diff --git a/test/dcp_digest_file_test.cc b/test/dcp_digest_file_test.cc
index becfd4317a0e9abed8a87f85da0d0c68efe0ba66..d67c734c126c3fc97d1b7cbc66b8376d10df4bb2 100644 (file)
--- a/test/dcp_digest_file_test.cc
+++ b/test/dcp_digest_file_test.cc
@@ -65,8 +65,8 @@ BOOST_AUTO_TEST_CASE (dcp_digest_file_test2)
                return {};
        };
 
-       auto red = content_factory("test/data/flat_red.png").front();
-       auto ov = new_test_film2 ("dcp_digest_file_test2_ov", { red });
+       auto red = content_factory("test/data/flat_red.png");
+       auto ov = new_test_film2 ("dcp_digest_file_test2_ov", red);
        ov->set_encrypted (true);
        make_and_verify_dcp (ov);
 
@@ -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);