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

Fix oec session id in dynamic adpater

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

Pass the real oemcrypto session id from `pair.session` instead of
`session` for LoadEntitledContentKeys, since `session` can be
changed when L1 and L3 are running in parallel and `session` in
that case may not be the correct oemcrypto session id any more.

Bug: 279967915, 282180589
Test: wvts
Change-Id: Iad0ac5e505d3b38d220f1484d4cf5f8bc3b5337f
This commit is contained in:
Vicky Min
2023-05-12 21:15:31 +00:00
parent 13368f4076
commit 5026c50ebc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2177,7 +2177,7 @@ extern "C" OEMCryptoResult OEMCrypto_LoadEntitledContentKeys(
if (pair.fcn->version < 17) {
if (key_array == nullptr) {
return pair.fcn->LoadEntitledContentKeys_V16(
session, message, message_length, key_array_length, nullptr);
pair.session, message, message_length, key_array_length, nullptr);
}
std::vector<OEMCrypto_EntitledContentKeyObject_V16> key_array_v16(
key_array_length);