*/
-#include <boost/test/unit_test.hpp>
-#include <dcp/cpl.h>
+#include "test.h"
#include "lib/film.h"
#include "lib/dcp_subtitle_content.h"
#include "lib/ratio.h"
#include "lib/dcp_content.h"
#include "lib/ffmpeg_content.h"
#include "lib/config.h"
-#include "test.h"
+#include "lib/cross.h"
+#include <dcp/cpl.h>
+#include <boost/test/unit_test.hpp>
+using std::vector;
using boost::shared_ptr;
/** Make an encrypted DCP, import it and make a new unencrypted DCP */
dcp::DCP A_dcp ("build/test/import_dcp_test/" + A->dcp_name());
A_dcp.read ();
+ Config::instance()->set_decryption_chain (shared_ptr<dcp::CertificateChain> (new dcp::CertificateChain (openssl_path ())));
+
dcp::EncryptedKDM kdm = A->make_kdm (
- Config::instance()->decryption_certificate(),
+ Config::instance()->decryption_chain()->leaf (),
+ vector<dcp::Certificate> (),
A_dcp.cpls().front()->file (),
dcp::LocalTime ("2014-07-21T00:00:00+00:00"),
dcp::LocalTime ("2024-07-21T00:00:00+00:00"),
B->make_dcp ();
wait_for_jobs ();
- check_dcp ("build/test/import_dcp_test2/" + B->dcp_name(), "test/data/import_dcp_test2");
+ /* Should be 1s red, 1s green, 1s blue */
+ check_dcp ("test/data/import_dcp_test2", "build/test/import_dcp_test2/" + B->dcp_name());
}