X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fencrypted_kdm.cc;h=d1089c0be8d2eab62aba039e7b69c836d89ab597;hb=816365d20e0c6ef37b6bf499a42a0d3ecad22c05;hp=d7cdd8ddce9d9e86ddca944a3c987a2d2c41a811;hpb=c3ee26fb99346986340e590f8605ae99564a4934;p=libdcp.git diff --git a/src/encrypted_kdm.cc b/src/encrypted_kdm.cc index d7cdd8dd..d1089c0b 100644 --- a/src/encrypted_kdm.cc +++ b/src/encrypted_kdm.cc @@ -1,71 +1,106 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington - 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 . + + 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/encrypted_kdm.cc + * @brief EncryptedKDM class + */ + + +#include "certificate_chain.h" +#include "compose.hpp" #include "encrypted_kdm.h" +#include "exceptions.h" +#include "file.h" #include "util.h" -#include "signer.h" #include +#include #include #include #include +#include #include +#include + using std::list; +using std::vector; using std::string; +using std::make_shared; using std::map; using std::pair; -using boost::shared_ptr; +using std::shared_ptr; +using boost::optional; +using boost::starts_with; using namespace dcp; + namespace dcp { -/** Namespace for classes used to hold our data; they are internal to this .cc file */ + +/** Namespace for classes used to hold our data; they are internal to this .cc file */ namespace data { + class Signer { public: Signer () {} - - Signer (shared_ptr node) + + explicit Signer (shared_ptr node) : x509_issuer_name (node->string_child ("X509IssuerName")) , x509_serial_number (node->string_child ("X509SerialNumber")) { - + } void as_xml (xmlpp::Element* node) const { - node->add_child("X509IssuerName", "ds")->add_child_text (x509_issuer_name); - node->add_child("X509SerialNumber", "ds")->add_child_text (x509_serial_number); + cxml::add_child(node, "X509IssuerName", string("ds"))->add_child_text(x509_issuer_name); + cxml::add_child(node, "X509SerialNumber", string("ds"))->add_child_text(x509_serial_number); } - + string x509_issuer_name; string x509_serial_number; }; + class X509Data { public: X509Data () {} - - X509Data (boost::shared_ptr node) + + explicit X509Data (std::shared_ptr node) : x509_issuer_serial (Signer (node->node_child ("X509IssuerSerial"))) , x509_certificate (node->string_child ("X509Certificate")) { @@ -74,41 +109,43 @@ public: void as_xml (xmlpp::Element* node) const { - x509_issuer_serial.as_xml (node->add_child ("X509IssuerSerial", "ds")); - node->add_child("X509Certificate", "ds")->add_child_text (x509_certificate); + x509_issuer_serial.as_xml(cxml::add_child(node, "X509IssuerSerial", string("ds"))); + cxml::add_child(node, "X509Certificate", string("ds"))->add_child_text(x509_certificate); } - + Signer x509_issuer_serial; std::string x509_certificate; }; - + + class Reference { public: Reference () {} - - Reference (string u) + + explicit Reference (string u) : uri (u) {} - Reference (shared_ptr node) + explicit Reference (shared_ptr node) : uri (node->string_attribute ("URI")) , digest_value (node->string_child ("DigestValue")) { } - + void as_xml (xmlpp::Element* node) const { node->set_attribute ("URI", uri); - node->add_child("DigestMethod", "ds")->set_attribute ("Algorithm", "http://www.w3.org/2001/04/xmlenc#sha256"); - node->add_child("DigestValue", "ds")->add_child_text (digest_value); + cxml::add_child(node, "DigestMethod", string("ds"))->set_attribute("Algorithm", "http://www.w3.org/2001/04/xmlenc#sha256"); + cxml::add_child(node, "DigestValue", string("ds"))->add_child_text(digest_value); } - + string uri; string digest_value; }; + class SignedInfo { public: @@ -117,14 +154,13 @@ public: , authenticated_private ("#ID_AuthenticatedPrivate") {} - SignedInfo (shared_ptr node) + explicit SignedInfo (shared_ptr node) { - list > references = node->node_children ("Reference"); - for (list >::const_iterator i = references.begin(); i != references.end(); ++i) { - if ((*i)->string_attribute ("URI") == "#ID_AuthenticatedPublic") { - authenticated_public = Reference (*i); - } else if ((*i)->string_attribute ("URI") == "#ID_AuthenticatedPrivate") { - authenticated_private = Reference (*i); + for (auto i: node->node_children ("Reference")) { + if (i->string_attribute("URI") == "#ID_AuthenticatedPublic") { + authenticated_public = Reference(i); + } else if (i->string_attribute("URI") == "#ID_AuthenticatedPrivate") { + authenticated_private = Reference(i); } /* XXX: do something if we don't recognise the node */ @@ -133,93 +169,98 @@ public: void as_xml (xmlpp::Element* node) const { - node->add_child ("CanonicalizationMethod", "ds")->set_attribute ( + cxml::add_child(node, "CanonicalizationMethod", string("ds"))->set_attribute( "Algorithm", "http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments" ); - node->add_child ("SignatureMethod", "ds")->set_attribute ( + cxml::add_child(node, "SignatureMethod", string("ds"))->set_attribute( "Algorithm", "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" ); - - authenticated_public.as_xml (node->add_child ("Reference", "ds")); - authenticated_private.as_xml (node->add_child ("Reference", "ds")); + + authenticated_public.as_xml(cxml::add_child(node, "Reference", string("ds"))); + authenticated_private.as_xml(cxml::add_child(node, "Reference", string("ds"))); } - + private: Reference authenticated_public; Reference authenticated_private; }; - + + class Signature { public: Signature () {} - Signature (shared_ptr node) + explicit Signature (shared_ptr node) : signed_info (node->node_child ("SignedInfo")) , signature_value (node->string_child ("SignatureValue")) { - list > x509_data_nodes = node->node_child("KeyInfo")->node_children ("X509Data"); - for (list >::const_iterator i = x509_data_nodes.begin(); i != x509_data_nodes.end(); ++i) { - x509_data.push_back (X509Data (*i)); + for (auto i: node->node_child("KeyInfo")->node_children ("X509Data")) { + x509_data.push_back(X509Data(i)); } } - void as_xml (xmlpp::Node* node) const + void as_xml(xmlpp::Element* element) const { - signed_info.as_xml (node->add_child ("SignedInfo", "ds")); - node->add_child("SignatureValue", "ds")->add_child_text (signature_value); - - xmlpp::Element* key_info_node = node->add_child ("KeyInfo", "ds"); - for (std::list::const_iterator i = x509_data.begin(); i != x509_data.end(); ++i) { - i->as_xml (key_info_node->add_child ("X509Data", "ds")); + signed_info.as_xml(cxml::add_child(element, "SignedInfo", string("ds"))); + cxml::add_child(element, "SignatureValue", string("ds"))->add_child_text(signature_value); + + auto key_info_node = cxml::add_child(element, "KeyInfo", string("ds")); + for (auto i: x509_data) { + i.as_xml(cxml::add_child(key_info_node, "X509Data", string("ds"))); } } SignedInfo signed_info; string signature_value; - list x509_data; + vector x509_data; }; + class AuthenticatedPrivate { public: AuthenticatedPrivate () {} - - AuthenticatedPrivate (shared_ptr node) + + explicit AuthenticatedPrivate (shared_ptr node) { - list > encrypted_key_nodes = node->node_children ("EncryptedKey"); - for (list >::const_iterator i = encrypted_key_nodes.begin(); i != encrypted_key_nodes.end(); ++i) { - encrypted_key.push_back ((*i)->node_child("CipherData")->string_child ("CipherValue")); + for (auto i: node->node_children ("EncryptedKey")) { + encrypted_key.push_back (i->node_child("CipherData")->string_child("CipherValue")); } } - void as_xml (xmlpp::Element* node, map& references) const + void as_xml (xmlpp::Element* node, map& references) const { - references["ID_AuthenticatedPrivate"] = node->set_attribute ("Id", "ID_AuthenticatedPrivate"); + references["ID_AuthenticatedPrivate"] = dynamic_cast(node->set_attribute("Id", "ID_AuthenticatedPrivate")); - for (list::const_iterator i = encrypted_key.begin(); i != encrypted_key.end(); ++i) { - xmlpp::Element* encrypted_key = node->add_child ("EncryptedKey", "enc"); - xmlpp::Element* encryption_method = encrypted_key->add_child ("EncryptionMethod", "enc"); + for (auto i: encrypted_key) { + auto encrypted_key = cxml::add_child(node, "EncryptedKey", string("enc")); + /* XXX: hack for testing with Dolby */ + encrypted_key->set_namespace_declaration ("http://www.w3.org/2001/04/xmlenc#", "enc"); + auto encryption_method = cxml::add_child(encrypted_key, "EncryptionMethod", string("enc")); encryption_method->set_attribute ("Algorithm", "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"); - xmlpp::Element* digest_method = encryption_method->add_child ("DigestMethod", "ds"); + auto digest_method = cxml::add_child(encryption_method, "DigestMethod", string("ds")); + /* XXX: hack for testing with Dolby */ + digest_method->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "ds"); digest_method->set_attribute ("Algorithm", "http://www.w3.org/2000/09/xmldsig#sha1"); - xmlpp::Element* cipher_data = encrypted_key->add_child ("CipherData", "enc"); - cipher_data->add_child("CipherValue", "enc")->add_child_text (*i); + auto cipher_data = cxml::add_child(encrypted_key, "CipherData", string("enc")); + cxml::add_child(cipher_data, "CipherValue", string("enc"))->add_child_text(i); } } - - list encrypted_key; + + vector encrypted_key; }; + class TypedKeyId { public: TypedKeyId () {} - - TypedKeyId (shared_ptr node) + + explicit TypedKeyId (shared_ptr node) : key_type (node->string_child ("KeyType")) - , key_id (node->string_child ("KeyId").substr (9)) + , key_id (remove_urn_uuid (node->string_child ("KeyId"))) { } @@ -231,70 +272,84 @@ public: void as_xml (xmlpp::Element* node) const { - node->add_child("KeyType")->add_child_text (key_type); - node->add_child("KeyId")->add_child_text ("urn:uuid:" + key_id); + auto type = cxml::add_child(node, "KeyType"); + type->add_child_text (key_type); + cxml::add_text_child(node, "KeyId", "urn:uuid:" + key_id); + /* XXX: this feels like a bit of a hack */ + if (key_type == "MDEK") { + type->set_attribute ("scope", "http://www.dolby.com/cp850/2012/KDM#kdm-key-type"); + } else { + type->set_attribute ("scope", "http://www.smpte-ra.org/430-1/2006/KDM#kdm-key-type"); + } } string key_type; string key_id; }; + class KeyIdList { public: KeyIdList () {} - - KeyIdList (shared_ptr node) + + explicit KeyIdList (shared_ptr node) { - list > typed_key_id_nodes = node->node_children ("TypedKeyId"); - for (list >::const_iterator i = typed_key_id_nodes.begin(); i != typed_key_id_nodes.end(); ++i) { - typed_key_id.push_back (TypedKeyId (*i)); + for (auto i: node->node_children ("TypedKeyId")) { + typed_key_id.push_back(TypedKeyId(i)); } } void as_xml (xmlpp::Element* node) const { - for (list::const_iterator i = typed_key_id.begin(); i != typed_key_id.end(); ++i) { - i->as_xml (node->add_child("TypedKeyId")); + for (auto const& i: typed_key_id) { + i.as_xml(cxml::add_child(node, ("TypedKeyId"))); } } - list typed_key_id; + vector typed_key_id; }; + class AuthorizedDeviceInfo { public: AuthorizedDeviceInfo () {} - - AuthorizedDeviceInfo (shared_ptr node) - : device_list_identifier (node->string_child ("DeviceListIdentifier").substr (9)) - , device_list_description (node->string_child ("DeviceListDescription")) - , certificate_thumbprint (node->node_child("DeviceList")->string_child ("CertificateThumbprint")) - { + explicit AuthorizedDeviceInfo (shared_ptr node) + : device_list_identifier (remove_urn_uuid (node->string_child ("DeviceListIdentifier"))) + , device_list_description (node->optional_string_child ("DeviceListDescription")) + { + for (auto i: node->node_child("DeviceList")->node_children("CertificateThumbprint")) { + certificate_thumbprints.push_back (i->content ()); + } } void as_xml (xmlpp::Element* node) const { - node->add_child ("DeviceListIdentifier")->add_child_text ("urn:uuid:" + device_list_identifier); - node->add_child ("DeviceListDescription")->add_child_text (device_list_description); - xmlpp::Element* device_list = node->add_child ("DeviceList"); - device_list->add_child("CertificateThumbprint")->add_child_text (certificate_thumbprint); + cxml::add_text_child(node, "DeviceListIdentifier", "urn:uuid:" + device_list_identifier); + if (device_list_description) { + cxml::add_text_child(node, "DeviceListDescription", device_list_description.get()); + } + auto device_list = cxml::add_child(node, "DeviceList"); + for (auto i: certificate_thumbprints) { + cxml::add_text_child(device_list, "CertificateThumbprint", i); + } } /** DeviceListIdentifier without the urn:uuid: prefix */ string device_list_identifier; - string device_list_description; - string certificate_thumbprint; + boost::optional device_list_description; + std::vector certificate_thumbprints; }; + class X509IssuerSerial { public: X509IssuerSerial () {} - - X509IssuerSerial (shared_ptr node) + + explicit X509IssuerSerial (shared_ptr node) : x509_issuer_name (node->string_child ("X509IssuerName")) , x509_serial_number (node->string_child ("X509SerialNumber")) { @@ -303,20 +358,21 @@ public: void as_xml (xmlpp::Element* node) const { - node->add_child("X509IssuerName", "ds")->add_child_text (x509_issuer_name); - node->add_child("X509SerialNumber", "ds")->add_child_text (x509_serial_number); + cxml::add_child(node, "X509IssuerName", string("ds"))->add_child_text(x509_issuer_name); + cxml::add_child(node, "X509SerialNumber", string("ds"))->add_child_text(x509_serial_number); } string x509_issuer_name; string x509_serial_number; }; + class Recipient { public: Recipient () {} - - Recipient (shared_ptr node) + + explicit Recipient (shared_ptr node) : x509_issuer_serial (node->node_child ("X509IssuerSerial")) , x509_subject_name (node->string_child ("X509SubjectName")) { @@ -325,67 +381,109 @@ public: void as_xml (xmlpp::Element* node) const { - x509_issuer_serial.as_xml (node->add_child ("X509IssuerSerial")); - node->add_child("X509SubjectName")->add_child_text (x509_subject_name); + x509_issuer_serial.as_xml(cxml::add_child(node, "X509IssuerSerial")); + cxml::add_text_child(node, "X509SubjectName", x509_subject_name); } - + X509IssuerSerial x509_issuer_serial; string x509_subject_name; }; + class KDMRequiredExtensions { public: KDMRequiredExtensions () {} - - KDMRequiredExtensions (shared_ptr node) + + explicit KDMRequiredExtensions (shared_ptr node) : recipient (node->node_child ("Recipient")) - , composition_playlist_id (node->string_child ("CompositionPlaylistId").substr (9)) + , composition_playlist_id (remove_urn_uuid (node->string_child ("CompositionPlaylistId"))) , content_title_text (node->string_child ("ContentTitleText")) , not_valid_before (node->string_child ("ContentKeysNotValidBefore")) , not_valid_after (node->string_child ("ContentKeysNotValidAfter")) , authorized_device_info (node->node_child ("AuthorizedDeviceInfo")) , key_id_list (node->node_child ("KeyIdList")) { - + disable_forensic_marking_picture = false; + disable_forensic_marking_audio = optional(); + if (node->optional_node_child("ForensicMarkFlagList")) { + for (auto i: node->node_child("ForensicMarkFlagList")->node_children("ForensicMarkFlag")) { + if (i->content() == picture_disable) { + disable_forensic_marking_picture = true; + } else if (starts_with(i->content(), audio_disable)) { + disable_forensic_marking_audio = 0; + string const above = audio_disable + "-above-channel-"; + if (starts_with(i->content(), above)) { + auto above_number = i->content().substr(above.length()); + if (above_number == "") { + throw KDMFormatError("Badly-formatted ForensicMarkFlag"); + } + disable_forensic_marking_audio = atoi(above_number.c_str()); + } + } + } + } } void as_xml (xmlpp::Element* node) const { node->set_attribute ("xmlns", "http://www.smpte-ra.org/schemas/430-1/2006/KDM"); - - recipient.as_xml (node->add_child ("Recipient")); - node->add_child("CompositionPlaylistId")->add_child_text ("urn:uuid:" + composition_playlist_id); + + recipient.as_xml(cxml::add_child(node, "Recipient")); + cxml::add_text_child(node, "CompositionPlaylistId", "urn:uuid:" + composition_playlist_id); + cxml::add_text_child(node, "ContentTitleText", content_title_text); if (content_authenticator) { - node->add_child("ContentAuthenticator")->add_child_text (content_authenticator.get ()); + cxml::add_text_child(node, "ContentAuthenticator", content_authenticator.get()); } - node->add_child("ContentTitleText")->add_child_text (content_title_text); - node->add_child("ContentKeysNotValidBefore")->add_child_text (not_valid_before.as_string ()); - node->add_child("ContentKeysNotValidAfter")->add_child_text (not_valid_after.as_string ()); - authorized_device_info.as_xml (node->add_child ("AuthorizedDeviceInfo")); - key_id_list.as_xml (node->add_child ("KeyIdList")); - - xmlpp::Element* forensic_mark_flag_list = node->add_child ("ForensicMarkFlagList"); - forensic_mark_flag_list->add_child("ForensicMarkFlag")->add_child_text ("http://www.smpte-ra.org/430-1/2006/KDM#mrkflg-picture-disable"); - forensic_mark_flag_list->add_child("ForensicMarkFlag")->add_child_text ("http://www.smpte-ra.org/430-1/2006/KDM#mrkflg-audio-disable"); - } - + cxml::add_text_child(node, "ContentKeysNotValidBefore", not_valid_before.as_string()); + cxml::add_text_child(node, "ContentKeysNotValidAfter", not_valid_after.as_string()); + if (authorized_device_info) { + authorized_device_info->as_xml(cxml::add_child(node, "AuthorizedDeviceInfo")); + } + key_id_list.as_xml(cxml::add_child(node, "KeyIdList")); + + if (disable_forensic_marking_picture || disable_forensic_marking_audio) { + auto forensic_mark_flag_list = cxml::add_child(node, "ForensicMarkFlagList"); + if (disable_forensic_marking_picture) { + cxml::add_text_child(forensic_mark_flag_list, "ForensicMarkFlag", picture_disable); + } + if (disable_forensic_marking_audio) { + auto mrkflg = audio_disable; + if (*disable_forensic_marking_audio > 0) { + mrkflg += String::compose ("-above-channel-%1", *disable_forensic_marking_audio); + } + cxml::add_text_child(forensic_mark_flag_list, "ForensicMarkFlag", mrkflg); + } + } + } + Recipient recipient; string composition_playlist_id; boost::optional content_authenticator; string content_title_text; LocalTime not_valid_before; LocalTime not_valid_after; - AuthorizedDeviceInfo authorized_device_info; + bool disable_forensic_marking_picture; + optional disable_forensic_marking_audio; + boost::optional authorized_device_info; KeyIdList key_id_list; + +private: + static const string picture_disable; + static const string audio_disable; }; + +const string KDMRequiredExtensions::picture_disable = "http://www.smpte-ra.org/430-1/2006/KDM#mrkflg-picture-disable"; +const string KDMRequiredExtensions::audio_disable = "http://www.smpte-ra.org/430-1/2006/KDM#mrkflg-audio-disable"; + + class RequiredExtensions { public: RequiredExtensions () {} - - RequiredExtensions (shared_ptr node) + + explicit RequiredExtensions (shared_ptr node) : kdm_required_extensions (node->node_child ("KDMRequiredExtensions")) { @@ -393,23 +491,26 @@ public: void as_xml (xmlpp::Element* node) const { - kdm_required_extensions.as_xml (node->add_child ("KDMRequiredExtensions")); + kdm_required_extensions.as_xml(cxml::add_child(node, "KDMRequiredExtensions")); } - + KDMRequiredExtensions kdm_required_extensions; }; + class AuthenticatedPublic { public: AuthenticatedPublic () : message_id (make_uuid ()) + /* XXX: hack for Dolby to see if there must be a not-empty annotation text */ + , annotation_text ("none") , issue_date (LocalTime().as_string ()) {} - - AuthenticatedPublic (shared_ptr node) - : message_id (node->string_child ("MessageId").substr (9)) - , annotation_text (node->string_child ("AnnotationText")) + + explicit AuthenticatedPublic (shared_ptr node) + : message_id (remove_urn_uuid (node->string_child ("MessageId"))) + , annotation_text (node->optional_string_child ("AnnotationText")) , issue_date (node->string_child ("IssueDate")) , signer (node->node_child ("Signer")) , required_extensions (node->node_child ("RequiredExtensions")) @@ -417,28 +518,31 @@ public: } - void as_xml (xmlpp::Element* node, map& references) const + void as_xml (xmlpp::Element* node, map& references) const { - references["ID_AuthenticatedPublic"] = node->set_attribute ("Id", "ID_AuthenticatedPublic"); - - node->add_child("MessageId")->add_child_text ("urn:uuid:" + message_id); - node->add_child("MessageType")->add_child_text ("http://www.smpte-ra.org/430-1/2006/KDM#kdm-key-type"); - node->add_child("AnnotationText")->add_child_text (annotation_text); - node->add_child("IssueDate")->add_child_text (issue_date); + references["ID_AuthenticatedPublic"] = dynamic_cast(node->set_attribute("Id", "ID_AuthenticatedPublic")); - signer.as_xml (node->add_child ("Signer")); - required_extensions.as_xml (node->add_child ("RequiredExtensions")); + cxml::add_text_child(node, "MessageId", "urn:uuid:" + message_id); + cxml::add_text_child(node, "MessageType", "http://www.smpte-ra.org/430-1/2006/KDM#kdm-key-type"); + if (annotation_text) { + cxml::add_text_child(node, "AnnotationText", annotation_text.get()); + } + cxml::add_text_child(node, "IssueDate", issue_date); - node->add_child ("NonCriticalExtensions"); + signer.as_xml(cxml::add_child(node, "Signer")); + required_extensions.as_xml(cxml::add_child(node, "RequiredExtensions")); + + cxml::add_child(node, "NonCriticalExtensions"); } string message_id; - string annotation_text; + optional annotation_text; string issue_date; Signer signer; RequiredExtensions required_extensions; }; + /** Class to describe our data. We use a class hierarchy as it's a bit nicer * for XML data than a flat description. */ @@ -449,30 +553,31 @@ public: { } - - EncryptedKDMData (shared_ptr node) + + explicit EncryptedKDMData (shared_ptr node) : authenticated_public (node->node_child ("AuthenticatedPublic")) , authenticated_private (node->node_child ("AuthenticatedPrivate")) , signature (node->node_child ("Signature")) { - + } shared_ptr as_xml () const { - shared_ptr document (new xmlpp::Document ()); - xmlpp::Element* root = document->create_root_node ("DCinemaSecurityMessage", "http://www.smpte-ra.org/schemas/430-3/2006/ETM"); + auto document = make_shared(); + auto root = document->create_root_node("DCinemaSecurityMessage", "http://www.smpte-ra.org/schemas/430-3/2006/ETM"); root->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "ds"); root->set_namespace_declaration ("http://www.w3.org/2001/04/xmlenc#", "enc"); - map references; - authenticated_public.as_xml (root->add_child ("AuthenticatedPublic"), references); - authenticated_private.as_xml (root->add_child ("AuthenticatedPrivate"), references); - signature.as_xml (root->add_child ("Signature", "ds")); + map references; + authenticated_public.as_xml(cxml::add_child(root, "AuthenticatedPublic"), references); + authenticated_private.as_xml(cxml::add_child(root, "AuthenticatedPrivate"), references); + signature.as_xml(cxml::add_child(root, "Signature", string("ds"))); - for (map::const_iterator i = references.begin(); i != references.end(); ++i) { - xmlAddID (0, document->cobj(), (const xmlChar *) i->first.c_str(), i->second->cobj ()); + for (auto i: references) { + xmlAddID (0, document->cobj(), (const xmlChar *) i.first.c_str(), i.second->cobj()); } + indent (document->get_root_node(), 0); return document; } @@ -481,88 +586,134 @@ public: Signature signature; }; + } } -EncryptedKDM::EncryptedKDM (boost::filesystem::path file) - : _data (new data::EncryptedKDMData (shared_ptr (new cxml::Document ("DCinemaSecurityMessage", file)))) + +EncryptedKDM::EncryptedKDM (string s) { - + try { + auto doc = make_shared("DCinemaSecurityMessage"); + doc->read_string (s); + _data = new data::EncryptedKDMData (doc); + } catch (xmlpp::parse_error& e) { + throw KDMFormatError (e.what ()); + } catch (xmlpp::internal_error& e) { + throw KDMFormatError(e.what()); + } catch (cxml::Error& e) { + throw KDMFormatError(e.what()); + } } + EncryptedKDM::EncryptedKDM ( - shared_ptr signer, - shared_ptr recipient, - string device_list_description, + shared_ptr signer, + Certificate recipient, + vector trusted_devices, string cpl_id, string content_title_text, + optional annotation_text, LocalTime not_valid_before, LocalTime not_valid_after, Formulation formulation, - list > key_ids, - list keys + bool disable_forensic_marking_picture, + optional disable_forensic_marking_audio, + vector> key_ids, + vector keys ) : _data (new data::EncryptedKDMData) { /* Fill our XML-ish description in with the juicy bits that the caller has given */ - - data::AuthenticatedPublic& aup = _data->authenticated_public; - aup.signer.x509_issuer_name = signer->certificates().leaf()->issuer (); - aup.signer.x509_serial_number = signer->certificates().leaf()->serial (); - - data::KDMRequiredExtensions& kre = _data->authenticated_public.required_extensions.kdm_required_extensions; - kre.recipient.x509_issuer_serial.x509_issuer_name = recipient->issuer (); - kre.recipient.x509_issuer_serial.x509_serial_number = recipient->serial (); - kre.recipient.x509_subject_name = recipient->subject (); - kre.authorized_device_info.device_list_description = device_list_description; + + /* Our ideas, based on http://isdcf.com/papers/ISDCF-Doc5-kdm-certs.pdf, about the KDM types are: + * + * Type Trusted-device thumb ContentAuthenticator + * MODIFIED_TRANSITIONAL_1 assume-trust No + * MULTIPLE_MODIFIED_TRANSITIONAL_1 as specified No + * DCI_ANY assume-trust Yes + * DCI_SPECIFIC as specified Yes + */ + + auto& aup = _data->authenticated_public; + aup.signer.x509_issuer_name = signer->leaf().issuer (); + aup.signer.x509_serial_number = signer->leaf().serial (); + aup.annotation_text = annotation_text; + + auto& kre = _data->authenticated_public.required_extensions.kdm_required_extensions; + kre.recipient.x509_issuer_serial.x509_issuer_name = recipient.issuer (); + kre.recipient.x509_issuer_serial.x509_serial_number = recipient.serial (); + kre.recipient.x509_subject_name = recipient.subject (); kre.composition_playlist_id = cpl_id; - if (formulation == DCI_ANY || formulation == DCI_SPECIFIC) { - kre.content_authenticator = signer->certificates().leaf()->thumbprint (); + if (formulation == Formulation::DCI_ANY || formulation == Formulation::DCI_SPECIFIC) { + kre.content_authenticator = signer->leaf().thumbprint (); } kre.content_title_text = content_title_text; kre.not_valid_before = not_valid_before; kre.not_valid_after = not_valid_after; - kre.authorized_device_info.device_list_identifier = make_uuid (); - string n = recipient->common_name (); + kre.disable_forensic_marking_picture = disable_forensic_marking_picture; + kre.disable_forensic_marking_audio = disable_forensic_marking_audio; + + kre.authorized_device_info = data::AuthorizedDeviceInfo (); + kre.authorized_device_info->device_list_identifier = make_uuid (); + auto n = recipient.subject_common_name (); if (n.find (".") != string::npos) { n = n.substr (n.find (".") + 1); } - kre.authorized_device_info.device_list_description = n; + kre.authorized_device_info->device_list_description = n; - if (formulation == MODIFIED_TRANSITIONAL_1 || formulation == DCI_ANY) { + if (formulation == Formulation::MODIFIED_TRANSITIONAL_1 || formulation == Formulation::DCI_ANY) { /* Use the "assume trust" thumbprint */ - kre.authorized_device_info.certificate_thumbprint = "2jmj7l5rSw0yVb/vlWAYkK/YBwk="; - } else if (formulation == DCI_SPECIFIC) { - /* Use the recipient thumbprint */ - kre.authorized_device_info.certificate_thumbprint = recipient->thumbprint (); + kre.authorized_device_info->certificate_thumbprints.push_back ("2jmj7l5rSw0yVb/vlWAYkK/YBwk="); + } else if (formulation == Formulation::MULTIPLE_MODIFIED_TRANSITIONAL_1 || formulation == Formulation::DCI_SPECIFIC) { + if (trusted_devices.empty ()) { + /* Fall back on the "assume trust" thumbprint so we + can generate "modified-transitional-1" KDMs + together with "multiple-modified-transitional-1" + KDMs in one go, and similarly for "dci-any" etc. + */ + kre.authorized_device_info->certificate_thumbprints.push_back ("2jmj7l5rSw0yVb/vlWAYkK/YBwk="); + } else { + /* As I read the standard we should use the + recipient /and/ other trusted device thumbprints + here. MJD reports that this doesn't work with + his setup; a working KDM does not include the + recipient's thumbprint (recipient.thumbprint()). + Waimea uses only the trusted devices here, too. + */ + for (auto i: trusted_devices) { + kre.authorized_device_info->certificate_thumbprints.push_back(i); + } + } } - for (list >::const_iterator i = key_ids.begin(); i != key_ids.end(); ++i) { - kre.key_id_list.typed_key_id.push_back (data::TypedKeyId (i->first, i->second)); + for (auto i: key_ids) { + kre.key_id_list.typed_key_id.push_back(data::TypedKeyId(i.first, i.second)); } _data->authenticated_private.encrypted_key = keys; /* Read the XML so far and sign it */ - shared_ptr doc = _data->as_xml (); - xmlpp::Node::NodeList children = doc->get_root_node()->get_children (); - for (xmlpp::Node::NodeList::const_iterator i = children.begin(); i != children.end(); ++i) { - if ((*i)->get_name() == "Signature") { - signer->add_signature_value (*i, "ds"); + auto doc = _data->as_xml (); + for (auto i: doc->get_root_node()->get_children()) { + if (i->get_name() == "Signature") { + signer->add_signature_value(dynamic_cast(i), "ds", false); } } /* Read the bits that add_signature_value did back into our variables */ - shared_ptr signed_doc (new cxml::Node (doc->get_root_node ())); + auto signed_doc = make_shared(doc->get_root_node()); _data->signature = data::Signature (signed_doc->node_child ("Signature")); } + EncryptedKDM::EncryptedKDM (EncryptedKDM const & other) : _data (new data::EncryptedKDMData (*other._data)) { } + EncryptedKDM & EncryptedKDM::operator= (EncryptedKDM const & other) { @@ -575,33 +726,112 @@ EncryptedKDM::operator= (EncryptedKDM const & other) return *this; } + EncryptedKDM::~EncryptedKDM () { delete _data; } + void EncryptedKDM::as_xml (boost::filesystem::path path) const { - FILE* f = fopen_boost (path, "w"); - string const x = as_xml (); - fwrite (x.c_str(), 1, x.length(), f); - fclose (f); + File f(path, "w"); + if (!f) { + throw FileError ("Could not open KDM file for writing", path, errno); + } + auto const x = as_xml (); + if (f.write(x.c_str(), 1, x.length()) != x.length()) { + throw FileError ("Could not write to KDM file", path, errno); + } } - + + string EncryptedKDM::as_xml () const { - xmlpp::Document document; - xmlpp::Element* root = document.create_root_node ("DCinemaSecurityMessage", "http://www.smpte-ra.org/schemas/430-3/2006/ETM"); - root->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "ds"); - root->set_namespace_declaration ("http://www.w3.org/2001/04/xmlenc#", "enc"); - return _data->as_xml()->write_to_string ("UTF-8"); } -list + +vector EncryptedKDM::keys () const { return _data->authenticated_private.encrypted_key; } + + +string +EncryptedKDM::id () const +{ + return _data->authenticated_public.message_id; +} + + +optional +EncryptedKDM::annotation_text () const +{ + return _data->authenticated_public.annotation_text; +} + + +string +EncryptedKDM::content_title_text () const +{ + return _data->authenticated_public.required_extensions.kdm_required_extensions.content_title_text; +} + + +string +EncryptedKDM::cpl_id () const +{ + return _data->authenticated_public.required_extensions.kdm_required_extensions.composition_playlist_id; +} + + +string +EncryptedKDM::issue_date () const +{ + return _data->authenticated_public.issue_date; +} + + +LocalTime +EncryptedKDM::not_valid_before () const +{ + return _data->authenticated_public.required_extensions.kdm_required_extensions.not_valid_before; +} + + +LocalTime +EncryptedKDM::not_valid_after () const +{ + return _data->authenticated_public.required_extensions.kdm_required_extensions.not_valid_after; +} + + +string +EncryptedKDM::recipient_x509_subject_name () const +{ + return _data->authenticated_public.required_extensions.kdm_required_extensions.recipient.x509_subject_name; +} + + +CertificateChain +EncryptedKDM::signer_certificate_chain () const +{ + CertificateChain chain; + for (auto const& i: _data->signature.x509_data) { + string s = "-----BEGIN CERTIFICATE-----\n" + i.x509_certificate + "\n-----END CERTIFICATE-----"; + chain.add (Certificate(s)); + } + return chain; +} + + +bool +dcp::operator== (EncryptedKDM const & a, EncryptedKDM const & b) +{ + /* Not exactly efficient... */ + return a.as_xml() == b.as_xml(); +}