From 1e77753ef4119b6d7df7d2255b1a1d8d6af951de Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 9 Nov 2018 00:04:23 +0000 Subject: Allow specification of trusted devices by thumbprint rather than by full certificate. --- src/tools/dcpomatic_kdm_cli.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/tools/dcpomatic_kdm_cli.cc') diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index f1849adf6..3dc3f21b0 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -273,7 +273,7 @@ dcp::EncryptedKDM kdm_from_dkdm ( dcp::DecryptedKDM dkdm, dcp::Certificate target, - vector trusted_devices, + vector trusted_devices, dcp::LocalTime valid_from, dcp::LocalTime valid_to, dcp::Formulation formulation, @@ -337,7 +337,7 @@ from_dkdm ( kdm_from_dkdm ( dkdm, i->recipient.get(), - i->trusted_devices, + i->trusted_device_thumbprints(), dcp::LocalTime(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()), dcp::LocalTime(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()), formulation, @@ -500,7 +500,7 @@ int main (int argc, char* argv[]) case 'C': { /* Make a new screen and add it to the current cinema */ - shared_ptr screen (new Screen (screen_description, dcp::Certificate (dcp::file_to_string (optarg)), vector())); + shared_ptr screen (new Screen (screen_description, dcp::Certificate (dcp::file_to_string (optarg)), vector())); if (cinema) { cinema->add_screen (screen); } @@ -510,7 +510,7 @@ int main (int argc, char* argv[]) case 'T': /* A trusted device ends up in the last screen we made */ if (!screens.empty ()) { - screens.back()->trusted_devices.push_back (dcp::Certificate (dcp::file_to_string (optarg))); + screens.back()->trusted_devices.push_back(TrustedDevice(dcp::Certificate(dcp::file_to_string(optarg)))); } break; case 'B': -- cgit v1.2.3