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/tools | |
| parent | e170d9908c191180aefe71ff7cfa81a5ba08ed83 (diff) | |
Basic support for trusted device lists in KDMs (#750).
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm_cli.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 2c96f37b2..ae5802e74 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -279,7 +279,7 @@ private: } /* Encrypt */ - screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), _output->formulation()))); + screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation()))); } if (_output->write_to()) { diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index c49642c8e..2f8212a61 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -255,7 +255,7 @@ int main (int argc, char* argv[]) } dcp::Certificate certificate (dcp::file_to_string (certificate_file)); - dcp::EncryptedKDM kdm = film->make_kdm (certificate, cpl, valid_from.get(), valid_to.get(), formulation); + dcp::EncryptedKDM kdm = film->make_kdm (certificate, vector<dcp::Certificate>(), cpl, valid_from.get(), valid_to.get(), formulation); kdm.as_xml (output); if (verbose) { cout << "Generated KDM " << output << " for certificate.\n"; |