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

@@ -73910,7 +73910,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
OEMCrypto_SESSION gzztxhua, const uint8_t *axlkrrjt, size_t awcdllnm,
bool qevbsltb, const uint8_t *fgennygy, size_t utvhnuzn,
OEMCrypto_DestBufferDesc *wltfdyuo,
const OEMCrypto_CENCEncryptPatternDesc *lgvdezvr, uint8_t ppwymned) {
const OEMCrypto_CENCEncryptPatternDesc_V15 *lgvdezvr, uint8_t ppwymned) {
{
xcolgugy(17) = axlkrrjt == NULL;
if (!xcolgugy(17)) goto pdafwmiy;
@@ -73933,7 +73933,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
hgyqhsew:;
}
{
xcolgugy(20) = wltfdyuo->buffer.clear.max_length < awcdllnm;
xcolgugy(20) = wltfdyuo->buffer.clear.address_length < awcdllnm;
if (!xcolgugy(20)) goto omrqtrlh;
{ return OEMCrypto_ERROR_SHORT_BUFFER; }
@@ -74732,11 +74732,12 @@ OEMCryptoResult wvoec3::Level3_LoadEntitledContentKeys(
lxzuelar->zuakffjp();
return ioejheit(36);
}
OEMCryptoResult wvoec3::Level3_CopyBuffer(OEMCrypto_SESSION twwgmjzm,
const uint8_t *xulijeqc,
size_t fjybderx,
OEMCrypto_DestBufferDesc *fgqcdcbc,
uint8_t ebyjfmye) {
OEMCryptoResult wvoec3::Level3_CopyBuffer(
OEMCrypto_SESSION twwgmjzm,
const uint8_t *xulijeqc,
size_t fjybderx,
const OEMCrypto_DestBufferDesc *fgqcdcbc,
uint8_t ebyjfmye) {
{
xcolgugy(18) = xulijeqc == NULL;
if (!xcolgugy(18)) goto eczushjv;
@@ -74759,7 +74760,7 @@ OEMCryptoResult wvoec3::Level3_CopyBuffer(OEMCrypto_SESSION twwgmjzm,
xbrocpwq:;
}
{
xcolgugy(12) = fgqcdcbc->buffer.clear.max_length < fjybderx;
xcolgugy(12) = fgqcdcbc->buffer.clear.address_length < fjybderx;
if (!xcolgugy(12)) goto ucfxarbp;
{ return OEMCrypto_ERROR_SHORT_BUFFER; }