Finish initial CPL markers support.

[libdcp.git] / src / certificate.h

diff --git a/src/certificate.h b/src/certificate.h
index 6193af8fe59315845094b7586b89c8522ae38fd5..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.
 
@@ -44,8 +44,6 @@
 #include <string>
 #include <list>
 
-class certificates;
-
 namespace xmlpp {
        class Element;
 }
@@ -63,7 +61,6 @@ public:
        Certificate ()
                : _certificate (0)
                , _public_key (0)
-               , _extra_data (false)
        {}
 
        explicit Certificate (std::string);
@@ -73,6 +70,8 @@ public:
 
        Certificate& operator= (Certificate const &);
 
+       std::string read_string (std::string);
+
        std::string certificate (bool with_begin_end = false) const;
        std::string serial () const;
 
@@ -82,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;
@@ -91,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 *);
@@ -104,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);