summaryrefslogtreecommitdiff
path: root/test/encryption_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-09-19 20:44:42 +0100
committerCarl Hetherington <cth@carlh.net>2013-09-19 20:44:42 +0100
commit8d6c3c9ae554430582dcb016897e87f6d04d5d78 (patch)
tree5b329eeb60fe7372cc89740d4cf8fa1d5fe51614 /test/encryption_test.cc
parent827901db3d834465b1121c9f8041b9faf4923ec9 (diff)
Various encryption-related stuff.
Diffstat (limited to 'test/encryption_test.cc')
-rw-r--r--test/encryption_test.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 1b0de19a..3501befc 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -39,9 +39,9 @@ BOOST_AUTO_TEST_CASE (encryption)
libdcp::DCP d ("build/test/DCP/bar");
libdcp::CertificateChain chain;
- chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/signer/ca.self-signed.pem")));
- chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/signer/intermediate.signed.pem")));
- chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/signer/leaf.signed.pem")));
+ chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (boost::filesystem::path ("build/test/signer/ca.self-signed.pem"))));
+ chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (boost::filesystem::path ("build/test/signer/intermediate.signed.pem"))));
+ chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (boost::filesystem::path ("build/test/signer/leaf.signed.pem"))));
shared_ptr<libdcp::Signer> signer (
new libdcp::Signer (
@@ -59,12 +59,13 @@ BOOST_AUTO_TEST_CASE (encryption)
&d.Progress,
24,
24,
- true,
libdcp::Size (32, 32),
false,
mxf_metadata
));
+ mp->set_key (libdcp::Key ());
+
shared_ptr<libdcp::SoundAsset> ms (new libdcp::SoundAsset (
wav,
"build/test/bar",
@@ -73,10 +74,11 @@ BOOST_AUTO_TEST_CASE (encryption)
24,
24,
2,
- true,
false,
mxf_metadata
));
+
+ ms->set_key (libdcp::Key ());
cpl->add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (mp, ms, shared_ptr<libdcp::SubtitleAsset> ())));
d.add_cpl (cpl);