projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Signer into CertificateChain.
[libdcp.git]
/
src
/
encrypted_kdm.h
diff --git
a/src/encrypted_kdm.h
b/src/encrypted_kdm.h
index 0d459d5a300aeb6d949717a237c5c4aa755de5ff..247d6678045098d7cac57e47f0328bda4c241657 100644
(file)
--- a/
src/encrypted_kdm.h
+++ b/
src/encrypted_kdm.h
@@
-39,7
+39,7
@@
namespace data {
class EncryptedKDMData;
}
class EncryptedKDMData;
}
-class
Signer;
+class
CertificateChain;
class Certificate;
/** @class EncryptedKDM
class Certificate;
/** @class EncryptedKDM
@@
-52,11
+52,7
@@
class Certificate;
class EncryptedKDM
{
public:
class EncryptedKDM
{
public:
- /** Read a KDM from an XML file.
- * @param file XML file to read.
- */
- EncryptedKDM (boost::filesystem::path file);
-
+ EncryptedKDM (std::string);
EncryptedKDM (EncryptedKDM const & kdm);
EncryptedKDM & operator= (EncryptedKDM const &);
~EncryptedKDM ();
EncryptedKDM (EncryptedKDM const & kdm);
EncryptedKDM & operator= (EncryptedKDM const &);
~EncryptedKDM ();
@@
-74,15
+70,15
@@
public:
* keys (also key id, CPL id etc.)
*/
std::list<std::string> keys () const;
* keys (also key id, CPL id etc.)
*/
std::list<std::string> keys () const;
-
+
private:
friend class DecryptedKDM;
/** Construct an EncryptedKDM from a set of details */
EncryptedKDM (
private:
friend class DecryptedKDM;
/** Construct an EncryptedKDM from a set of details */
EncryptedKDM (
- boost::shared_ptr<const
Signer
> signer,
-
boost::shared_ptr<const Certificate>
recipient,
+ boost::shared_ptr<const
CertificateChain
> signer,
+
Certificate
recipient,
std::string device_list_description,
std::string cpl_id,
std::string cpl_content_title_text,
std::string device_list_description,
std::string cpl_id,
std::string cpl_content_title_text,
@@
-92,7
+88,7
@@
private:
std::list<std::pair<std::string, std::string> > key_ids,
std::list<std::string> keys
);
std::list<std::pair<std::string, std::string> > key_ids,
std::list<std::string> keys
);
-
+
data::EncryptedKDMData* _data;
};
data::EncryptedKDMData* _data;
};