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

Fall back to Level 3 if Keybox not found

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/139333

This is a workaround for devices that don't have a
keybox installed.

Bug: 206570220
Bug: 205896558
Bug: 205041153
Test: verified device falls back to L3 using TestOKP app
Change-Id: Id929b48ddaa7114a81765095aac536705f69e68c
(cherry picked from commit 0e55743d3a)
Merged-In:Id929b48ddaa7114a81765095aac536705f69e68c
This commit is contained in:
Fred Gylys-Colwell
2021-11-18 21:51:22 +00:00
committed by Android Build Coastguard Worker
parent 6b2b33be57
commit eb5d0f4e83
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
View File

@@ -756,6 +756,8 @@ class Adapter {
} }
} }
bool level1_valid() { return level1_valid_; }
void SetSandbox(const uint8_t* sandbox_id, size_t sandbox_id_length) { void SetSandbox(const uint8_t* sandbox_id, size_t sandbox_id_length) {
sandbox_id_.assign(sandbox_id, sandbox_id + sandbox_id_length); sandbox_id_.assign(sandbox_id, sandbox_id + sandbox_id_length);
} }
@@ -817,17 +819,21 @@ class Adapter {
level1_.BuildInformation()); level1_.BuildInformation());
} }
} else { } else {
level1_ = FunctionPointers(); // revert to all null pointers. FallBackToLevel3();
level1_valid_ = false;
// Note: if the function pointers are bad, we do not close the library and
// try again later. Instead, we permanently fall back to L3. This is a
// debatable choice: I decided the risk of a dlclose resource leak out
// weighed the possibility that the library would be fixed on the next
// load.
} }
return result; return result;
} }
void FallBackToLevel3() {
level1_ = FunctionPointers(); // revert to all null pointers.
level1_valid_ = false;
// Note: if the function pointers are bad, we do not close the library and
// try again later. Instead, we permanently fall back to L3. This is a
// debatable choice: I decided the risk of a dlclose resource leak out
// weighed the possibility that the library would be fixed on the next
// load.
}
bool LoadLevel1(wvcdm::metrics::OemCryptoDynamicAdapterMetrics* metrics) { bool LoadLevel1(wvcdm::metrics::OemCryptoDynamicAdapterMetrics* metrics) {
if (metrics == nullptr) { if (metrics == nullptr) {
return false; return false;
@@ -1282,6 +1288,7 @@ namespace wvcdm {
OEMCryptoResult OEMCrypto_InitializeAndCheckKeybox( OEMCryptoResult OEMCrypto_InitializeAndCheckKeybox(
bool* needs_keybox_provisioning) { bool* needs_keybox_provisioning) {
if (!needs_keybox_provisioning) return OEMCrypto_ERROR_UNKNOWN_FAILURE; if (!needs_keybox_provisioning) return OEMCrypto_ERROR_UNKNOWN_FAILURE;
*needs_keybox_provisioning = false;
if (!gAdapter) { if (!gAdapter) {
gAdapter.reset(new Adapter()); gAdapter.reset(new Adapter());
} }
@@ -1295,7 +1302,8 @@ OEMCryptoResult OEMCrypto_InitializeAndCheckKeybox(
if (ignore_count > 0) { if (ignore_count > 0) {
LOGD("Ignoring keybox status %d", static_cast<int>(keybox_status)); LOGD("Ignoring keybox status %d", static_cast<int>(keybox_status));
} }
*needs_keybox_provisioning = true; LOGD("L1 has no keybox. Falling back to L3.");
gAdapter->FallBackToLevel3();
return OEMCrypto_SUCCESS; return OEMCrypto_SUCCESS;
} }
return keybox_status; return keybox_status;