summaryrefslogtreecommitdiff
path: root/src/decrypted_kdm.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-11-15 20:53:25 +0000
committerCarl Hetherington <cth@carlh.net>2015-11-15 20:53:25 +0000
commitcb18463291c502979d661b75e9e446f6c9bb0e3c (patch)
tree99f2b5b3bef02dfcc053905f9193f98028eab2bc /src/decrypted_kdm.cc
parentdc31f6d229c0b0c3d953022594c8bb713ca5d72e (diff)
Support trusted device lists in KDMs.
Diffstat (limited to 'src/decrypted_kdm.cc')
-rw-r--r--src/decrypted_kdm.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc
index 3e48e23f..99cbca10 100644
--- a/src/decrypted_kdm.cc
+++ b/src/decrypted_kdm.cc
@@ -36,6 +36,7 @@
#include <boost/foreach.hpp>
using std::list;
+using std::vector;
using std::string;
using std::stringstream;
using std::setw;
@@ -249,7 +250,7 @@ DecryptedKDM::add_key (DecryptedKDMKey key)
}
EncryptedKDM
-DecryptedKDM::encrypt (shared_ptr<const CertificateChain> signer, Certificate recipient, Formulation formulation) const
+DecryptedKDM::encrypt (shared_ptr<const CertificateChain> signer, Certificate recipient, vector<Certificate> trusted_devices, Formulation formulation) const
{
list<pair<string, string> > key_ids;
list<string> keys;
@@ -305,6 +306,7 @@ DecryptedKDM::encrypt (shared_ptr<const CertificateChain> signer, Certificate re
return EncryptedKDM (
signer,
recipient,
+ trusted_devices,
device_list_description,
_keys.front().cpl_id (),
_content_title_text,