Get Signer to take a PEM string rather than a filename.

[libdcp.git] / src / certificates.h

diff --git a/src/certificates.h b/src/certificates.h
index ef2e63b411b0f0c9d939fb48b0ec6d803b4a423d..8ae562c91543e882d85c40163032b39b67a68812 100644 (file)
--- a/src/certificates.h
+++ b/src/certificates.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,16 +17,19 @@
 
 */
 
+/** @file  src/certificates.h
+ *  @brief Certificate and CertificateChain classes.
+ */
+
 #ifndef LIBDCP_CERTIFICATES_H
 #define LIBDCP_CERTIFICATES_H
 
-#include <string>
-#include <list>
-#include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/filesystem.hpp>
 #undef X509_NAME
 #include <openssl/x509.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/filesystem.hpp>
+#include <string>
+#include <list>
 
 class certificates;
 
@@ -34,8 +37,13 @@ namespace xmlpp {
        class Element;
 }
 
-namespace libdcp {
+namespace dcp {
 
+/** @class Certificate
+ *  @brief A wrapper for an X509 certificate.
+ *
+ *  This class can take a Certificate from a file, a string or an OpenSSL X509 object.
+ */
 class Certificate
 {
 public:
@@ -51,13 +59,17 @@ public:
 
        Certificate& operator= (Certificate const &);
 
-       /** @param with_begin_end true to include BEGIN CERTIFICATE / END CERTIFICATE markers
-        *  @return the whole certificate as a string.
-        */
        std::string certificate (bool with_begin_end = false) const;
        std::string issuer () const;
        std::string serial () const;
        std::string subject () const;
+       std::string common_name () const;
+
+       X509* x509 () const {
+               return _certificate;
+       }
+
+       RSA* public_key () const;
 
        std::string thumbprint () const;
 
@@ -69,23 +81,36 @@ private:
        static std::string get_name_part (X509_NAME *, int);
 
        X509* _certificate;
+       mutable RSA* _public_key;
 };
 
+/** @class CertificateChain
+ *  @brief A chain of any number of certificates, from root to leaf.
+ */
 class CertificateChain
 {
 public:
        CertificateChain () {}
 
-       void add (boost::shared_ptr<Certificate>);
+       void add (boost::shared_ptr<Certificate> c);
+       void remove (boost::shared_ptr<Certificate> c);
+       void remove (int);
 
        boost::shared_ptr<Certificate> root () const;
        boost::shared_ptr<Certificate> leaf () const;
 
-       std::list<boost::shared_ptr<Certificate> > leaf_to_root () const;
+       typedef std::list<boost::shared_ptr<Certificate> > List;
+       
+       List leaf_to_root () const;
+       List root_to_leaf () const;
+
+       bool verify () const;
+       bool attempt_reorder ();
 
 private:
        friend class ::certificates;
-       std::list<boost::shared_ptr<Certificate> > _certificates;
+
+       List _certificates;
 };
 
 }