widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove duplicate information from client identification" into pi-dev

Browse Source
This commit is contained in:
Rahul Frias
2018-04-26 20:29:36 +00:00
committed by Android (Google) Code Review
parent 6d3dbfca83 d7e0a3562c
commit 40b1131c13
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libwvdrmengine/cdm/core/src/certificate_provisioning.cpp
View File

@@ -15,6 +15,8 @@
namespace { namespace {
const std::string kKeyBuildInfo = "build_info";
// URL for Google Provisioning Server. // URL for Google Provisioning Server.
// The provisioning server supplies the certificate that is needed // The provisioning server supplies the certificate that is needed
// to communicate with the License Server. // to communicate with the License Server.
@@ -235,6 +237,15 @@ CdmResponseType CertificateProvisioning::GetProvisioningRequest(
return CLIENT_IDENTIFICATION_TOKEN_ERROR_2; return CLIENT_IDENTIFICATION_TOKEN_ERROR_2;
} }
client_id->set_token(token); client_id->set_token(token);
std::string value;
if (Properties::GetBuildInfo(&value)) {
ClientIdentification_NameValue* client_info;
client_info = client_id->add_client_info();
client_info->set_name(kKeyBuildInfo);
client_info->set_value(value);
}
} }
uint32_t nonce; uint32_t nonce;

9
libwvdrmengine/cdm/core/src/client_identification.cpp
View File

@@ -133,15 +133,6 @@ CdmResponseType ClientIdentification::Prepare(
client_info->set_name(kKeyBuildInfo); client_info->set_name(kKeyBuildInfo);
client_info->set_value(value); client_info->set_value(value);
} }
if (!device_id_.empty()) {
client_info = client_id->add_client_info();
client_info->set_name(kKeyDeviceId);
client_info->set_value(b2a_hex(device_id_));
} else if (crypto_session_->GetInternalDeviceUniqueId(&value)) {
client_info = client_id->add_client_info();
client_info->set_name(kKeyDeviceId);
client_info->set_value(value);
}
if (Properties::GetWVCdmVersion(&value)) { if (Properties::GetWVCdmVersion(&value)) {
client_info = client_id->add_client_info(); client_info = client_id->add_client_info();
client_info->set_name(kKeyWvCdmVersion); client_info->set_name(kKeyWvCdmVersion);