Remove some unnecessary code.

diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc
index 96049aa2871100a133e983868a30f716a13d2860..a928c0a6a966fdcf5a09beb3f44aebb8983c356c 100644 (file)
--- a/src/decrypted_kdm.cc
+++ b/src/decrypted_kdm.cc
@@ -326,7 +326,6 @@ DecryptedKDM::encrypt (shared_ptr<const CertificateChain> signer, Certificate re
                signer,
                recipient,
                trusted_devices,
-               device_list_description,
                _keys.front().cpl_id (),
                _content_title_text,
                _annotation_text,

diff --git a/src/encrypted_kdm.cc b/src/encrypted_kdm.cc
index ec8e6835fb3508680fe3943ceb365688d6e71dc5..f84540534ab08aa6325601f9709f9a03a9107641 100644 (file)
--- a/src/encrypted_kdm.cc
+++ b/src/encrypted_kdm.cc
@@ -530,7 +530,6 @@ EncryptedKDM::EncryptedKDM (
        shared_ptr<const CertificateChain> signer,
        Certificate recipient,
        vector<Certificate> trusted_devices,
-       string device_list_description,
        string cpl_id,
        string content_title_text,
        optional<string> annotation_text,
@@ -553,7 +552,6 @@ EncryptedKDM::EncryptedKDM (
        kre.recipient.x509_issuer_serial.x509_issuer_name = recipient.issuer ();
        kre.recipient.x509_issuer_serial.x509_serial_number = recipient.serial ();
        kre.recipient.x509_subject_name = recipient.subject ();
-       kre.authorized_device_info.device_list_description = device_list_description;
        kre.composition_playlist_id = cpl_id;
        if (formulation == DCI_ANY || formulation == DCI_SPECIFIC) {
                kre.content_authenticator = signer->leaf().thumbprint ();

diff --git a/src/encrypted_kdm.h b/src/encrypted_kdm.h
index 5b60378cd1e3657ceace2f2854eb2e38318c1632..edbf5192407e56acea80c72633e43e99aac9abfb 100644 (file)
--- a/src/encrypted_kdm.h
+++ b/src/encrypted_kdm.h
@@ -102,7 +102,6 @@ private:
                boost::shared_ptr<const CertificateChain> signer,
                Certificate recipient,
                std::vector<Certificate> trusted_devices,
-               std::string device_list_description,
                std::string cpl_id,
                std::string cpl_content_title_text,
                boost::optional<std::string> annotation_text,