X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fencrypted_ecinema_kdm.cc;h=faea034249a5d8c9294737aad8f408182376db4f;hp=f0502ab31ddde720d1e50f57dd7bfd444a79e2ac;hb=e6f2a4b0085b35be378f2cdd687146857d61df80;hpb=951d70db4f81b5ddd4093f11853637c8ecbe63c5

diff --git a/src/lib/encrypted_ecinema_kdm.cc b/src/lib/encrypted_ecinema_kdm.cc
index f0502ab31..faea03424 100644
--- a/src/lib/encrypted_ecinema_kdm.cc
+++ b/src/lib/encrypted_ecinema_kdm.cc
@@ -21,6 +21,7 @@
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 
 #include "encrypted_ecinema_kdm.h"
+#include "ecinema_kdm_data.h"
 #include "exceptions.h"
 #include "cross.h"
 #include <dcp/key.h>
@@ -35,15 +36,29 @@
 using std::cout;
 using std::string;
 using boost::shared_ptr;
+using boost::optional;
 using dcp::Certificate;
 
-EncryptedECinemaKDM::EncryptedECinemaKDM (string id, string name, dcp::Key content_key, Certificate recipient)
+EncryptedECinemaKDM::EncryptedECinemaKDM (string id, string name, dcp::Key content_key, optional<dcp::LocalTime> not_valid_before, optional<dcp::LocalTime> not_valid_after, Certificate recipient)
 	: _id (id)
 	, _name (name)
 {
 	RSA* rsa = recipient.public_key ();
-	_content_key = dcp::Data (RSA_size(rsa));
-	int const N = RSA_public_encrypt (content_key.length(), content_key.value(), _content_key.data().get(), rsa, RSA_PKCS1_OAEP_PADDING);
+	_data = dcp::Data (RSA_size(rsa));
+
+	int input_size = ECINEMA_KDM_KEY_LENGTH;
+	if (not_valid_before && not_valid_after) {
+		input_size += ECINEMA_KDM_NOT_VALID_BEFORE_LENGTH + ECINEMA_KDM_NOT_VALID_AFTER_LENGTH;
+	}
+
+	dcp::Data input (input_size);
+	memcpy (input.data().get(), content_key.value(), ECINEMA_KDM_KEY_LENGTH);
+	if (not_valid_before && not_valid_after) {
+		memcpy (input.data().get() + ECINEMA_KDM_NOT_VALID_BEFORE, not_valid_before->as_string().c_str(), ECINEMA_KDM_NOT_VALID_BEFORE_LENGTH);
+		memcpy (input.data().get() + ECINEMA_KDM_NOT_VALID_AFTER, not_valid_after->as_string().c_str(), ECINEMA_KDM_NOT_VALID_AFTER_LENGTH);
+	}
+
+	int const N = RSA_public_encrypt (input_size, input.data().get(), _data.data().get(), rsa, RSA_PKCS1_OAEP_PADDING);
 	if (N == -1) {
 		throw KDMError ("Could not encrypt ECinema KDM", ERR_error_string(ERR_get_error(), 0));
 	}
@@ -56,9 +71,9 @@ EncryptedECinemaKDM::EncryptedECinemaKDM (string xml)
 	doc.read_string (xml);
 	_id = doc.string_child ("Id");
 	_name = doc.string_child ("Name");
-	_content_key = dcp::Data (256);
-	int const len = dcp::base64_decode (doc.string_child("Key"), _content_key.data().get(), _content_key.size());
-	_content_key.set_size (len);
+	_data = dcp::Data (256);
+	int const len = dcp::base64_decode (doc.string_child("Data"), _data.data().get(), _data.size());
+	_data.set_size (len);
 }
 
 string
@@ -67,8 +82,8 @@ EncryptedECinemaKDM::as_xml () const
 	string key;
 
 	/* Lazy overallocation */
-	char out[_content_key.size() * 2];
-	Kumu::base64encode (_content_key.data().get(), _content_key.size(), out, _content_key.size() * 2);
+	char out[_data.size() * 2];
+	Kumu::base64encode (_data.data().get(), _data.size(), out, _data.size() * 2);
 	int const N = strlen (out);
 	string lines;
 	for (int i = 0; i < N; ++i) {
@@ -82,7 +97,7 @@ EncryptedECinemaKDM::as_xml () const
 	xmlpp::Element* root = document.create_root_node ("ECinemaSecurityMessage");
 	root->add_child("Id")->add_child_text(_id);
 	root->add_child("Name")->add_child_text(_name);
-	root->add_child("Key")->add_child_text(lines);
+	root->add_child("Data")->add_child_text(lines);
 	return document.write_to_string ("UTF-8");
 }