projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simpole DCP recovery utility (dcprecover) added.
[libdcp.git]
/
src
/
certificate.h
diff --git
a/src/certificate.h
b/src/certificate.h
index 6193af8fe59315845094b7586b89c8522ae38fd5..0d333f1e2f61b6104de9a3d6866d7f98eab74565 100644
(file)
--- a/
src/certificate.h
+++ b/
src/certificate.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
6
Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
This file is part of libdcp.
@@
-44,8
+44,6
@@
#include <string>
#include <list>
#include <string>
#include <list>
-class certificates;
-
namespace xmlpp {
class Element;
}
namespace xmlpp {
class Element;
}
@@
-63,7
+61,6
@@
public:
Certificate ()
: _certificate (0)
, _public_key (0)
Certificate ()
: _certificate (0)
, _public_key (0)
- , _extra_data (false)
{}
explicit Certificate (std::string);
{}
explicit Certificate (std::string);
@@
-73,6
+70,8
@@
public:
Certificate& operator= (Certificate const &);
Certificate& operator= (Certificate const &);
+ std::string read_string (std::string);
+
std::string certificate (bool with_begin_end = false) const;
std::string serial () const;
std::string certificate (bool with_begin_end = false) const;
std::string serial () const;
@@
-91,12
+90,9
@@
public:
std::string thumbprint () const;
std::string thumbprint () const;
- bool extra_data () const {
- return _extra_data;
- }
+ bool has_utf8_strings () const;
private:
private:
- bool read_string (std::string);
static std::string name_for_xml (X509_NAME *);
static std::string asn_to_utf8 (ASN1_STRING *);
static std::string name_for_xml (X509_NAME *);
static std::string asn_to_utf8 (ASN1_STRING *);
@@
-104,10
+100,6
@@
private:
X509* _certificate;
mutable RSA* _public_key;
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);
};
bool operator== (Certificate const & a, Certificate const & b);