diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-09-19 13:49:37 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-09-19 13:49:37 +0100 |
| commit | 452144160eb864984121d3fa883a12d40fbf7e47 (patch) | |
| tree | f5da78c803eb8f668d2409de856ddc86be81d492 /test | |
| parent | afeea0415dd56a3106a4c71df2e4a6ccc2d72e74 (diff) | |
Rename Encryption -> Signer; move some methods into it.
Diffstat (limited to 'test')
| -rw-r--r-- | test/encryption_test.cc | 11 | ||||
| -rw-r--r-- | test/tests.cc | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/test/encryption_test.cc b/test/encryption_test.cc index 0df798f2..11028083 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -43,8 +43,8 @@ BOOST_AUTO_TEST_CASE (encryption) chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/crypt/intermediate.signed.pem"))); chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate ("build/test/crypt/leaf.signed.pem"))); - shared_ptr<libdcp::Encryption> crypt ( - new libdcp::Encryption ( + shared_ptr<libdcp::Signer> signer ( + new libdcp::Signer ( chain, "test/data/signer.key" ) @@ -81,12 +81,11 @@ BOOST_AUTO_TEST_CASE (encryption) cpl->add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (mp, ms, shared_ptr<libdcp::SubtitleAsset> ()))); d.add_cpl (cpl); - d.write_xml (false, xml_metadata, crypt); + d.write_xml (false, xml_metadata, signer); shared_ptr<xmlpp::Document> kdm = cpl->make_kdm ( - crypt->certificates, - crypt->signer_key, - crypt->certificates.leaf(), + signer, + signer->certificates().leaf(), boost::posix_time::time_from_string ("2013-01-01 00:00:00"), boost::posix_time::time_from_string ("2013-01-08 00:00:00"), false, diff --git a/test/tests.cc b/test/tests.cc index 42198abd..28e15cf1 100644 --- a/test/tests.cc +++ b/test/tests.cc @@ -34,7 +34,7 @@ #include "crypt_chain.h" #include "gamma_lut.h" #include "cpl.h" -#include "encryption.h" +#include "signer.h" #define BOOST_TEST_DYN_LINK #define BOOST_TEST_MODULE libdcp_test |