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

Check provisioning method in LoadProvisioningCast v18 dynamic adapter

Browse Source 
Test:GTEST_FILTER="*TestSignaturePKCS1*" ./jenkins/run_dynamic_oemcrypto_v18
Bug: 317900212

Change-Id: I9829cf59b13320d69fddadaaba0a013e241f0b16
This commit is contained in:
Matt Feddersen
2024-01-09 15:52:46 -08:00
committed by Robert Shih
parent fb380d9a0e
commit 4626fa18ce
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2529,9 +2529,19 @@ extern "C" OEMCryptoResult OEMCrypto_LoadProvisioningCast(
"AUTHENTICATION", provision_request, provision_request_length, 0x200); "AUTHENTICATION", provision_request, provision_request_length, 0x200);
const std::vector<uint8_t> enc_context = MakeContext( const std::vector<uint8_t> enc_context = MakeContext(
"ENCRYPTION", provision_request, provision_request_length, 0x80); "ENCRYPTION", provision_request, provision_request_length, 0x80);
const OEMCryptoResult result = pair.fcn->DeriveKeysFromSessionKey_V18( const OEMCrypto_ProvisioningMethod provisioning_method =
pair.session, derivation_key, derivation_key_length, mac_context.data(), pair.fcn->GetProvisioningMethod != nullptr
mac_context.size(), enc_context.data(), enc_context.size()); ? pair.fcn->GetProvisioningMethod()
: OEMCrypto_Keybox;
const OEMCryptoResult result =
(provisioning_method == OEMCrypto_BootCertificateChain)
? pair.fcn->DeriveKeysFromSessionKey_V18(
pair.session, derivation_key, derivation_key_length,
mac_context.data(), mac_context.size(), enc_context.data(),
enc_context.size())
: pair.fcn->GenerateDerivedKeys_V18(
pair.session, mac_context.data(), mac_context.size(),
enc_context.data(), enc_context.size());
if (result != OEMCrypto_SUCCESS) return result; if (result != OEMCrypto_SUCCESS) return result;
return pair.fcn->LoadProvisioning_V18( return pair.fcn->LoadProvisioning_V18(