diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-20 23:38:07 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-20 23:38:07 +0100 |
| commit | 26f6ead44ff6bcb259c1755f91beb0a9e3eee988 (patch) | |
| tree | 00a3afe3375208ce7cd8f2650fefd368467fc5aa /test | |
| parent | e52f18d28d90c9deba31a441d566db94be0571b2 (diff) | |
Allow loading of EncryptedKDMs from strings.
Diffstat (limited to 'test')
| -rw-r--r-- | test/decryption_test.cc | 6 | ||||
| -rw-r--r-- | test/kdm_test.cc | 6 | ||||
| -rw-r--r-- | test/round_trip_test.cc | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/test/decryption_test.cc b/test/decryption_test.cc index b5077a46..d9170daa 100644 --- a/test/decryption_test.cc +++ b/test/decryption_test.cc @@ -60,7 +60,9 @@ BOOST_AUTO_TEST_CASE (decryption_test) BOOST_CHECK_EQUAL (encrypted.encrypted (), true); dcp::DecryptedKDM kdm ( - dcp::EncryptedKDM ("test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml"), + dcp::EncryptedKDM ( + dcp::file_to_string ("test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml") + ), dcp::file_to_string ("test/data/private.key") ); @@ -80,7 +82,7 @@ BOOST_AUTO_TEST_CASE (decryption_test) BOOST_AUTO_TEST_CASE (failing_kdm_test) { dcp::DecryptedKDM kdm ( - dcp::EncryptedKDM ("test/data/target.pem.crt.de5d4eba-e683-41ca-bdda-aa4ad96af3f4.kdm.xml"), + dcp::EncryptedKDM (dcp::file_to_string ("test/data/target.pem.crt.de5d4eba-e683-41ca-bdda-aa4ad96af3f4.kdm.xml")), dcp::file_to_string ("test/data/private.key") ); } diff --git a/test/kdm_test.cc b/test/kdm_test.cc index 1fc76dba..c2d40b3b 100644 --- a/test/kdm_test.cc +++ b/test/kdm_test.cc @@ -30,7 +30,9 @@ using boost::shared_ptr; BOOST_AUTO_TEST_CASE (kdm_test) { dcp::DecryptedKDM kdm ( - dcp::EncryptedKDM ("test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml"), + dcp::EncryptedKDM ( + dcp::file_to_string ("test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml") + ), dcp::file_to_string ("test/data/private.key") ); @@ -51,7 +53,7 @@ BOOST_AUTO_TEST_CASE (kdm_test) BOOST_AUTO_TEST_CASE (kdm_passthrough_test) { dcp::EncryptedKDM kdm ( - "test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml" + dcp::file_to_string ("test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml") ); shared_ptr<xmlpp::DomParser> parser (new xmlpp::DomParser ()); diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc index b0594931..94097e75 100644 --- a/test/round_trip_test.cc +++ b/test/round_trip_test.cc @@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test) kdm_A.encrypt(signer, signer->certificates().leaf(), dcp::MODIFIED_TRANSITIONAL_1).as_xml (kdm_file); /* Reload the KDM, using our private key to decrypt it */ - dcp::DecryptedKDM kdm_B (dcp::EncryptedKDM (kdm_file), signer->key ()); + dcp::DecryptedKDM kdm_B (dcp::EncryptedKDM (dcp::file_to_string (kdm_file)), signer->key ()); /* Check that the decrypted KDMKeys are the same as the ones we started with */ BOOST_CHECK_EQUAL (kdm_A.keys().size(), kdm_B.keys().size()); |