X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fencrypted_kdm.h;h=dc98e1f122edc782496f5b08ceee3f577aab4184;hb=2ae92dcc97765deb2845dd07a338858aeb375cb3;hp=0aa36a1566862333e56f614c3f2d5d53d203c93b;hpb=5e5750712fb6686cb4a192b3b232be96ad879b49;p=libdcp.git

diff --git a/src/encrypted_kdm.h b/src/encrypted_kdm.h
index 0aa36a15..dc98e1f1 100644
--- a/src/encrypted_kdm.h
+++ b/src/encrypted_kdm.h
@@ -21,7 +21,11 @@
  *  @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/date_time/local_time/local_time.hpp>
 
@@ -35,7 +39,7 @@ namespace data {
 	class EncryptedKDMData;
 }
 
-class Signer;	
+class Signer;
 class Certificate;
 
 /** @class EncryptedKDM
@@ -48,11 +52,7 @@ class Certificate;
 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 ();
@@ -70,7 +70,7 @@ public:
 	 *  keys (also key id, CPL id etc.)
 	 */
 	std::list<std::string> keys () const;
-	
+
 private:
 
 	friend class DecryptedKDM;
@@ -78,17 +78,20 @@ private:
 	/** Construct an EncryptedKDM from a set of details */
 	EncryptedKDM (
 		boost::shared_ptr<const Signer> signer,
-		boost::shared_ptr<const Certificate> recipient,
+		Certificate recipient,
 		std::string device_list_description,
 		std::string cpl_id,
 		std::string cpl_content_title_text,
-		LocalTime _not_valid_before,
-		LocalTime _not_valid_after,
+		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
 		);
-	
+
 	data::EncryptedKDMData* _data;
 };
 
 }
+
+#endif