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

Merge "Check security-level during OpenSession." into sc-widevine-release

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-13 20:10:07 +00:00
committed by Android (Google) Code Review
parent fe5263942b 67d7e895e2
commit 0ec1993d39
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();