More tests.

[libdcp.git] / src / decrypted_kdm.h

diff --git a/src/decrypted_kdm.h b/src/decrypted_kdm.h
index bb50d6ada9565380746eb097658be1c9d9f87af6..91b2f7d3d25a2ebe8d116cdf1ede49e4b6f38170 100644 (file)
--- a/src/decrypted_kdm.h
+++ b/src/decrypted_kdm.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef LIBDCP_DECRYPTED_KDM_H
+#define LIBDCP_DECRYPTED_KDM_H
+
 /** @file  src/decrypted_kdm.h
  *  @brief DecryptedKDM class.
  */
@@ -24,6 +27,8 @@
 #include "key.h"
 #include "local_time.h"
 #include "decrypted_kdm_key.h"
+#include "types.h"
+#include "certificates.h"
 #include <boost/filesystem.hpp>
 
 namespace dcp {
@@ -31,7 +36,6 @@ namespace dcp {
 class DecryptedKDMKey;
 class EncryptedKDM;
 class Signer;
-class Certificate;
 class CPL;
 
 /** @class DecryptedKDM
@@ -47,17 +51,19 @@ class DecryptedKDM
 {
 public:
        /** @param kdm Encrypted KDM.
-        *  @param private_key Private key file name.
+        *  @param private_key Private key as a PEM-format string.
         */
-       DecryptedKDM (EncryptedKDM const & kdm, boost::filesystem::path private_key);
+       DecryptedKDM (EncryptedKDM const & kdm, std::string private_key);
 
        /** Construct a DecryptedKDM.
         *  @param cpl CPL that the keys are for.
+        *  @param key Key that was used to encrypt the MXFs.
         *  @param not_valid_before Start time for the KDM.
         *  @param not_valid_after End time for the KDM.
         */
        DecryptedKDM (
                boost::shared_ptr<const CPL> cpl,
+               Key key,
                LocalTime not_valid_before,
                LocalTime not_valid_after,
                std::string annotation_text,
@@ -65,19 +71,13 @@ public:
                std::string issue_date
                );
 
-       /** Add a key to this KDM.
-        *  @param type Key type (MDIK, MDAK etc.)
-        *  @param id Key id.
-        *  @param key the key itself (which has been used to encrypt a MXF).
-        */
-       void add_key (std::string type, std::string id, Key key);
-
        /** Encrypt this KDM's keys and sign the whole KDM.
         *  @param signer Signer.
         *  @param recipient Certificate of the projector/server which should receive this KDM's keys.
+        *  @param formulation Formulation to use for the encrypted KDM.
         *  @return Encrypted KDM.
         */
-       EncryptedKDM encrypt (boost::shared_ptr<const Signer> signer, boost::shared_ptr<const Certificate> recipient) const;
+       EncryptedKDM encrypt (boost::shared_ptr<const Signer> signer, Certificate recipient, Formulation formulation) const;
 
        /** @return This KDM's (decrypted) keys, which could be used to decrypt MXFs. */
        std::list<DecryptedKDMKey> keys () const {
@@ -94,3 +94,5 @@ private:
 };
 
 }
+
+#endif