X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fencrypted_kdm.cc;h=a124fdf65bf92619216b5ccdb1bcddd9cddf0ab0;hb=d95eacd3851a20e52202465ec22b4f72a4983dc8;hp=fe96250fb759f3658a9ef0a016fee058bf7124fe;hpb=2ae92dcc97765deb2845dd07a338858aeb375cb3;p=libdcp.git diff --git a/src/encrypted_kdm.cc b/src/encrypted_kdm.cc index fe96250f..a124fdf6 100644 --- a/src/encrypted_kdm.cc +++ b/src/encrypted_kdm.cc @@ -1,36 +1,58 @@ /* - Copyright (C) 2013-2015 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. */ #include "encrypted_kdm.h" #include "util.h" -#include "signer.h" +#include "certificate_chain.h" +#include "exceptions.h" +#include "compose.hpp" #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 { @@ -43,7 +65,7 @@ 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")) { @@ -65,7 +87,7 @@ 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")) { @@ -87,11 +109,11 @@ 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")) { @@ -117,14 +139,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 */ @@ -155,13 +176,12 @@ 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)); } } @@ -170,15 +190,15 @@ public: 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")); + auto key_info_node = node->add_child("KeyInfo", "ds"); + for (auto i: x509_data) { + i.as_xml (key_info_node->add_child("X509Data", "ds")); } } SignedInfo signed_info; string signature_value; - list x509_data; + vector x509_data; }; class AuthenticatedPrivate @@ -186,11 +206,10 @@ 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")); } } @@ -198,18 +217,22 @@ public: { references["ID_AuthenticatedPrivate"] = 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 = node->add_child ("EncryptedKey", "enc"); + /* XXX: hack for testing with Dolby */ + encrypted_key->set_namespace_declaration ("http://www.w3.org/2001/04/xmlenc#", "enc"); + auto encryption_method = encrypted_key->add_child("EncryptionMethod", "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 = encryption_method->add_child ("DigestMethod", "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 = encrypted_key->add_child("CipherData", "enc"); + cipher_data->add_child("CipherValue", "enc")->add_child_text (i); } } - list encrypted_key; + vector encrypted_key; }; class TypedKeyId @@ -217,9 +240,9 @@ 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,8 +254,15 @@ public: void as_xml (xmlpp::Element* node) const { - node->add_child("KeyType")->add_child_text (key_type); + xmlpp::Element* type = node->add_child("KeyType"); + type->add_child_text (key_type); node->add_child("KeyId")->add_child_text ("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; @@ -244,22 +274,21 @@ 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 (node->add_child("TypedKeyId")); } } - list typed_key_id; + vector typed_key_id; }; class AuthorizedDeviceInfo @@ -267,26 +296,31 @@ 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); + if (device_list_description) { + node->add_child ("DeviceListDescription")->add_child_text (device_list_description.get()); + } + auto device_list = node->add_child ("DeviceList"); + for (auto i: certificate_thumbprints) { + device_list->add_child("CertificateThumbprint")->add_child_text (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 @@ -294,7 +328,7 @@ 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")) { @@ -316,7 +350,7 @@ 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")) { @@ -338,16 +372,34 @@ 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 @@ -356,18 +408,30 @@ public: recipient.as_xml (node->add_child ("Recipient")); node->add_child("CompositionPlaylistId")->add_child_text ("urn:uuid:" + composition_playlist_id); + node->add_child("ContentTitleText")->add_child_text (content_title_text); if (content_authenticator) { node->add_child("ContentAuthenticator")->add_child_text (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")); + if (authorized_device_info) { + 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"); + if (disable_forensic_marking_picture || disable_forensic_marking_audio) { + auto forensic_mark_flag_list = node->add_child ("ForensicMarkFlagList"); + if (disable_forensic_marking_picture) { + forensic_mark_flag_list->add_child("ForensicMarkFlag")->add_child_text(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); + } + forensic_mark_flag_list->add_child("ForensicMarkFlag")->add_child_text (mrkflg); + } + } } Recipient recipient; @@ -376,16 +440,25 @@ public: 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")) { @@ -404,12 +477,14 @@ 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")) @@ -423,7 +498,9 @@ public: 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); + if (annotation_text) { + node->add_child("AnnotationText")->add_child_text (annotation_text.get ()); + } node->add_child("IssueDate")->add_child_text (issue_date); signer.as_xml (node->add_child ("Signer")); @@ -433,7 +510,7 @@ public: } string message_id; - string annotation_text; + optional annotation_text; string issue_date; Signer signer; RequiredExtensions required_extensions; @@ -450,7 +527,7 @@ 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")) @@ -469,10 +546,11 @@ public: authenticated_private.as_xml (root->add_child ("AuthenticatedPrivate"), references); signature.as_xml (root->add_child ("Signature", "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; } @@ -486,75 +564,114 @@ public: EncryptedKDM::EncryptedKDM (string s) { - shared_ptr doc (new cxml::Document ("DCinemaSecurityMessage")); - doc->read_string (s); - _data = new data::EncryptedKDMData (doc); + try { + auto doc = make_shared("DCinemaSecurityMessage"); + doc->read_string (s); + _data = new data::EncryptedKDMData (doc); + } catch (xmlpp::parse_error& e) { + throw KDMFormatError (e.what ()); + } } +/** @param trusted_devices Trusted device thumbprints */ EncryptedKDM::EncryptedKDM ( - shared_ptr signer, + shared_ptr signer, Certificate recipient, - string device_list_description, + 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 */ + /* 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 + */ + data::AuthenticatedPublic& aup = _data->authenticated_public; - aup.signer.x509_issuer_name = signer->certificates().leaf().issuer (); - aup.signer.x509_serial_number = signer->certificates().leaf().serial (); + aup.signer.x509_issuer_name = signer->leaf().issuer (); + aup.signer.x509_serial_number = signer->leaf().serial (); + aup.annotation_text = annotation_text; - data::KDMRequiredExtensions& kre = _data->authenticated_public.required_extensions.kdm_required_extensions; + 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.authorized_device_info.device_list_description = device_list_description; kre.composition_playlist_id = cpl_id; if (formulation == DCI_ANY || formulation == DCI_SPECIFIC) { - kre.content_authenticator = signer->certificates().leaf().thumbprint (); + 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 (); - if (n.find (".") != string::npos) { - n = n.substr (n.find (".") + 1); - } - kre.authorized_device_info.device_list_description = n; - - if (formulation == MODIFIED_TRANSITIONAL_1 || 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.disable_forensic_marking_picture = disable_forensic_marking_picture; + kre.disable_forensic_marking_audio = disable_forensic_marking_audio; + + if (formulation != MODIFIED_TRANSITIONAL_TEST) { + 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; + + if (formulation == MODIFIED_TRANSITIONAL_1 || formulation == DCI_ANY) { + /* Use the "assume trust" thumbprint */ + kre.authorized_device_info->certificate_thumbprints.push_back ("2jmj7l5rSw0yVb/vlWAYkK/YBwk="); + } else if (formulation == MULTIPLE_MODIFIED_TRANSITIONAL_1 || 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")); } @@ -584,25 +701,92 @@ EncryptedKDM::~EncryptedKDM () 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); + auto f = fopen_boost (path, "w"); + if (!f) { + throw FileError ("Could not open KDM file for writing", path, errno); + } + auto const x = as_xml (); + size_t const written = fwrite (x.c_str(), 1, x.length(), f); fclose (f); + if (written != 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(); +}