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/175310 ]

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: I127ff37abf8b618dfbcb623f59bc999e58e7a028
This commit is contained in:
Vicky Min
2023-05-15 18:39:45 +00:00
parent 99b760c857
commit 74a9f80790
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2188,7 +2188,8 @@ extern "C" OEMCryptoResult OEMCrypto_LoadEntitledContentKeys(
key_array_v16[i].content_key_data = key_array[i].content_key_data;
}
return pair.fcn->LoadEntitledContentKeys_V16(
session, message, message_length, key_array_length, &key_array_v16[0]);
pair.session, message, message_length, key_array_length,
&key_array_v16[0]);
}
if (pair.fcn->LoadEntitledContentKeys == nullptr) {
return OEMCrypto_ERROR_NOT_IMPLEMENTED;