X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fcertificates.cc;h=3566fba01e4ee2a5a4c7473f26eaba5812aa36fb;hb=ad3d9f8bbe623f87e440bd6a5a12520361a7661f;hp=6ed32dcadf1d74e71d7e282c5fa0c8a1370627c0;hpb=c1204f68f6ede72bbaefe853e3ebf6e24b3a9f8b;p=libdcp.git

diff --git a/src/certificates.cc b/src/certificates.cc
index 6ed32dca..3566fba0 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;
@@ -42,6 +43,19 @@ Certificate::Certificate (X509* c)
 	
 }
 
+Certificate::Certificate (string const & filename)
+	: _certificate (0)
+{
+	FILE* f = fopen (filename.c_str(), "r");
+	if (!f) {
+		throw FileError ("could not open file", filename);
+	}
+	
+	if (!PEM_read_X509 (f, &_certificate, 0, 0)) {
+		throw MiscError ("could not read X509 certificate");
+	}
+}
+
 Certificate::~Certificate ()
 {
 	X509_free (_certificate);
@@ -50,6 +64,8 @@ Certificate::~Certificate ()
 string
 Certificate::certificate () const
 {
+	assert (_certificate);
+	
 	BIO* bio = BIO_new (BIO_s_mem ());
 	if (!bio) {
 		throw MiscError ("could not create memory BIO");
@@ -74,45 +90,60 @@ Certificate::certificate () const
 string
 Certificate::issuer () const
 {
-	X509_NAME* n = X509_get_issuer_name (_certificate);
-	assert (n);
+	assert (_certificate);
+	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 = 0;
+	ASN1_STRING_to_UTF8 (&buf, s);
+	string const u (reinterpret_cast<char *> (buf));
+	OPENSSL_free (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
 Certificate::subject () const
 {
-	X509_NAME* n = X509_get_subject_name (_certificate);
-	assert (n);
+	assert (_certificate);
 
-	char b[256];
-	X509_NAME_oneline (n, b, 256);
-	return b;
+	return name_for_xml (X509_get_subject_name (_certificate));
 }
 
 string
 Certificate::serial () const
 {
+	assert (_certificate);
+
 	ASN1_INTEGER* s = X509_get_serialNumber (_certificate);
 	assert (s);
 	
@@ -129,6 +160,8 @@ Certificate::serial () const
 string
 Certificate::thumbprint () const
 {
+	assert (_certificate);
+	
 	uint8_t buffer[8192];
 	uint8_t* p = buffer;
 	i2d_X509_CINF (_certificate->cert_info, &p);
@@ -147,32 +180,6 @@ Certificate::thumbprint () const
 	return Kumu::base64encode (digest, 20, digest_base64, 64);
 }
 
-/** @param filename Text file of PEM-format certificates,
- *  in the order:
- *
- *  1. self-signed root certificate
- *  2. intermediate certificate signed by root certificate
- *  ...
- *  n. leaf certificate signed by previous intermediate.
- */
-
-CertificateChain::CertificateChain (string const & filename)
-{
-	FILE* f = fopen (filename.c_str(), "r");
-	if (!f) {
-		throw FileError ("could not open file", filename);
-	}
-	
-	while (1) {
-		X509* c = 0;
-		if (!PEM_read_X509 (f, &c, 0, 0)) {
-			break;
-		}
-
-		_certificates.push_back (shared_ptr<Certificate> (new Certificate (c)));
-	}
-}
-
 shared_ptr<Certificate>
 CertificateChain::root () const
 {
@@ -195,3 +202,8 @@ CertificateChain::leaf_to_root () const
 	return c;
 }
 
+void
+CertificateChain::add (shared_ptr<Certificate> c)
+{
+	_certificates.push_back (c);
+}