diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-08 11:58:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-08 11:58:38 +0100 |
| commit | a353528b070fe264ce60220b4af07d0561494def (patch) | |
| tree | 341e62026ad366a548836019b49c5789e70525a7 /src/util.cc | |
| parent | c1763d2ca9cb4dd38d9eec28f6304f45b29bf9d5 (diff) | |
Improve certificate handling a bit and fix up tests.encryption
Diffstat (limited to 'src/util.cc')
| -rw-r--r-- | src/util.cc | 16 |
1 files changed, 5 insertions, 11 deletions
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()); } } |