diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-12-16 10:19:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-12-16 10:19:27 +0000 |
| commit | 363b3241b452fac11dfd202cc5b368bd4cd672c3 (patch) | |
| tree | d4302ebbe3924d4b6d36ce204c1d0e6e98d38215 | |
| parent | 028a6d7a5939b114472f16c3436a30f72165165f (diff) | |
Remove some unnecessary code.
| -rw-r--r-- | src/decrypted_kdm.cc | 1 | ||||
| -rw-r--r-- | src/encrypted_kdm.cc | 2 | ||||
| -rw-r--r-- | src/encrypted_kdm.h | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc index 96049aa2..a928c0a6 100644 --- 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 ec8e6835..f8454053 100644 --- 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 5b60378c..edbf5192 100644 --- 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, |