diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-18 00:15:34 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-18 00:15:34 +0100 |
| commit | 56e7a6f1768036df852a45d939b9adc038b17057 (patch) | |
| tree | 93cf6bb1fb7c9ebe43de09d7690e69cd75b634ea /src/certificates.cc | |
| parent | 0b85b9216da9d6519a553de67103a9417504aba1 (diff) | |
Quite large reworking of signer/cert handling.
Diffstat (limited to 'src/certificates.cc')
| -rw-r--r-- | src/certificates.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/certificates.cc b/src/certificates.cc index b331c6b6..46c60d6b 100644 --- a/src/certificates.cc +++ b/src/certificates.cc @@ -294,7 +294,7 @@ Certificate::public_key () const } /** @return Root certificate */ -shared_ptr<Certificate> +shared_ptr<const Certificate> CertificateChain::root () const { assert (!_certificates.empty()); @@ -302,7 +302,7 @@ CertificateChain::root () const } /** @return Leaf certificate */ -shared_ptr<Certificate> +shared_ptr<const Certificate> CertificateChain::leaf () const { assert (_certificates.size() >= 2); @@ -329,13 +329,13 @@ CertificateChain::leaf_to_root () const * @param c Certificate to add. */ void -CertificateChain::add (shared_ptr<Certificate> c) +CertificateChain::add (shared_ptr<const Certificate> c) { _certificates.push_back (c); } void -CertificateChain::remove (shared_ptr<Certificate> c) +CertificateChain::remove (shared_ptr<const Certificate> c) { _certificates.remove (c); } @@ -357,11 +357,12 @@ CertificateChain::remove (int i) } } -/** Verify the chain. +/** Check to see if the chain is valid (i.e. root signs the intermediate, intermediate + * signs the leaf and so on). * @return true if it's ok, false if not. */ bool -CertificateChain::verify () const +CertificateChain::valid () const { X509_STORE* store = X509_STORE_new (); if (!store) { @@ -416,7 +417,7 @@ CertificateChain::attempt_reorder () List original = _certificates; _certificates.sort (); do { - if (verify ()) { + if (valid ()) { return true; } } while (std::next_permutation (_certificates.begin(), _certificates.end ())); |