Report errors passed back from DCP::read when exceptions aren't used.

[libdcp.git] / src / certificate.h

diff --git a/src/certificate.h b/src/certificate.h
index be6a554ce401a74ce7c3a2751f8e4b97a6d29f73..4be673cc88f82e468f4f1b41027db6b1de122a05 100644 (file)
--- a/src/certificate.h
+++ b/src/certificate.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/certificate.h
@@ -30,8 +44,6 @@
 #include <string>
 #include <list>
 
-class certificates;
-
 namespace xmlpp {
        class Element;
 }
@@ -49,16 +61,17 @@ public:
        Certificate ()
                : _certificate (0)
                , _public_key (0)
-               , _extra_data (false)
        {}
 
-       Certificate (std::string);
-       Certificate (X509 *);
+       explicit Certificate (std::string);
+       explicit Certificate (X509 *);
        Certificate (Certificate const &);
        ~Certificate ();
 
        Certificate& operator= (Certificate const &);
 
+       std::string read_string (std::string);
+
        std::string certificate (bool with_begin_end = false) const;
        std::string serial () const;
 
@@ -68,6 +81,8 @@ public:
        std::string subject_common_name () const;
        std::string subject_organization_name () const;
        std::string subject_organizational_unit_name () const;
+       struct tm not_before () const;
+       struct tm not_after () const;
 
        X509* x509 () const {
                return _certificate;
@@ -77,12 +92,9 @@ public:
 
        std::string thumbprint () const;
 
-       bool extra_data () const {
-               return _extra_data;
-       }
+       bool has_utf8_strings () const;
 
 private:
-       bool read_string (std::string);
 
        static std::string name_for_xml (X509_NAME *);
        static std::string asn_to_utf8 (ASN1_STRING *);
@@ -90,10 +102,6 @@ private:
 
        X509* _certificate;
        mutable RSA* _public_key;
-       /** true if extra data was found when this certificate was read
-           from a string.
-       */
-       bool _extra_data;
 };
 
 bool operator== (Certificate const & a, Certificate const & b);