diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-08 23:56:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-08 23:56:52 +0000 |
| commit | 27e1378bede33c51835fd6307239692909d834d8 (patch) | |
| tree | 1c0da933f146ad814b99f80b61fa5f6aa2d684a9 /src | |
| parent | 4af8d182454ef8452210612c396d514077cd27e1 (diff) | |
Take thumbprint rather than a full dcp::Certificate for trusted devices.
Diffstat (limited to 'src')
| -rw-r--r-- | src/decrypted_kdm.cc | 2 | ||||
| -rw-r--r-- | src/decrypted_kdm.h | 6 | ||||
| -rw-r--r-- | src/encrypted_kdm.cc | 7 | ||||
| -rw-r--r-- | src/encrypted_kdm.h | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc index 0fa95f9a..756028d1 100644 --- a/src/decrypted_kdm.cc +++ b/src/decrypted_kdm.cc @@ -305,7 +305,7 @@ EncryptedKDM DecryptedKDM::encrypt ( shared_ptr<const CertificateChain> signer, Certificate recipient, - vector<Certificate> trusted_devices, + vector<string> trusted_devices, Formulation formulation, bool disable_forensic_marking_picture, optional<int> disable_forensic_marking_audio diff --git a/src/decrypted_kdm.h b/src/decrypted_kdm.h index 7ae1d161..1cf1e0d4 100644 --- a/src/decrypted_kdm.h +++ b/src/decrypted_kdm.h @@ -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. @@ -121,7 +121,7 @@ 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 + * @param trusted_devices Thumbprints of 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. @@ -132,7 +132,7 @@ public: EncryptedKDM encrypt ( boost::shared_ptr<const CertificateChain> signer, Certificate recipient, - std::vector<Certificate> trusted_devices, + std::vector<std::string> trusted_devices, Formulation formulation, bool disable_forensic_marking_picture, boost::optional<int> disable_forensic_marking_audio diff --git a/src/encrypted_kdm.cc b/src/encrypted_kdm.cc index 7a7d98c1..23052f8a 100644 --- a/src/encrypted_kdm.cc +++ b/src/encrypted_kdm.cc @@ -576,10 +576,11 @@ EncryptedKDM::EncryptedKDM (string s) } } +/** @param trusted_devices Trusted device thumbprints */ EncryptedKDM::EncryptedKDM ( shared_ptr<const CertificateChain> signer, Certificate recipient, - vector<Certificate> trusted_devices, + vector<string> trusted_devices, string cpl_id, string content_title_text, optional<string> annotation_text, @@ -651,8 +652,8 @@ EncryptedKDM::EncryptedKDM ( recipient's thumbprint (recipient.thumbprint()). Waimea uses only the trusted devices here, too. */ - BOOST_FOREACH (Certificate const & i, trusted_devices) { - kre.authorized_device_info->certificate_thumbprints.push_back (i.thumbprint ()); + BOOST_FOREACH (string i, trusted_devices) { + kre.authorized_device_info->certificate_thumbprints.push_back (i); } } } diff --git a/src/encrypted_kdm.h b/src/encrypted_kdm.h index 3ac15864..e52fa0a1 100644 --- a/src/encrypted_kdm.h +++ b/src/encrypted_kdm.h @@ -103,7 +103,7 @@ private: EncryptedKDM ( boost::shared_ptr<const CertificateChain> signer, Certificate recipient, - std::vector<Certificate> trusted_devices, + std::vector<std::string> trusted_devices, std::string cpl_id, std::string cpl_content_title_text, boost::optional<std::string> annotation_text, |