Remove old MODIFIED_TRANSITIONAL_TEST.

diff --git a/src/encrypted_kdm.cc b/src/encrypted_kdm.cc
index dec2efcd844bcfdd410dc102f09e22970f4292e7..986f82e4dd678428058b2caee18faf9c8d9f2544 100644 (file)
--- a/src/encrypted_kdm.cc
+++ b/src/encrypted_kdm.cc
@@ -648,37 +648,35 @@ EncryptedKDM::EncryptedKDM (
        kre.disable_forensic_marking_picture = disable_forensic_marking_picture;
        kre.disable_forensic_marking_audio = disable_forensic_marking_audio;
 
-       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 ();
-               if (n.find (".") != string::npos) {
-                       n = n.substr (n.find (".") + 1);
-               }
-               kre.authorized_device_info->device_list_description = n;
-
-               if (formulation == Formulation::MODIFIED_TRANSITIONAL_1 || formulation == Formulation::DCI_ANY) {
-                       /* Use the "assume trust" thumbprint */
+       kre.authorized_device_info = data::AuthorizedDeviceInfo ();
+       kre.authorized_device_info->device_list_identifier = make_uuid ();
+       auto n = recipient.subject_common_name ();
+       if (n.find (".") != string::npos) {
+               n = n.substr (n.find (".") + 1);
+       }
+       kre.authorized_device_info->device_list_description = n;
+
+       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 == 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
+                          together with "multiple-modified-transitional-1"
+                          KDMs in one go, and similarly for "dci-any" etc.
+                       */
                        kre.authorized_device_info->certificate_thumbprints.push_back ("2jmj7l5rSw0yVb/vlWAYkK/YBwk=");
-               } 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
-                                  together with "multiple-modified-transitional-1"
-                                  KDMs in one go, and similarly for "dci-any" etc.
-                               */
-                               kre.authorized_device_info->certificate_thumbprints.push_back ("2jmj7l5rSw0yVb/vlWAYkK/YBwk=");
-                       } else {
-                               /* As I read the standard we should use the
-                                  recipient /and/ other trusted device thumbprints
-                                  here. MJD reports that this doesn't work with
-                                  his setup; a working KDM does not include the
-                                  recipient's thumbprint (recipient.thumbprint()).
-                                  Waimea uses only the trusted devices here, too.
-                               */
-                               for (auto i: trusted_devices) {
-                                       kre.authorized_device_info->certificate_thumbprints.push_back(i);
-                               }
+               } else {
+                       /* As I read the standard we should use the
+                          recipient /and/ other trusted device thumbprints
+                          here. MJD reports that this doesn't work with
+                          his setup; a working KDM does not include the
+                          recipient's thumbprint (recipient.thumbprint()).
+                          Waimea uses only the trusted devices here, too.
+                       */
+                       for (auto i: trusted_devices) {
+                               kre.authorized_device_info->certificate_thumbprints.push_back(i);
                        }
                }
        }

diff --git a/src/types.h b/src/types.h
index b68402af668d9a26cd5915a39ef6e49089284db6..9fdb93cabad4d96f77a9173b7578a156d667ccd7 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -289,8 +289,6 @@ enum class Formulation {
        MULTIPLE_MODIFIED_TRANSITIONAL_1,
        DCI_ANY,
        DCI_SPECIFIC,
-       /** For testing: adds no AuthorizedDeviceInfo tag */
-       MODIFIED_TRANSITIONAL_TEST
 };