From 380d7af94562883cdcaa60726d0ffa36f3dab304 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 6 Mar 2018 01:15:43 +0000
Subject: Merge EncryptionContext with DecryptionContext and use HMAC when
 decrypting.

---
 tools/dcpdecryptmxf.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools')

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;
-- 
cgit v1.2.3