/*
- Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
#include "exceptions.h"
#include "util.h"
#include "dcp_assert.h"
-#include "KM_util.h"
#include "compose.hpp"
+#include <asdcp/KM_util.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <xmlsec/xmldsig.h>
#include <openssl/bio.h>
#include <openssl/evp.h>
#include <openssl/pem.h>
+#include <openssl/rsa.h>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/foreach.hpp>
#include <fstream>
-#include <sstream>
+#include <iostream>
using std::string;
using std::ofstream;
using std::ifstream;
using std::runtime_error;
-using std::stringstream;
using namespace dcp;
/** Run a shell command.
int const code = WEXITSTATUS (r);
#endif
if (code) {
- stringstream s;
- s << "error " << code << " in " << cmd << " within " << boost::filesystem::current_path();
- throw dcp::MiscError (s.str());
+ throw dcp::MiscError (String::compose ("error %1 in %2 within %3", code, cmd, boost::filesystem::current_path().string()));
}
}
boost::filesystem::path public_name = private_key.string() + ".public";
/* Create the public key from the private key */
- stringstream s;
- s << "\"" << openssl.string() << "\" rsa -outform PEM -pubout -in " << private_key.string() << " -out " << public_name.string ();
- command (s.str().c_str ());
+ command (String::compose("\"%1\" rsa -outform PEM -pubout -in %2 -out %3", openssl.string(), private_key.string(), public_name.string ()));
/* Read in the public key from the file */
f << "[ req ]\n"
<< "distinguished_name = req_distinguished_name\n"
<< "x509_extensions = v3_ca\n"
+ << "string_mask = nombstr\n"
<< "[ v3_ca ]\n"
<< "basicConstraints = critical,CA:true,pathlen:3\n"
<< "keyUsage = keyCertSign,cRLSign\n"
"/dnQualifier=" + public_key_digest ("ca.key", openssl);
{
- stringstream c;
- c << quoted_openssl
- << " req -new -x509 -sha256 -config ca.cnf -days 3650 -set_serial 5"
- << " -subj \"" << ca_subject << "\" -key ca.key -outform PEM -out ca.self-signed.pem";
- command (c.str().c_str());
+ command (
+ String::compose (
+ "%1 req -new -x509 -sha256 -config ca.cnf -days 3650 -set_serial 5"
+ " -subj \"%2\" -key ca.key -outform PEM -out ca.self-signed.pem",
+ quoted_openssl, ca_subject
+ )
+ );
}
command (quoted_openssl + " genrsa -out intermediate.key 2048");
f << "[ default ]\n"
<< "distinguished_name = req_distinguished_name\n"
<< "x509_extensions = v3_ca\n"
+ << "string_mask = nombstr\n"
<< "[ v3_ca ]\n"
<< "basicConstraints = critical,CA:true,pathlen:2\n"
<< "keyUsage = keyCertSign,cRLSign\n"
"/dnQualifier=" + public_key_digest ("intermediate.key", openssl);
{
- stringstream s;
- s << quoted_openssl
- << " req -new -config intermediate.cnf -days 3649 -subj \"" << inter_subject << "\" -key intermediate.key -out intermediate.csr";
- command (s.str().c_str());
+ command (
+ String::compose (
+ "%1 req -new -config intermediate.cnf -days 3649 -subj \"%2\" -key intermediate.key -out intermediate.csr",
+ quoted_openssl, inter_subject
+ )
+ );
}
-
command (
quoted_openssl +
" x509 -req -sha256 -days 3649 -CA ca.self-signed.pem -CAkey ca.key -set_serial 6"
f << "[ default ]\n"
<< "distinguished_name = req_distinguished_name\n"
<< "x509_extensions = v3_ca\n"
+ << "string_mask = nombstr\n"
<< "[ v3_ca ]\n"
<< "basicConstraints = critical,CA:false\n"
<< "keyUsage = digitalSignature,keyEncipherment\n"
"/dnQualifier=" + public_key_digest ("leaf.key", openssl);
{
- stringstream s;
- s << quoted_openssl << " req -new -config leaf.cnf -days 3648 -subj \"" << leaf_subject << "\" -key leaf.key -outform PEM -out leaf.csr";
- command (s.str().c_str());
+ command (
+ String::compose (
+ "%1 req -new -config leaf.cnf -days 3648 -subj \"%2\" -key leaf.key -outform PEM -out leaf.csr",
+ quoted_openssl, leaf_subject
+ )
+ );
}
command (
boost::filesystem::remove_all (directory);
}
+CertificateChain::CertificateChain (string s)
+{
+ while (true) {
+ try {
+ Certificate c;
+ s = c.read_string (s);
+ _certificates.push_back (c);
+ } catch (MiscError& e) {
+ /* Failed to read a certificate, just stop */
+ break;
+ }
+ }
+
+ /* This will throw an exception if the chain cannot be ordered */
+ leaf_to_root ();
+}
+
/** @return Root certificate */
Certificate
CertificateChain::root () const
{
DCP_ASSERT (!_certificates.empty());
- return _certificates.front ();
+ return root_to_leaf().front ();
}
/** @return Leaf certificate */
Certificate
CertificateChain::leaf () const
{
- DCP_ASSERT (_certificates.size() >= 2);
- return _certificates.back ();
+ DCP_ASSERT (!_certificates.empty());
+ return root_to_leaf().back ();
}
-/** @return Certificates in order from root to leaf */
+/** @return Certificates in order from leaf to root */
CertificateChain::List
-CertificateChain::root_to_leaf () const
+CertificateChain::leaf_to_root () const
{
- return _certificates;
+ List l = root_to_leaf ();
+ l.reverse ();
+ return l;
}
-/** @return Certificates in order from leaf to root */
CertificateChain::List
-CertificateChain::leaf_to_root () const
+CertificateChain::unordered () const
{
- List c = _certificates;
- c.reverse ();
- return c;
+ return _certificates;
}
-/** Add a certificate to the end of the chain.
+/** Add a certificate to the chain.
* @param c Certificate to add.
*/
void
}
}
-/** Check to see if the chain is valid (i.e. root signs the intermediate, intermediate
+bool
+CertificateChain::chain_valid () const
+{
+ return chain_valid (_certificates);
+}
+
+/** Check to see if a chain is valid (i.e. root signs the intermediate, intermediate
* signs the leaf and so on) and that the private key (if there is one) matches the
* leaf certificate.
* @return true if it's ok, false if not.
*/
bool
-CertificateChain::valid () const
+CertificateChain::chain_valid (List const & chain) const
{
- /* Check the certificate chain */
+ /* Here I am taking a chain of certificates A/B/C/D and checking validity of B wrt A,
+ C wrt B and D wrt C. It also appears necessary to check the issuer of B/C/D matches
+ the subject of A/B/C; I don't understand why. I'm sure there's a better way of doing
+ this with OpenSSL but the documentation does not appear not likely to reveal it
+ any time soon.
+ */
X509_STORE* store = X509_STORE_new ();
if (!store) {
- return false;
+ throw MiscError ("could not create X509 store");
+ }
+
+ /* Put all the certificates into the store */
+ for (List::const_iterator i = chain.begin(); i != chain.end(); ++i) {
+ if (!X509_STORE_add_cert (store, i->x509 ())) {
+ X509_STORE_free (store);
+ return false;
+ }
}
- for (List::const_iterator i = _certificates.begin(); i != _certificates.end(); ++i) {
+ /* Verify each one */
+ for (List::const_iterator i = chain.begin(); i != chain.end(); ++i) {
List::const_iterator j = i;
++j;
- if (j == _certificates.end ()) {
+ if (j == chain.end ()) {
break;
}
- if (!X509_STORE_add_cert (store, i->x509 ())) {
- X509_STORE_free (store);
- return false;
- }
-
X509_STORE_CTX* ctx = X509_STORE_CTX_new ();
if (!ctx) {
X509_STORE_free (store);
- return false;
+ throw MiscError ("could not create X509 store context");
}
X509_STORE_set_flags (store, 0);
- if (!X509_STORE_CTX_init (ctx, store, j->x509 (), 0)) {
+ if (!X509_STORE_CTX_init (ctx, store, j->x509(), 0)) {
X509_STORE_CTX_free (ctx);
X509_STORE_free (store);
- return false;
+ throw MiscError ("could not initialise X509 store context");
}
- int v = X509_verify_cert (ctx);
+ int const v = X509_verify_cert (ctx);
X509_STORE_CTX_free (ctx);
- if (v == 0) {
+ if (v != 1) {
X509_STORE_free (store);
return false;
}
+
+ /* I don't know why OpenSSL doesn't check this in verify_cert, but without this check
+ the certificates_validation8 test fails.
+ */
+ if (j->issuer() != i->subject()) {
+ X509_STORE_free (store);
+ return false;
+ }
+
}
X509_STORE_free (store);
- /* Check that the leaf certificate matches the private key, if there is one */
+ return true;
+}
- if (!_key) {
+/** Check that there is a valid private key for the leaf certificate.
+ * Will return true if there are no certificates.
+ */
+bool
+CertificateChain::private_key_valid () const
+{
+ if (_certificates.empty ()) {
return true;
}
+ if (!_key) {
+ return false;
+ }
+
BIO* bio = BIO_new_mem_buf (const_cast<char *> (_key->c_str ()), -1);
if (!bio) {
throw MiscError ("could not create memory BIO");
RSA* private_key = PEM_read_bio_RSAPrivateKey (bio, 0, 0, 0);
RSA* public_key = leaf().public_key ();
+
+#if OPENSSL_VERSION_NUMBER > 0x10100000L
+ BIGNUM const * private_key_n;
+ RSA_get0_key(private_key, &private_key_n, 0, 0);
+ BIGNUM const * public_key_n;
+ RSA_get0_key(public_key, &public_key_n, 0, 0);
+ bool const valid = !BN_cmp (private_key_n, public_key_n);
+#else
bool const valid = !BN_cmp (private_key->n, public_key->n);
+#endif
BIO_free (bio);
return valid;
}
-/** @return true if the chain is now in order from root to leaf,
- * false if no correct order was found.
- */
bool
-CertificateChain::attempt_reorder ()
+CertificateChain::valid (string* reason) const
+{
+ try {
+ root_to_leaf ();
+ } catch (CertificateChainError& e) {
+ if (reason) {
+ *reason = "certificates do not form a chain";
+ }
+ return false;
+ }
+
+ if (!private_key_valid ()) {
+ if (reason) {
+ *reason = "private key does not exist, or does not match leaf certificate";
+ }
+ return false;
+ }
+
+ return true;
+}
+
+/** @return Certificates in order from root to leaf */
+CertificateChain::List
+CertificateChain::root_to_leaf () const
{
- List original = _certificates;
- _certificates.sort ();
+ List rtl = _certificates;
+ rtl.sort ();
do {
- if (valid ()) {
- return true;
+ if (chain_valid (rtl)) {
+ return rtl;
}
- } while (std::next_permutation (_certificates.begin(), _certificates.end ()));
+ } while (std::next_permutation (rtl.begin(), rtl.end()));
- _certificates = original;
- return false;
+ throw CertificateChainError ("certificate chain is not consistent");
}
/** Add a <Signer> and <ds:Signature> nodes to an XML node.
/* <Signer> */
xmlpp::Element* signer = parent->add_child("Signer");
+ signer->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "dsig");
xmlpp::Element* data = signer->add_child("X509Data", "dsig");
xmlpp::Element* serial_element = data->add_child("X509IssuerSerial", "dsig");
serial_element->add_child("X509IssuerName", "dsig")->add_child_text (leaf().issuer());
/* <Signature> */
- xmlpp::Element* signature = parent->add_child("Signature", "dsig");
+ xmlpp::Element* signature = parent->add_child("Signature");
+ signature->set_namespace_declaration ("http://www.w3.org/2000/09/xmldsig#", "dsig");
+ signature->set_namespace ("dsig");
xmlpp::Element* signed_info = signature->add_child ("SignedInfo", "dsig");
signed_info->add_child("CanonicalizationMethod", "dsig")->set_attribute ("Algorithm", "http://www.w3.org/TR/2001/REC-xml-c14n-20010315");
xmlSecDSigCtxDestroy (signature_context);
}
+
+string
+CertificateChain::chain () const
+{
+ string o;
+ BOOST_FOREACH (Certificate const &i, root_to_leaf ()) {
+ o += i.certificate(true);
+ }
+
+ return o;
+}
projects / libdcp.git / blobdiff