diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-15 20:57:47 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-15 20:57:47 +0000 |
| commit | 69f25e496ba409c02aa27b1e07dfcde34c86a32b (patch) | |
| tree | f36e0e621fe2c514f96cf7365f57b0acd151877b /src/lib | |
| parent | e170d9908c191180aefe71ff7cfa81a5ba08ed83 (diff) | |
Basic support for trusted device lists in KDMs (#750).
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 7 | ||||
| -rw-r--r-- | src/lib/film.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index d406152a1..6c0b4d5a5 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1113,7 +1113,8 @@ Film::frame_size () const dcp::EncryptedKDM Film::make_kdm ( - dcp::Certificate target, + dcp::Certificate recipient, + vector<dcp::Certificate> trusted_devices, boost::filesystem::path cpl_file, dcp::LocalTime from, dcp::LocalTime until, @@ -1128,7 +1129,7 @@ Film::make_kdm ( return dcp::DecryptedKDM ( cpl, key(), from, until, "DCP-o-matic", cpl->content_title_text(), dcp::LocalTime().as_string() - ).encrypt (signer, target, formulation); + ).encrypt (signer, recipient, trusted_devices, formulation); } list<ScreenKDM> @@ -1144,7 +1145,7 @@ Film::make_kdms ( BOOST_FOREACH (shared_ptr<Screen> i, screens) { if (i->recipient) { - kdms.push_back (ScreenKDM (i, make_kdm (i->recipient.get(), dcp, from, until, formulation))); + kdms.push_back (ScreenKDM (i, make_kdm (i->recipient.get(), i->trusted_devices, dcp, from, until, formulation))); } } diff --git a/src/lib/film.h b/src/lib/film.h index 400442103..faa7cf5ba 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -121,7 +121,8 @@ public: dcp::EncryptedKDM make_kdm ( - dcp::Certificate target, + dcp::Certificate recipient, + std::vector<dcp::Certificate> trusted_devices, boost::filesystem::path cpl_file, dcp::LocalTime from, dcp::LocalTime until, |