Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0

[libdcp.git] / src / decrypted_kdm.h

diff --git a/src/decrypted_kdm.h b/src/decrypted_kdm.h
index 45ad8fa6c2cfeab66e6ffabbd8184d800913c077..f7d21dbe412de2e0558eb77378c7617650206f03 100644 (file)
--- a/src/decrypted_kdm.h
+++ b/src/decrypted_kdm.h
@@ -55,7 +55,23 @@ public:
         */
        DecryptedKDM (EncryptedKDM const & kdm, std::string private_key);
 
-       /** Construct a DecryptedKDM.
+       /** Create an empty DecryptedKDM.  After creation you must call
+        *  add_key() to add each key that you want in the KDM.
+        *
+        *  @param not_valid_before Start time for the KDM.
+        *  @param not_valid_after End time for the KDM.
+        */
+       DecryptedKDM (
+               LocalTime not_valid_before,
+               LocalTime not_valid_after,
+               std::string annotation_text,
+               std::string content_title_text,
+               std::string issue_date
+               );
+
+       /** Create a DecryptedKDM by taking a CPL and setting up to encrypt each of its
+        *  assets with the same symmetric key.
+        *
         *  @param cpl CPL that the keys are for.
         *  @param key Key that was used to encrypt the assets.
         *  @param not_valid_before Start time for the KDM.
@@ -74,16 +90,38 @@ public:
        /** Encrypt this KDM's keys and sign the whole KDM.
         *  @param signer Chain to sign with.
         *  @param recipient Certificate of the projector/server which should receive this KDM's keys.
+        *  @param trusted_devices Extra trusted devices which should be written to the KDM (recipient will be written
+        *  as a trusted device automatically and does not need to be included in this list).
         *  @param formulation Formulation to use for the encrypted KDM.
         *  @return Encrypted KDM.
         */
-       EncryptedKDM encrypt (boost::shared_ptr<const CertificateChain> signer, Certificate recipient, Formulation formulation) const;
+       EncryptedKDM encrypt (
+               boost::shared_ptr<const CertificateChain> signer,
+               Certificate recipient,
+               std::vector<Certificate> trusted_devices,
+               Formulation formulation
+               ) const;
+
+       void add_key (std::string type, std::string key_id, Key key, std::string cpl_id);
+       void add_key (DecryptedKDMKey key);
 
        /** @return This KDM's (decrypted) keys, which could be used to decrypt assets. */
        std::list<DecryptedKDMKey> keys () const {
                return _keys;
        }
 
+       std::string annotation_text () const {
+               return _annotation_text;
+       }
+
+       std::string content_title_text () const {
+               return _content_title_text;
+       }
+
+       std::string issue_date () const {
+               return _issue_date;
+       }
+
 private:
        LocalTime _not_valid_before;
        LocalTime _not_valid_after;