diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-03-06 01:15:43 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-03-13 22:29:01 +0000 |
| commit | 380d7af94562883cdcaa60726d0ffa36f3dab304 (patch) | |
| tree | a36f4828d8ebf54efcf0f3155f49b54b430b67f6 /tools | |
| parent | 0e29e68e94daade47167ac5bc6b51362ef02b5c3 (diff) | |
Merge EncryptionContext with DecryptionContext and use HMAC when decrypting.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dcpdecryptmxf.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/dcpdecryptmxf.cc b/tools/dcpdecryptmxf.cc index b6e28b25..6a10c641 100644 --- a/tools/dcpdecryptmxf.cc +++ b/tools/dcpdecryptmxf.cc @@ -33,7 +33,7 @@ #include "encrypted_kdm.h" #include "decrypted_kdm.h" -#include "decryption_context.h" +#include "crypto_context.h" #include "key.h" #include "util.h" #include "atmos_asset.h" @@ -98,7 +98,7 @@ atmos ( exit (EXIT_FAILURE); } - dcp::DecryptionContext dc (key.get()); + dcp::DecryptionContext dc (key.get(), dcp::SMPTE); ASDCP::ATMOS::AtmosDescriptor desc; if (ASDCP_FAILURE (reader.FillAtmosDescriptor (desc))) { @@ -109,7 +109,7 @@ atmos ( ASDCP::DCData::FrameBuffer buffer (Kumu::Megabyte); for (size_t i = 0; i < desc.ContainerDuration; ++i) { - reader.ReadFrame (i, buffer, dc.decryption(), 0); + reader.ReadFrame (i, buffer, dc.context(), 0); } return 0; |