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

Merge "Start rental clock when nonce-free offline license loaded" into rvc-d1-dev am: d24b3d4bd2 am: 84c1ff91ae

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12184965

Change-Id: I87351f7ef5ba59b076ab331f45732c5e462f6db1
This commit is contained in:
TreeHugger Robot
2020-07-21 10:50:45 +00:00
committed by Automerger Merge Worker
parent 6dbbc42d40 84c1ff91ae
commit e8cf28340a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,6 +286,15 @@ CdmResponseType CdmSession::RestoreOfflineSession(const CdmKeySetId& key_set_id,
key_response_, &provider_session_token) || key_response_, &provider_session_token) ||
usage_table_header_ == nullptr) { usage_table_header_ == nullptr) {
provider_session_token.clear(); provider_session_token.clear();
// TODO(b/161023174): remove this code in v17.
std::string fake_message("empty message");
std::string core_message;
std::string license_request_signature;
// Sign a fake message so that OEMCrypto will start the rental clock. The
// signature and generated core message are ignored.
CdmResponseType status = crypto_session_->PrepareAndSignLicenseRequest(
fake_message, &core_message, &license_request_signature);
if (status != NO_ERROR) return status;
} else if (!VerifyOfflineUsageEntry()) { } else if (!VerifyOfflineUsageEntry()) {
LOGE("License usage entry is invalid, cannot restore"); LOGE("License usage entry is invalid, cannot restore");
return LICENSE_USAGE_ENTRY_MISSING; return LICENSE_USAGE_ENTRY_MISSING;