From 5026c50ebc081ee940d9ad70809fd880dc7bb5cd Mon Sep 17 00:00:00 2001 From: Vicky Min Date: Fri, 12 May 2023 21:15:31 +0000 Subject: [PATCH] Fix oec session id in dynamic adpater [ 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 --- libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp index e71ff28b..76b23896 100644 --- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp +++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp @@ -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 key_array_v16( key_array_length);