diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-19 21:46:01 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-19 21:46:01 +0000 |
| commit | 7702e5d643440e75369078863b34f8a574ee4143 (patch) | |
| tree | e01edc51718fd6c475b449748ff7fa6e5c526bc9 /test/decryption_test.cc | |
| parent | c91aa27e13703874c944fed763b5b039ceae71d2 (diff) | |
Considerable re-work of KDM class to express the difference between encrypted and unencrypted KDMs.
Diffstat (limited to 'test/decryption_test.cc')
| -rw-r--r-- | test/decryption_test.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/decryption_test.cc b/test/decryption_test.cc index 8dfeffa6..f80bb900 100644 --- a/test/decryption_test.cc +++ b/test/decryption_test.cc @@ -18,10 +18,11 @@ */ #include <boost/test/unit_test.hpp> -#include "kdm.h" #include "dcp.h" #include "mono_picture_frame.h" #include "cpl.h" +#include "decrypted_kdm.h" +#include "encrypted_kdm.h" #include "argb_frame.h" #include "mono_picture_mxf.h" #include "reel_picture_asset.h" @@ -58,11 +59,11 @@ BOOST_AUTO_TEST_CASE (decryption_test) encrypted.read (); BOOST_CHECK_EQUAL (encrypted.encrypted (), true); - dcp::KDM kdm ( - "test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml", + 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"), "test/data/private.key" ); - + encrypted.add (kdm); shared_ptr<const dcp::ARGBFrame> plaintext_frame = get_frame (plaintext); @@ -78,8 +79,8 @@ BOOST_AUTO_TEST_CASE (decryption_test) /** Load in a KDM that didn't work at first */ BOOST_AUTO_TEST_CASE (failing_kdm_test) { - dcp::KDM kdm ( - "test/data/target.pem.crt.de5d4eba-e683-41ca-bdda-aa4ad96af3f4.kdm.xml", + dcp::DecryptedKDM kdm ( + dcp::EncryptedKDM ("test/data/target.pem.crt.de5d4eba-e683-41ca-bdda-aa4ad96af3f4.kdm.xml"), "test/data/private.key" ); } |