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

@@ -80057,7 +80057,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
OEMCrypto_SESSION ucnmyrep, const uint8_t *wikbwygf, size_t ujdfduzu,
bool hfwfltaq, const uint8_t *cdeliuxd, size_t tnmgokdp,
OEMCrypto_DestBufferDesc *ddynklqg,
const OEMCrypto_CENCEncryptPatternDesc *aeblrbva, uint8_t qdlbwshm) {
const OEMCrypto_CENCEncryptPatternDesc_V15 *aeblrbva, uint8_t qdlbwshm) {
{
npdoreif(18) = wikbwygf == NULL;
if (!npdoreif(18)) goto eogaqgsk;
@@ -80080,7 +80080,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
uxplkoth:;
}
{
npdoreif(21) = ddynklqg->buffer.clear.max_length < ujdfduzu;
npdoreif(21) = ddynklqg->buffer.clear.address_length < ujdfduzu;
if (!npdoreif(21)) goto uqlzzpyg;
{ return OEMCrypto_ERROR_SHORT_BUFFER; }
@@ -80879,11 +80879,12 @@ OEMCryptoResult wvoec3::Level3_LoadEntitledContentKeys(
gpkbzadf->eshllukq();
return bgpwwfll(36);
}
OEMCryptoResult wvoec3::Level3_CopyBuffer(OEMCrypto_SESSION mzggrxbc,
const uint8_t *bojucqbb,
size_t nkvgpnma,
OEMCrypto_DestBufferDesc *ammjkpfm,
uint8_t uoryadaw) {
OEMCryptoResult wvoec3::Level3_CopyBuffer(
OEMCrypto_SESSION mzggrxbc,
const uint8_t *bojucqbb,
size_t nkvgpnma,
const OEMCrypto_DestBufferDesc *ammjkpfm,
uint8_t uoryadaw) {
{
npdoreif(0) = bojucqbb == NULL;
if (!npdoreif(0)) goto wcdhsrne;
@@ -80906,7 +80907,7 @@ OEMCryptoResult wvoec3::Level3_CopyBuffer(OEMCrypto_SESSION mzggrxbc,
lpyolhwr:;
}
{
npdoreif(2) = ammjkpfm->buffer.clear.max_length < nkvgpnma;
npdoreif(2) = ammjkpfm->buffer.clear.address_length < nkvgpnma;
if (!npdoreif(2)) goto nfpjpsgd;
{ return OEMCrypto_ERROR_SHORT_BUFFER; }