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

Check security-level during OpenSession.

Browse Source 
[ Merge of http://go/wvgerrit/140934 ]

It was assumed that L1 would be tried before first reverting to L3 when
performing OTA keybox provisioning.  If an app automatically defaults
to L3, it may get into a provisioning loop if the device wants to
perform keybox provisioning.

Now, OpenSession() will check the security level before suggesting OTA
keybox provisioning back to the app.

Bug: 187646550
Test: Manual tests on Android
Change-Id: Icd8f0915b0cc0d06c545b43bf8c1ccac793ce0b2
This commit is contained in:
Alex Dale
2021-12-09 18:52:24 -08:00
parent 40225200d4
commit 67d7e895e2
1 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,15 @@ CdmResponseType CdmEngine::OpenSession(const CdmKeySystem& key_system,
} }
LOGD("forced_session_id = %s", IdPtrToString(forced_session_id)); LOGD("forced_session_id = %s", IdPtrToString(forced_session_id));
} }
SecurityLevel requested_security_level = kLevelDefault;
if (property_set &&
property_set->security_level() == QUERY_VALUE_SECURITY_LEVEL_L3) {
requested_security_level = kLevel3;
}
bool forced_level3 = false; bool forced_level3 = false;
if (requested_security_level == kLevelDefault) {
if (OkpCheck()) { if (OkpCheck()) {
bool okp_provisioned = false; bool okp_provisioned = false;
bool fallback = false; bool fallback = false;
@@ -157,6 +165,7 @@ CdmResponseType CdmEngine::OpenSession(const CdmKeySystem& key_system,
// |okp_fallback_| would have been set previously if required. // |okp_fallback_| would have been set previously if required.
if (okp_fallback_) forced_level3 = true; if (okp_fallback_) forced_level3 = true;
} }
}
CloseExpiredReleaseSessions(); CloseExpiredReleaseSessions();