diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-08 23:56:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-08 23:56:52 +0000 |
| commit | 27e1378bede33c51835fd6307239692909d834d8 (patch) | |
| tree | 1c0da933f146ad814b99f80b61fa5f6aa2d684a9 /test | |
| parent | 4af8d182454ef8452210612c396d514077cd27e1 (diff) | |
Take thumbprint rather than a full dcp::Certificate for trusted devices.
Diffstat (limited to 'test')
| -rw-r--r-- | test/encryption_test.cc | 5 | ||||
| -rw-r--r-- | test/kdm_test.cc | 2 | ||||
| -rw-r--r-- | test/round_trip_test.cc | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/test/encryption_test.cc b/test/encryption_test.cc index 42b93bb0..d7b9aefa 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net> This file is part of libdcp. @@ -40,6 +40,7 @@ #include <boost/shared_ptr.hpp> using std::vector; +using std::string; using boost::shared_ptr; /** Load a certificate chain from build/test/data/ *.pem and then build @@ -135,7 +136,7 @@ BOOST_AUTO_TEST_CASE (encryption_test) "2012-07-17T04:45:18+00:00" ); - kdm.encrypt (signer, signer->leaf(), vector<dcp::Certificate>(), dcp::MODIFIED_TRANSITIONAL_1, true, 0).as_xml ("build/test/encryption_test.kdm.xml"); + kdm.encrypt (signer, signer->leaf(), vector<string>(), dcp::MODIFIED_TRANSITIONAL_1, true, 0).as_xml ("build/test/encryption_test.kdm.xml"); int r = system ( "xmllint --path schema --nonet --noout --schema schema/SMPTE-430-1-2006-Amd-1-2009-KDM.xsd build/test/encryption_test.kdm.xml " diff --git a/test/kdm_test.cc b/test/kdm_test.cc index 53aabd87..4a9d4ff8 100644 --- a/test/kdm_test.cc +++ b/test/kdm_test.cc @@ -146,7 +146,7 @@ kdm_forensic_test (cxml::Document& doc, bool picture, optional<int> audio) signer->set_key(dcp::file_to_string("test/data/private.key")); dcp::EncryptedKDM kdm = decrypted.encrypt ( - signer, signer->leaf(), vector<dcp::Certificate>(), dcp::MODIFIED_TRANSITIONAL_1, picture, audio + signer, signer->leaf(), vector<string>(), dcp::MODIFIED_TRANSITIONAL_1, picture, audio ); /* Check that we can pass this through correctly */ diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc index 567d3aa4..9c100124 100644 --- a/test/round_trip_test.cc +++ b/test/round_trip_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net> This file is part of libdcp. @@ -42,6 +42,7 @@ using std::list; using std::vector; +using std::string; using boost::shared_ptr; using boost::scoped_array; @@ -83,7 +84,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test) boost::filesystem::path const kdm_file = work_dir / "kdm.xml"; - kdm_A.encrypt(signer, signer->leaf(), vector<dcp::Certificate>(), dcp::MODIFIED_TRANSITIONAL_1, true, 0).as_xml (kdm_file); + kdm_A.encrypt(signer, signer->leaf(), vector<string>(), dcp::MODIFIED_TRANSITIONAL_1, true, 0).as_xml (kdm_file); /* Reload the KDM, using our private key to decrypt it */ dcp::DecryptedKDM kdm_B (dcp::EncryptedKDM (dcp::file_to_string (kdm_file)), signer->key().get ()); |