diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/decrypted_kdm.cc | 7 | ||||
| -rw-r--r-- | src/decrypted_kdm.h | 7 | ||||
| -rw-r--r-- | src/encrypted_kdm.cc | 23 | ||||
| -rw-r--r-- | src/encrypted_kdm.h | 4 |
4 files changed, 25 insertions, 16 deletions
diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc index 53e958c1..0fa95f9a 100644 --- a/src/decrypted_kdm.cc +++ b/src/decrypted_kdm.cc @@ -303,7 +303,12 @@ DecryptedKDM::add_key (DecryptedKDMKey key) EncryptedKDM DecryptedKDM::encrypt ( - shared_ptr<const CertificateChain> signer, Certificate recipient, vector<Certificate> trusted_devices, Formulation formulation, int disable_forensic_marking_picture, int disable_forensic_marking_audio + shared_ptr<const CertificateChain> signer, + Certificate recipient, + vector<Certificate> trusted_devices, + Formulation formulation, + bool disable_forensic_marking_picture, + optional<int> disable_forensic_marking_audio ) const { DCP_ASSERT (!_keys.empty ()); diff --git a/src/decrypted_kdm.h b/src/decrypted_kdm.h index c264bfbc..7ae1d161 100644 --- a/src/decrypted_kdm.h +++ b/src/decrypted_kdm.h @@ -124,6 +124,9 @@ public: * @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. + * @param disable_forensic_marking_picture true to disable forensic marking of picture. + * @param disable_forensic_marking_audio if not set, don't disable forensic marking of audio. If set to 0, + * disable all forensic marking; if set above 0, disable forensic marking above that channel. * @return Encrypted KDM. */ EncryptedKDM encrypt ( @@ -131,8 +134,8 @@ public: Certificate recipient, std::vector<Certificate> trusted_devices, Formulation formulation, - int disable_forensic_marking_picture, - int disable_forensic_marking_audio + bool disable_forensic_marking_picture, + boost::optional<int> disable_forensic_marking_audio ) const; void add_key (boost::optional<std::string> type, std::string key_id, Key key, std::string cpl_id, Standard standard); diff --git a/src/encrypted_kdm.cc b/src/encrypted_kdm.cc index d7a2bcc6..7a7d98c1 100644 --- a/src/encrypted_kdm.cc +++ b/src/encrypted_kdm.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net> This file is part of libdcp. @@ -35,6 +35,7 @@ #include "util.h" #include "certificate_chain.h" #include "exceptions.h" +#include "compose.hpp" #include <libcxml/cxml.h> #include <libxml++/document.h> #include <libxml++/nodes/element.h> @@ -384,14 +385,14 @@ public: , authorized_device_info (node->node_child ("AuthorizedDeviceInfo")) , key_id_list (node->node_child ("KeyIdList")) { - disable_forensic_marking_picture = 0; - disable_forensic_marking_audio = 0; + disable_forensic_marking_picture = false; + disable_forensic_marking_audio = optional<int>(); if (node->optional_node_child("ForensicMarkFlagList")) { BOOST_FOREACH (cxml::ConstNodePtr i, node->node_child("ForensicMarkFlagList")->node_children("ForensicMarkFlag")) { if (i->content() == picture_disable) { - disable_forensic_marking_picture = -1; + disable_forensic_marking_picture = true; } else if (starts_with(i->content(), audio_disable)) { - disable_forensic_marking_audio = -1; + disable_forensic_marking_audio = 0; string const above = audio_disable + "-above-channel-"; if (starts_with(i->content(), above)) { string above_number = i->content().substr(above.length()); @@ -429,8 +430,8 @@ public: } if (disable_forensic_marking_audio) { string mrkflg = audio_disable; - if (disable_forensic_marking_audio != -1) { - mrkflg = str (boost::format (mrkflg + "-above-channel-%u") % disable_forensic_marking_audio); + if (*disable_forensic_marking_audio > 0) { + mrkflg += String::compose ("-above-channel-%1", *disable_forensic_marking_audio); } forensic_mark_flag_list->add_child("ForensicMarkFlag")->add_child_text (mrkflg); } @@ -443,8 +444,8 @@ public: string content_title_text; LocalTime not_valid_before; LocalTime not_valid_after; - int disable_forensic_marking_picture; - int disable_forensic_marking_audio; + bool disable_forensic_marking_picture; + optional<int> disable_forensic_marking_audio; boost::optional<AuthorizedDeviceInfo> authorized_device_info; KeyIdList key_id_list; @@ -585,8 +586,8 @@ EncryptedKDM::EncryptedKDM ( LocalTime not_valid_before, LocalTime not_valid_after, Formulation formulation, - int disable_forensic_marking_picture, - int disable_forensic_marking_audio, + bool disable_forensic_marking_picture, + optional<int> disable_forensic_marking_audio, list<pair<string, string> > key_ids, list<string> keys ) diff --git a/src/encrypted_kdm.h b/src/encrypted_kdm.h index 24e8f060..3ac15864 100644 --- a/src/encrypted_kdm.h +++ b/src/encrypted_kdm.h @@ -110,8 +110,8 @@ private: LocalTime not_valid_before, LocalTime not_valid_after, Formulation formulation, - int disable_forensic_marking_picture, - int disable_forensic_marking_audio, + 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 ); |