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/mips64/libl3oemcrypto.cpp
View File

@@ -75480,7 +75480,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
OEMCrypto_SESSION hcjkesec, const uint8_t *njpolpvy, size_t djpojdil,
bool lndcajpr, const uint8_t *nhwsayer, size_t tqgdmzkm,
OEMCrypto_DestBufferDesc *ogqapwlf,
const OEMCrypto_CENCEncryptPatternDesc *yyynpdag, uint8_t ljvnrnlg) {
const OEMCrypto_CENCEncryptPatternDesc_V15 *yyynpdag, uint8_t ljvnrnlg) {
{
wxcfbvtr(17) = njpolpvy == NULL;
if (!wxcfbvtr(17)) goto lfifouhb;
@@ -75503,7 +75503,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
qvxdjgpm:;
}
{
wxcfbvtr(20) = ogqapwlf->buffer.clear.max_length < djpojdil;
wxcfbvtr(20) = ogqapwlf->buffer.clear.address_length < djpojdil;
if (!wxcfbvtr(20)) goto skqgtazd;
{ return OEMCrypto_ERROR_SHORT_BUFFER; }
@@ -76302,11 +76302,12 @@ OEMCryptoResult wvoec3::Level3_LoadEntitledContentKeys(
ukmpmhnq->mxlqakvi();
return tyvuoedf(36);
}
OEMCryptoResult wvoec3::Level3_CopyBuffer(OEMCrypto_SESSION upfmvyjb,
const uint8_t *wuwagiiq,
size_t tigggpmp,
OEMCrypto_DestBufferDesc *nuxgfgsn,
uint8_t xcdgdruw) {
OEMCryptoResult wvoec3::Level3_CopyBuffer(
OEMCrypto_SESSION upfmvyjb,
const uint8_t *wuwagiiq,
size_t tigggpmp,
const OEMCrypto_DestBufferDesc *nuxgfgsn,
uint8_t xcdgdruw) {
{
wxcfbvtr(18) = wuwagiiq == NULL;
if (!wxcfbvtr(18)) goto fvwugtua;
@@ -76329,7 +76330,7 @@ OEMCryptoResult wvoec3::Level3_CopyBuffer(OEMCrypto_SESSION upfmvyjb,
yyoawneb:;
}
{
wxcfbvtr(20) = nuxgfgsn->buffer.clear.max_length < tigggpmp;
wxcfbvtr(20) = nuxgfgsn->buffer.clear.address_length < tigggpmp;
if (!wxcfbvtr(20)) goto kbsudokb;
{ return OEMCrypto_ERROR_SHORT_BUFFER; }