summaryrefslogtreecommitdiff
path: root/src/lib/screen.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-01-17 01:31:38 +0100
committerCarl Hetherington <cth@carlh.net>2025-01-22 14:34:25 +0100
commit5e10a6f047d12f1e2e3d0e2f8ee30f93897a2227 (patch)
treec3daccbbf2291d6330df2c2f6d99bf34fcb2e288 /src/lib/screen.cc
parentc29ba2526337b486d4a3b1a1468513a22293bc87 (diff)
Allow KDMRecipient and hence Screen to convert certs to dcp::Certificate lazily.
This is pretty slow (as it runs the certificate through OpenSSL) and we don't need to do it for every certificate in a database when we load the database.
Diffstat (limited to 'src/lib/screen.cc')
-rw-r--r--src/lib/screen.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/screen.cc b/src/lib/screen.cc
index b77eb6b52..304fb52f3 100644
--- a/src/lib/screen.cc
+++ b/src/lib/screen.cc
@@ -65,11 +65,11 @@ kdm_for_screen (
vector<KDMCertificatePeriod>& period_checks
)
{
- if (!screen.recipient) {
+ if (!screen.recipient()) {
return {};
}
- period_checks.push_back(check_kdm_and_certificate_validity_periods(cinema.name, screen.name, screen.recipient.get(), valid_from, valid_to));
+ period_checks.push_back(check_kdm_and_certificate_validity_periods(cinema.name, screen.name, screen.recipient().get(), valid_from, valid_to));
auto signer = Config::instance()->signer_chain();
if (!signer->valid()) {
@@ -77,7 +77,7 @@ kdm_for_screen (
}
auto kdm = make_kdm(valid_from, valid_to).encrypt(
- signer, screen.recipient.get(), screen.trusted_device_thumbprints(), formulation, disable_forensic_marking_picture, disable_forensic_marking_audio
+ signer, screen.recipient().get(), screen.trusted_device_thumbprints(), formulation, disable_forensic_marking_picture, disable_forensic_marking_audio
);
dcp::NameFormat::Map name_values;