diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-15 20:53:25 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-15 20:53:25 +0000 |
| commit | cb18463291c502979d661b75e9e446f6c9bb0e3c (patch) | |
| tree | 99f2b5b3bef02dfcc053905f9193f98028eab2bc /test | |
| parent | dc31f6d229c0b0c3d953022594c8bb713ca5d72e (diff) | |
Support trusted device lists in KDMs.
Diffstat (limited to 'test')
| -rw-r--r-- | test/encryption_test.cc | 3 | ||||
| -rw-r--r-- | test/round_trip_test.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/encryption_test.cc b/test/encryption_test.cc index bab20958..7c8256fa 100644 --- a/test/encryption_test.cc +++ b/test/encryption_test.cc @@ -39,6 +39,7 @@ #include <boost/test/unit_test.hpp> #include <boost/shared_ptr.hpp> +using std::vector; using boost::shared_ptr; /** Load a certificate chain from build/test/data/ *.pem and then build @@ -132,7 +133,7 @@ BOOST_AUTO_TEST_CASE (encryption_test) "2012-07-17T04:45:18+00:00" ); - kdm.encrypt (signer, signer->leaf(), dcp::MODIFIED_TRANSITIONAL_1).as_xml ("build/test/encryption_test.kdm.xml"); + kdm.encrypt (signer, signer->leaf(), vector<dcp::Certificate>(), dcp::MODIFIED_TRANSITIONAL_1).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/round_trip_test.cc b/test/round_trip_test.cc index a1f44a3e..45b2cbad 100644 --- a/test/round_trip_test.cc +++ b/test/round_trip_test.cc @@ -40,6 +40,7 @@ #include <iostream> using std::list; +using std::vector; using boost::shared_ptr; using boost::scoped_array; @@ -81,7 +82,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test) boost::filesystem::path const kdm_file = work_dir / "kdm.xml"; - kdm_A.encrypt(signer, signer->leaf(), dcp::MODIFIED_TRANSITIONAL_1).as_xml (kdm_file); + kdm_A.encrypt(signer, signer->leaf(), vector<dcp::Certificate>(), dcp::MODIFIED_TRANSITIONAL_1).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 ()); |