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

OEMCrypto v16.1

Browse Source 
Merge of http://go/wvgerrit/93404

This CL updates the Widevine CDM to support OEMCrypto v16.1

Test: Tested in 16.2 CL
Bug: 141247171
Change-Id: I69bd993500f6fb63bf6010c8b0250dc7acc3d71b
This commit is contained in:
Fred Gylys-Colwell
2020-01-18 10:11:24 -08:00
parent 7e2619e379
commit 7665614b2e
132 changed files with 12331 additions and 9341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libwvdrmengine/level3/x86/libl3oemcrypto.cpp
View File

@@ -68491,7 +68491,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
OEMCrypto_SESSION jcrkonan, const uint8_t *hhveywzp, size_t yxvwomnu,
bool jtytpqro, const uint8_t *wkzubynq, size_t nkpelpma,
OEMCrypto_DestBufferDesc *poqthycc,
const OEMCrypto_CENCEncryptPatternDesc *dfesckrs, uint8_t hcyarflg) {
const OEMCrypto_CENCEncryptPatternDesc_V15 *dfesckrs, uint8_t hcyarflg) {
{
ffweumqb(17) = hhveywzp == NULL;
if (!ffweumqb(17)) goto wopjiuji;
@@ -68514,7 +68514,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
wpdcpxqc:;
}
{
ffweumqb(20) = poqthycc->buffer.clear.max_length < yxvwomnu;
ffweumqb(20) = poqthycc->buffer.clear.address_length < yxvwomnu;
if (!ffweumqb(20)) goto qdgtguem;
{ return OEMCrypto_ERROR_SHORT_BUFFER; }
@@ -69313,11 +69313,12 @@ OEMCryptoResult wvoec3::Level3_LoadEntitledContentKeys(
gvhkuwen->emtzfubn();
return yknatbfo(36);
}
OEMCryptoResult wvoec3::Level3_CopyBuffer(OEMCrypto_SESSION rcllrvtu,
const uint8_t *gdwyybvl,
size_t fdvjchqd,
OEMCrypto_DestBufferDesc *romvkqbu,
uint8_t oaxlmvji) {
OEMCryptoResult wvoec3::Level3_CopyBuffer(
OEMCrypto_SESSION rcllrvtu,
const uint8_t *gdwyybvl,
size_t fdvjchqd,
const OEMCrypto_DestBufferDesc *romvkqbu,
uint8_t oaxlmvji) {
{
ffweumqb(0) = gdwyybvl == NULL;
if (!ffweumqb(0)) goto dgjozwzo;
@@ -69340,7 +69341,7 @@ OEMCryptoResult wvoec3::Level3_CopyBuffer(OEMCrypto_SESSION rcllrvtu,
ruwwnscq:;
}
{
ffweumqb(14) = romvkqbu->buffer.clear.max_length < fdvjchqd;
ffweumqb(14) = romvkqbu->buffer.clear.address_length < fdvjchqd;
if (!ffweumqb(14)) goto lgxdswag;
{ return OEMCrypto_ERROR_SHORT_BUFFER; }