Add conversions from char.

[libdcp.git] / src / certificate.h

diff --git a/src/certificate.h b/src/certificate.h
index 6225cf31012c424b02990ae1cfb5669e6478b694..6193af8fe59315845094b7586b89c8522ae38fd5 100644 (file)
--- a/src/certificate.h
+++ b/src/certificate.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    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
@@ -49,10 +63,11 @@ 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 ();
 
@@ -76,8 +91,12 @@ public:
 
        std::string thumbprint () const;
 
+       bool extra_data () const {
+               return _extra_data;
+       }
+
 private:
-       void read_string (std::string);
+       bool read_string (std::string);
 
        static std::string name_for_xml (X509_NAME *);
        static std::string asn_to_utf8 (ASN1_STRING *);
@@ -85,6 +104,10 @@ 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);