We should not carry on if files don't open in tests.

[libdcp.git] / src / encrypted_kdm.h

diff --git a/src/encrypted_kdm.h b/src/encrypted_kdm.h
index d1139d3a668234027921726f968a8559d91c6bae..ddc0273a89a507455f6f926c2b74e2ce8be0ffd0 100644 (file)
--- a/src/encrypted_kdm.h
+++ b/src/encrypted_kdm.h
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     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
@@ -72,10 +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;
+       std::string recipient_x509_subject_name () const;
+       CertificateChain signer_certificate_chain () const;
 
 private:
 
@@ -85,14 +104,15 @@ private:
        EncryptedKDM (
                boost::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
                );