X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fmxf.cc;h=1c493901e72c47102799c059a17a55dda38f047e;hb=689d56339857b0a82156641f28392b8d2f11beea;hp=93ff89a5fac03acc68c6628d870e24a88d4783b7;hpb=bb5faa34a893dcec91329d6856335e050cf8357c;p=libdcp.git

diff --git a/src/mxf.cc b/src/mxf.cc
index 93ff89a5..1c493901 100644
--- a/src/mxf.cc
+++ b/src/mxf.cc
@@ -36,6 +36,7 @@
 #include <iostream>
 
 using std::string;
+using std::cout;
 using std::list;
 using std::pair;
 using boost::shared_ptr;
@@ -43,28 +44,18 @@ using boost::dynamic_pointer_cast;
 using namespace dcp;
 
 MXF::MXF ()
-	: _encryption_context (0)
-	, _decryption_context (0)
-{
-
-}
-
-MXF::MXF (boost::filesystem::path file)
-	: Asset (file)
-	, _encryption_context (0)
-	, _decryption_context (0)
+	: _decryption_context (0)
 {
 
 }
 
 MXF::~MXF ()
 {
-	delete _encryption_context;
 	delete _decryption_context;
 }
 
 void
-MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, Standard standard)
+MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id, Standard standard) const
 {
 	writer_info->ProductVersion = _metadata.product_version;
 	writer_info->CompanyName = _metadata.company_name;
@@ -76,43 +67,19 @@ MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, Standard standard)
 		writer_info->LabelSetType = ASDCP::LS_MXF_SMPTE;
 	}
 	unsigned int c;
-	Kumu::hex2bin (_id.c_str(), writer_info->AssetUUID, Kumu::UUID_Length, &c);
+	Kumu::hex2bin (id.c_str(), writer_info->AssetUUID, Kumu::UUID_Length, &c);
 	DCP_ASSERT (c == Kumu::UUID_Length);
 
-	if (_key) {
+	if (_key_id) {
 		Kumu::GenRandomUUID (writer_info->ContextID);
 		writer_info->EncryptedEssence = true;
 
 		unsigned int c;
-		Kumu::hex2bin (_key_id.c_str(), writer_info->CryptographicKeyID, Kumu::UUID_Length, &c);
+		Kumu::hex2bin (_key_id.get().c_str(), writer_info->CryptographicKeyID, Kumu::UUID_Length, &c);
 		DCP_ASSERT (c == Kumu::UUID_Length);
 	}
 }
 
-bool
-MXF::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const
-{
-	if (!Asset::equals (other, opt, note)) {
-		return false;
-	}
-	
-	shared_ptr<const MXF> other_mxf = dynamic_pointer_cast<const MXF> (other);
-	if (!other_mxf) {
-		return false;
-	}
-	
-	if (_file.leaf() != other_mxf->file().leaf()) {
-		if (!opt.mxf_filenames_can_differ) {
-			note (DCP_ERROR, "MXF: filenames differ");
-			return false;
-		} else {
-			note (DCP_NOTE, "MXF: filenames differ");
-		}
-	}
-	
-	return true;
-}
-
 /** Set the (private) key that will be used to encrypt or decrypt this MXF's content.
  *  This is the top-secret key that is distributed (itself encrypted) to cinemas
  *  via Key Delivery Messages (KDMs).
@@ -123,33 +90,29 @@ MXF::set_key (Key key)
 {
 	_key = key;
 
-	if (_key_id.empty ()) {
+	if (!_key_id) {
 		/* 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");
 	}
-
-	_encryption_context = new ASDCP::AESEncContext;
-	if (ASDCP_FAILURE (_encryption_context->InitKey (_key->value ()))) {
-		throw MiscError ("could not set up encryption context");
-	}
-	
-	uint8_t cbc_buffer[ASDCP::CBC_BLOCK_SIZE];
-	
-	Kumu::FortunaRNG rng;
-	if (ASDCP_FAILURE (_encryption_context->SetIVec (rng.FillRandom (cbc_buffer, ASDCP::CBC_BLOCK_SIZE)))) {
-		throw MiscError ("could not set up CBC initialization vector");
-	}
 }
 
-void
+string
 MXF::read_writer_info (ASDCP::WriterInfo const & info)
 {
 	char buffer[64];
+
+	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));
-	_id = buffer;
+	return buffer;
 }