X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fencrypted_kdm.h;h=e74dde699bbd85f6583823f03b0f830caa5b5bb8;hb=refs%2Ftags%2Fv1.8.4;hp=1605d9111ddcce9af04e7cc4f433d6670d3f8d6a;hpb=ce6ced029aefe5c3996bd61b0778bcd7433b2fb3;p=libdcp.git

diff --git a/src/encrypted_kdm.h b/src/encrypted_kdm.h
index 1605d911..e74dde69 100644
--- a/src/encrypted_kdm.h
+++ b/src/encrypted_kdm.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,34 +31,42 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/encrypted_kdm.h
- *  @brief EncryptedKDM class.
+ *  @brief EncryptedKDM class
  */
 
+
 #ifndef LIBDCP_ENCRYPTED_KDM_H
 #define LIBDCP_ENCRYPTED_KDM_H
 
+
 #include "local_time.h"
 #include "types.h"
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
 #include <boost/date_time/local_time/local_time.hpp>
 
+
 namespace cxml {
 	class Node;
 }
 
+
 namespace dcp {
 
+
 namespace data {
 	class EncryptedKDMData;
 }
 
+
 class CertificateChain;
 class Certificate;
 
+
 /** @class EncryptedKDM
- *  @brief An encrypted KDM.
+ *  @brief An encrypted KDM
  *
  *  This is a KDM whose keys are encrypted using the target projector's private key.
  *  An EncryptedKDM object can be initialised from a KDM XML file, or created from
@@ -84,8 +92,9 @@ public:
 	 *  Note that the returned `keys' contain more than just the asset decryption
 	 *  keys (also key id, CPL id etc.)
 	 */
-	std::list<std::string> keys () const;
+	std::vector<std::string> keys () const;
 
+	std::string id () const;
 	boost::optional<std::string> annotation_text () const;
 	std::string content_title_text () const;
 	std::string issue_date () const;
@@ -93,6 +102,7 @@ public:
 	LocalTime not_valid_before () const;
 	LocalTime not_valid_after () const;
 	std::string recipient_x509_subject_name () const;
+	CertificateChain signer_certificate_chain () const;
 
 private:
 
@@ -100,24 +110,28 @@ private:
 
 	/** Construct an EncryptedKDM from a set of details */
 	EncryptedKDM (
-		boost::shared_ptr<const CertificateChain> signer,
+		std::shared_ptr<const CertificateChain> signer,
 		Certificate recipient,
-		std::vector<Certificate> trusted_devices,
+		std::vector<std::string> trusted_devices,
 		std::string cpl_id,
 		std::string cpl_content_title_text,
 		boost::optional<std::string> annotation_text,
 		LocalTime not_valid_before,
 		LocalTime not_valid_after,
 		Formulation formulation,
-		std::list<std::pair<std::string, std::string> > key_ids,
-		std::list<std::string> keys
+		bool disable_forensic_marking_picture,
+		boost::optional<int> disable_forensic_marking_audio,
+		std::vector<std::pair<std::string, std::string>> key_ids,
+		std::vector<std::string> keys
 		);
 
-	data::EncryptedKDMData* _data;
+	data::EncryptedKDMData* _data = nullptr;
 };
 
+
 extern bool operator== (EncryptedKDM const & a, EncryptedKDM const & b);
 
 }
 
+
 #endif