Report OEMCrypto Build Information in License Request

am: 5ee5d00514

Change-Id: I55c590b056d62d2b86002e0e880b42cf379da160
This commit is contained in:
Fred Gylys-Colwell
2019-05-10 01:49:56 -07:00
committed by android-build-merger
3 changed files with 18 additions and 0 deletions

View File

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

View File

@@ -24,6 +24,8 @@ const std::string kKeyDeviceId = "device_id";
const std::string kKeyWvCdmVersion = "widevine_cdm_version";
const std::string kKeyOemCryptoSecurityPatchLevel =
"oem_crypto_security_patch_level";
const std::string kKeyOemCryptoBuildInformation =
"oem_crypto_build_information";
} // unnamed namespace
namespace wvcdm {
@@ -272,6 +274,12 @@ CdmResponseType ClientIdentification::Prepare(
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;

View File

@@ -1880,6 +1880,15 @@ bool CryptoSession::GetResourceRatingTier(SecurityLevel security_level,
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,
std::string* info) {
LOGV("GetBuildInformation");