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

Report OEMCrypto Build Information in License Request am: 5ee5d00514

Browse Source 
am: 23c3bc8ebc

Change-Id: I1006614f9eadc97e9287816723ec179851bf2e67
This commit is contained in:
Fred Gylys-Colwell
2019-05-10 06:30:12 -07:00
committed by android-build-merger
parent c653a9dadc 23c3bc8ebc
commit 878e39c740
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libwvdrmengine/cdm/core/include/crypto_session.h
View File

@@ -177,6 +177,7 @@ class CryptoSession {
virtual bool GetBuildInformation(SecurityLevel security_level, virtual bool GetBuildInformation(SecurityLevel security_level,
std::string* info); std::string* info);
virtual bool GetBuildInformation(std::string* info);
virtual uint32_t IsDecryptHashSupported(SecurityLevel security_level); virtual uint32_t IsDecryptHashSupported(SecurityLevel security_level);

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

@@ -24,6 +24,8 @@ const std::string kKeyDeviceId = "device_id";
const std::string kKeyWvCdmVersion = "widevine_cdm_version"; const std::string kKeyWvCdmVersion = "widevine_cdm_version";
const std::string kKeyOemCryptoSecurityPatchLevel = const std::string kKeyOemCryptoSecurityPatchLevel =
"oem_crypto_security_patch_level"; "oem_crypto_security_patch_level";
const std::string kKeyOemCryptoBuildInformation =
"oem_crypto_build_information";
} // unnamed namespace } // unnamed namespace
namespace wvcdm { namespace wvcdm {
@@ -271,6 +273,12 @@ CdmResponseType ClientIdentification::Prepare(
client_capabilities->set_resource_rating_tier(tier); client_capabilities->set_resource_rating_tier(tier);
} }
} }
std::string info;
if (crypto_session_->GetBuildInformation(&info)) {
client_info = client_id->add_client_info();
client_info->set_name(kKeyOemCryptoBuildInformation);
client_info->set_value(info);
}
} }
return NO_ERROR; return NO_ERROR;

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

@@ -1880,6 +1880,15 @@ bool CryptoSession::GetResourceRatingTier(SecurityLevel security_level,
return true; return true;
} }
bool CryptoSession::GetBuildInformation(std::string* info) {
LOGV("CryptoSession::GetBuildInformation");
if (!open_) {
LOGW("CryptoSession::GetBuildInformation: session not open");
return false;
}
return GetBuildInformation(requested_security_level_, info);
}
bool CryptoSession::GetBuildInformation(SecurityLevel security_level, bool CryptoSession::GetBuildInformation(SecurityLevel security_level,
std::string* info) { std::string* info) {
LOGV("GetBuildInformation"); LOGV("GetBuildInformation");