diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/certificates.cc | 54 | ||||
| -rw-r--r-- | src/certificates.h | 6 | ||||
| -rw-r--r-- | src/cpl.cc | 18 | ||||
| -rw-r--r-- | src/util.cc | 16 |
4 files changed, 46 insertions, 48 deletions
diff --git a/src/certificates.cc b/src/certificates.cc index 372f8571..085e4622 100644 --- a/src/certificates.cc +++ b/src/certificates.cc @@ -26,6 +26,7 @@ #include <libxml++/nodes/element.h> #include "KM_util.h" #include "certificates.h" +#include "compose.hpp" #include "exceptions.h" using std::list; @@ -90,30 +91,44 @@ string Certificate::issuer () const { assert (_certificate); - - X509_NAME* n = X509_get_issuer_name (_certificate); - assert (n); + return name_for_xml (X509_get_issuer_name (_certificate)); +} - char b[256]; - X509_NAME_oneline (n, b, 256); - return b; +string +Certificate::asn_to_utf8 (ASN1_STRING* s) +{ + unsigned char* buf = new unsigned char[256]; + ASN1_STRING_to_UTF8 (&buf, s); + string const u (reinterpret_cast<char *> (buf)); + delete[] buf; + return u; } string -Certificate::name_for_xml (string const & n) +Certificate::get_name_part (X509_NAME* n, int nid) { - stringstream x; + int p = -1; + p = X509_NAME_get_index_by_NID (n, nid, p); + assert (p != -1); + return asn_to_utf8 (X509_NAME_ENTRY_get_data (X509_NAME_get_entry (n, p))); +} - vector<string> p; - boost::split (p, n, boost::is_any_of ("/")); - for (vector<string>::const_reverse_iterator i = p.rbegin(); i != p.rend(); ++i) { - x << *i << ","; - } - string s = x.str(); - boost::replace_all (s, "+", "\\+"); +string +Certificate::name_for_xml (X509_NAME * n) +{ + assert (n); - return s.substr(0, s.length() - 2); + string s = String::compose ( + "dnQualifier=%1,CN=%2,OU=%3,O=%4", + get_name_part (n, NID_dnQualifier), + get_name_part (n, NID_commonName), + get_name_part (n, NID_organizationalUnitName), + get_name_part (n, NID_organizationName) + ); + + boost::replace_all (s, "+", "\\+"); + return s; } string @@ -121,12 +136,7 @@ Certificate::subject () const { assert (_certificate); - X509_NAME* n = X509_get_subject_name (_certificate); - assert (n); - - char b[256]; - X509_NAME_oneline (n, b, 256); - return b; + return name_for_xml (X509_get_subject_name (_certificate)); } string diff --git a/src/certificates.h b/src/certificates.h index e1a572ec..42ae8d27 100644 --- a/src/certificates.h +++ b/src/certificates.h @@ -52,9 +52,11 @@ public: std::string thumbprint () const; - static std::string name_for_xml (std::string const &); - private: + static std::string name_for_xml (X509_NAME *); + static std::string asn_to_utf8 (ASN1_STRING *); + static std::string get_name_part (X509_NAME *, int); + X509* _certificate; }; @@ -360,12 +360,8 @@ CPL::make_kdm ( { xmlpp::Element* signer = authenticated_public->add_child("Signer"); - signer->add_child("X509IssuerName", "ds")->add_child_text ( - Certificate::name_for_xml (recipient_cert->issuer()) - ); - signer->add_child("X509SerialNumber", "ds")->add_child_text ( - recipient_cert->serial() - ); + signer->add_child("X509IssuerName", "ds")->add_child_text (recipient_cert->issuer()); + signer->add_child("X509SerialNumber", "ds")->add_child_text (recipient_cert->serial()); } { @@ -378,15 +374,11 @@ CPL::make_kdm ( xmlpp::Element* recipient = kdm_required_extensions->add_child("Recipient"); { xmlpp::Element* serial_element = recipient->add_child("X509IssuerSerial"); - serial_element->add_child("X509IssuerName", "ds")->add_child_text ( - Certificate::name_for_xml (recipient_cert->issuer()) - ); - serial_element->add_child("X509SerialNumber", "ds")->add_child_text ( - recipient_cert->serial() - ); + serial_element->add_child("X509IssuerName", "ds")->add_child_text (recipient_cert->issuer()); + serial_element->add_child("X509SerialNumber", "ds")->add_child_text (recipient_cert->serial()); } - recipient->add_child("X509SubjectName")->add_child_text (Certificate::name_for_xml (recipient_cert->subject())); + recipient->add_child("X509SubjectName")->add_child_text (recipient_cert->subject()); } kdm_required_extensions->add_child("CompositionPlaylistId")->add_child_text("urn:uuid:" + _id); diff --git a/src/util.cc b/src/util.cc index e4c8122c..e909e3cb 100644 --- a/src/util.cc +++ b/src/util.cc @@ -321,10 +321,8 @@ libdcp::add_signature_value (xmlpp::Element* parent, CertificateChain const & ce { xmlpp::Element* serial = data->add_child("X509IssuerSerial", ns); - serial->add_child("X509IssuerName", ns)->add_child_text( - Certificate::name_for_xml ((*i)->issuer()) - ); - serial->add_child("X509SerialNumber", ns)->add_child_text((*i)->serial()); + serial->add_child("X509IssuerName", ns)->add_child_text((*i)->issuer ()); + serial->add_child("X509SerialNumber", ns)->add_child_text((*i)->serial ()); } data->add_child("X509Certificate", ns)->add_child_text((*i)->certificate()); @@ -360,15 +358,11 @@ libdcp::add_signer (xmlpp::Element* parent, CertificateChain const & certificate { xmlpp::Element* serial_element = data->add_child("X509IssuerSerial", ns); - serial_element->add_child("X509IssuerName", ns)->add_child_text ( - Certificate::name_for_xml (certificates.leaf()->issuer()) - ); - serial_element->add_child("X509SerialNumber", ns)->add_child_text ( - certificates.leaf()->serial() - ); + serial_element->add_child("X509IssuerName", ns)->add_child_text (certificates.leaf()->issuer()); + serial_element->add_child("X509SerialNumber", ns)->add_child_text (certificates.leaf()->serial()); } - data->add_child("X509SubjectName", ns)->add_child_text (Certificate::name_for_xml (certificates.leaf()->subject())); + data->add_child("X509SubjectName", ns)->add_child_text (certificates.leaf()->subject()); } } |