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

Source release 16.3.0

Browse Source
This commit is contained in:
John W. Bruce
2020-07-24 14:30:03 -07:00
parent b830b1d1fb
commit 160df9f57a
74 changed files with 4632 additions and 2561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cdm/src/cdm.cpp
View File

@@ -102,6 +102,8 @@ class PropertySet final : public CdmClientPropertySet {
return empty_string_;
}
bool use_atsc_mode() const override { return false; }
private:
bool use_privacy_mode_;
std::string licensing_service_certificate_;
@@ -498,7 +500,7 @@ Cdm::Status CdmImpl::getProvisioningRequest(std::string* request) {
std::string ignored_base_url;
CdmResponseType result = cdm_engine_->GetProvisioningRequest(
kCertificateWidevine, empty_authority, provisioning_service_certificate_,
request, &ignored_base_url);
kLevelDefault, request, &ignored_base_url);
if (result == CERT_PROVISIONING_NONCE_GENERATION_ERROR) {
LOGE("Nonce quota exceeded");
return kResourceContention;
@@ -517,7 +519,7 @@ Cdm::Status CdmImpl::handleProvisioningResponse(const std::string& response) {
std::string ignored_wrapped_key;
CdmResponseType result = cdm_engine_->HandleProvisioningResponse(
response, &ignored_cert, &ignored_wrapped_key);
response, kLevelDefault, &ignored_cert, &ignored_wrapped_key);
if (result == SYSTEM_INVALIDATED_ERROR) {
LOGE("System invalidated");
return kSystemStateLost;

7
cdm/src/properties_ce.cpp
View File

@@ -149,9 +149,10 @@ bool Properties::GetFactoryKeyboxPath(std::string*) {
}
// static
bool Properties::GetOEMCryptoPath(std::string*) {
// Unused on CE devices.
return false;
bool Properties::GetOEMCryptoPath(std::string* path) {
if (path == nullptr) return false;
*path = "liboemcrypto.so";
return true;
}
// static