X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fencrypted_kdm.h;h=175b578f2a73e4f37e31632e0663e74fefca4fc7;hb=3924dd859ad3de1d4a207d04e841f699bd27490a;hp=5b60378cd1e3657ceace2f2854eb2e38318c1632;hpb=5eb63969c5b6f26ea820cfab116d4aecb6bd3390;p=libdcp.git

diff --git a/src/encrypted_kdm.h b/src/encrypted_kdm.h
index 5b60378c..175b578f 100644
--- a/src/encrypted_kdm.h
+++ b/src/encrypted_kdm.h
@@ -86,12 +86,15 @@ public:
 	 */
 	std::list<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;
 	std::string cpl_id () const;
-	LocalTime not_valid_before() const;
-	LocalTime not_valid_after() const;
+	LocalTime not_valid_before () const;
+	LocalTime not_valid_after () const;
+	std::string recipient_x509_subject_name () const;
+	CertificateChain signer_certificate_chain () const;
 
 private:
 
@@ -99,16 +102,17 @@ 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::string device_list_description,
+		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,
+		bool disable_forensic_marking_picture,
+		boost::optional<int> disable_forensic_marking_audio,
 		std::list<std::pair<std::string, std::string> > key_ids,
 		std::list<std::string> keys
 		);