X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fencrypted_kdm.h;h=3ac15864058390b9f9170afd7de0e7a7037d26f6;hb=f30ff718cbe924c8fcb6bf3a6a485271da85855d;hp=9e5b09d4510ba0ea67979d8afbc39c5065cb9f9d;hpb=332c7c37e1cbc088980977d7c37c1c770af4b754;p=libdcp.git

diff --git a/src/encrypted_kdm.h b/src/encrypted_kdm.h
index 9e5b09d4..3ac15864 100644
--- a/src/encrypted_kdm.h
+++ b/src/encrypted_kdm.h
@@ -1,20 +1,34 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/encrypted_kdm.h
@@ -27,6 +41,7 @@
 #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 {
@@ -52,7 +67,7 @@ class Certificate;
 class EncryptedKDM
 {
 public:
-	EncryptedKDM (std::string);
+	explicit EncryptedKDM (std::string);
 	EncryptedKDM (EncryptedKDM const & kdm);
 	EncryptedKDM & operator= (EncryptedKDM const &);
 	~EncryptedKDM ();
@@ -71,9 +86,14 @@ public:
 	 */
 	std::list<std::string> keys () const;
 
-	std::string annotation_text () 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;
+	std::string recipient_x509_subject_name () const;
 
 private:
 
@@ -84,12 +104,14 @@ private:
 		boost::shared_ptr<const CertificateChain> signer,
 		Certificate recipient,
 		std::vector<Certificate> trusted_devices,
-		std::string device_list_description,
 		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
 		);