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

@@ -64917,7 +64917,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
OEMCrypto_SESSION ddtjvbdq, const uint8_t *lvhsesuk, size_t lxfceryb,
bool uibjohfb, const uint8_t *wxuirukl, size_t ouvolqlc,
OEMCrypto_DestBufferDesc *ncsqbesl,
const OEMCrypto_CENCEncryptPatternDesc *yqrlrghj, uint8_t wcdnagse) {
const OEMCrypto_CENCEncryptPatternDesc_V15 *yqrlrghj, uint8_t wcdnagse) {
{
mundzuuz(16) = lvhsesuk == NULL;
if (!mundzuuz(16)) goto dmdzhbcq;
@@ -64940,7 +64940,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
hrqfgtgz:;
}
{
mundzuuz(19) = ncsqbesl->buffer.clear.max_length < lxfceryb;
mundzuuz(19) = ncsqbesl->buffer.clear.address_length < lxfceryb;
if (!mundzuuz(19)) goto qdbaawum;
{ return OEMCrypto_ERROR_SHORT_BUFFER; }
@@ -65739,11 +65739,12 @@ OEMCryptoResult wvoec3::Level3_LoadEntitledContentKeys(
dzaoanhf->rofponet();
return vvwoenhi(36);
}
OEMCryptoResult wvoec3::Level3_CopyBuffer(OEMCrypto_SESSION uzysqwty,
const uint8_t *bqkkehez,
size_t jukuudyt,
OEMCrypto_DestBufferDesc *nipfbcgm,
uint8_t zewgnbta) {
OEMCryptoResult wvoec3::Level3_CopyBuffer(
OEMCrypto_SESSION uzysqwty,
const uint8_t *bqkkehez,
size_t jukuudyt,
const OEMCrypto_DestBufferDesc *nipfbcgm,
uint8_t zewgnbta) {
{
mundzuuz(2) = bqkkehez == NULL;
if (!mundzuuz(2)) goto klnbkmjs;
@@ -65766,7 +65767,7 @@ OEMCryptoResult wvoec3::Level3_CopyBuffer(OEMCrypto_SESSION uzysqwty,
asmsppma:;
}
{
mundzuuz(21) = nipfbcgm->buffer.clear.max_length < jukuudyt;
mundzuuz(21) = nipfbcgm->buffer.clear.address_length < jukuudyt;
if (!mundzuuz(21)) goto oswphilv;
{ return OEMCrypto_ERROR_SHORT_BUFFER; }