X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmxf.cc;h=03e3d1d8dafe9027a4a450dbbc483557cdaed6fa;hb=d4b350cc524543b8142ac803232b31af751885e2;hp=0cde395c1ca92752ff0505a85b0ec0e5ed5f72b4;hpb=42a65cba0d8da23c12af52015e66cd9dc0b5a5fa;p=libdcp.git

diff --git a/src/mxf.cc b/src/mxf.cc
index 0cde395c..03e3d1d8 100644
--- a/src/mxf.cc
+++ b/src/mxf.cc
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/asset.cc
@@ -22,20 +36,21 @@
  */
 
 #include "raw_convert.h"
-#include "AS_DCP.h"
-#include "KM_prng.h"
-#include "KM_util.h"
 #include "mxf.h"
 #include "util.h"
 #include "metadata.h"
 #include "exceptions.h"
 #include "dcp_assert.h"
 #include "compose.hpp"
+#include <asdcp/AS_DCP.h>
+#include <asdcp/KM_prng.h>
+#include <asdcp/KM_util.h>
 #include <libxml++/nodes/element.h>
 #include <boost/filesystem.hpp>
 #include <iostream>
 
 using std::string;
+using std::cout;
 using std::list;
 using std::pair;
 using boost::shared_ptr;
@@ -43,16 +58,11 @@ using boost::dynamic_pointer_cast;
 using namespace dcp;
 
 MXF::MXF ()
-	: _decryption_context (0)
+	: _context_id (make_uuid ())
 {
 
 }
 
-MXF::~MXF ()
-{
-	delete _decryption_context;
-}
-
 void
 MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id, Standard standard) const
 {
@@ -69,8 +79,10 @@ MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id, Standard stand
 	Kumu::hex2bin (id.c_str(), writer_info->AssetUUID, Kumu::UUID_Length, &c);
 	DCP_ASSERT (c == Kumu::UUID_Length);
 
+	writer_info->UsesHMAC = true;
+
 	if (_key_id) {
-		Kumu::GenRandomUUID (writer_info->ContextID);
+		Kumu::hex2bin (_context_id.c_str(), writer_info->ContextID, Kumu::UUID_Length, &c);
 		writer_info->EncryptedEssence = true;
 
 		unsigned int c;
@@ -93,11 +105,6 @@ MXF::set_key (Key key)
 		/* No key ID so far; we now need one */
 		_key_id = make_uuid ();
 	}
-	
-	_decryption_context = new ASDCP::AESDecContext;
-	if (ASDCP_FAILURE (_decryption_context->InitKey (_key->value ()))) {
-		throw MiscError ("could not set up decryption context");
-	}
 }
 
 string
@@ -105,11 +112,13 @@ MXF::read_writer_info (ASDCP::WriterInfo const & info)
 {
 	char buffer[64];
 
-	Kumu::bin2UUIDhex (info.CryptographicKeyID, ASDCP::UUIDlen, buffer, sizeof (buffer));
-	_key_id = buffer;
+	if (info.EncryptedEssence) {
+		Kumu::bin2UUIDhex (info.CryptographicKeyID, ASDCP::UUIDlen, buffer, sizeof (buffer));
+		_key_id = buffer;
+	}
 
 	_metadata.read (info);
-	
+
 	Kumu::bin2UUIDhex (info.AssetUUID, ASDCP::UUIDlen, buffer, sizeof (buffer));
 	return buffer;
 }