diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-21 01:57:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-21 01:57:06 +0100 |
| commit | 76e3325a16cdf6d7220a61e2b5cfdb9c804cc32c (patch) | |
| tree | 8c1b5e5dc2cec265469a0d8018b6d7396b089432 /src/encrypted_kdm.cc | |
| parent | 6c3db78c3d20ef064fa2a0ef38e65ca1ae69adb3 (diff) | |
Use enum class for the things in types.h
Diffstat (limited to 'src/encrypted_kdm.cc')
| -rw-r--r-- | src/encrypted_kdm.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/encrypted_kdm.cc b/src/encrypted_kdm.cc index a124fdf6..d7326e89 100644 --- a/src/encrypted_kdm.cc +++ b/src/encrypted_kdm.cc @@ -612,7 +612,7 @@ EncryptedKDM::EncryptedKDM ( kre.recipient.x509_issuer_serial.x509_serial_number = recipient.serial (); kre.recipient.x509_subject_name = recipient.subject (); kre.composition_playlist_id = cpl_id; - if (formulation == DCI_ANY || formulation == DCI_SPECIFIC) { + if (formulation == Formulation::DCI_ANY || formulation == Formulation::DCI_SPECIFIC) { kre.content_authenticator = signer->leaf().thumbprint (); } kre.content_title_text = content_title_text; @@ -621,7 +621,7 @@ EncryptedKDM::EncryptedKDM ( kre.disable_forensic_marking_picture = disable_forensic_marking_picture; kre.disable_forensic_marking_audio = disable_forensic_marking_audio; - if (formulation != MODIFIED_TRANSITIONAL_TEST) { + if (formulation != Formulation::MODIFIED_TRANSITIONAL_TEST) { kre.authorized_device_info = data::AuthorizedDeviceInfo (); kre.authorized_device_info->device_list_identifier = make_uuid (); auto n = recipient.subject_common_name (); @@ -630,10 +630,10 @@ EncryptedKDM::EncryptedKDM ( } kre.authorized_device_info->device_list_description = n; - if (formulation == MODIFIED_TRANSITIONAL_1 || formulation == DCI_ANY) { + if (formulation == Formulation::MODIFIED_TRANSITIONAL_1 || formulation == Formulation::DCI_ANY) { /* Use the "assume trust" thumbprint */ kre.authorized_device_info->certificate_thumbprints.push_back ("2jmj7l5rSw0yVb/vlWAYkK/YBwk="); - } else if (formulation == MULTIPLE_MODIFIED_TRANSITIONAL_1 || formulation == DCI_SPECIFIC) { + } else if (formulation == Formulation::MULTIPLE_MODIFIED_TRANSITIONAL_1 || formulation == Formulation::DCI_SPECIFIC) { if (trusted_devices.empty ()) { /* Fall back on the "assume trust" thumbprint so we can generate "modified-transitional-1" KDMs |