+
+
+/** Check for bug #1232 where remaking an encrypted DCP causes problems with HMAC IDs (?) */
+BOOST_AUTO_TEST_CASE (remake_id_test2)
+{
+ /* Make a DCP */
+ auto content = content_factory("test/data/flat_red.png");
+ auto film = new_test_film2 ("remake_id_test2_1", content);
+ film->set_encrypted (true);
+ make_and_verify_dcp (film);
+
+ /* Remove and remake it */
+ boost::filesystem::remove_all(film->dir(film->dcp_name()));
+ make_and_verify_dcp (film);
+
+ /* Find the CPL */
+ optional<boost::filesystem::path> cpl;
+ for (auto i: boost::filesystem::directory_iterator(film->dir(film->dcp_name()))) {
+ if (i.path().filename().string().substr(0, 4) == "cpl_") {
+ cpl = i.path();
+ }
+ }
+ BOOST_REQUIRE(cpl);
+
+ /* 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
+ );
+
+ /* Import the DCP into a new film */
+ auto dcp_content = make_shared<DCPContent>(film->dir(film->dcp_name()));
+ auto film2 = new_test_film2("remake_id_test2_2", { dcp_content });
+ dcp_content->add_kdm(kdm);
+ JobManager::instance()->add(make_shared<ExamineContentJob>(film2, dcp_content));
+ BOOST_REQUIRE(!wait_for_jobs());
+ make_and_verify_dcp (film2);
+}