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

@@ -73231,7 +73231,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
OEMCrypto_SESSION bipyzplp, const uint8_t *lfkabxqr, size_t roxiuexd,
bool vtqxsjqc, const uint8_t *cpkfbvpg, size_t vqwhxqnf,
OEMCrypto_DestBufferDesc *zlzjtdeg,
const OEMCrypto_CENCEncryptPatternDesc *cmlkamtw, uint8_t ayhkgzyq) {
const OEMCrypto_CENCEncryptPatternDesc_V15 *cmlkamtw, uint8_t ayhkgzyq) {
{
wuoaphwn(17) = lfkabxqr == NULL;
if (!wuoaphwn(17)) goto ugxxsboy;
@@ -73254,7 +73254,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
iijwwbgh:;
}
{
wuoaphwn(20) = zlzjtdeg->buffer.clear.max_length < roxiuexd;
wuoaphwn(20) = zlzjtdeg->buffer.clear.address_length < roxiuexd;
if (!wuoaphwn(20)) goto mtqcubqj;
{ return OEMCrypto_ERROR_SHORT_BUFFER; }
@@ -74053,11 +74053,12 @@ OEMCryptoResult wvoec3::Level3_LoadEntitledContentKeys(
ktsakhyf->wrdqmhex();
return moekauvv(36);
}
OEMCryptoResult wvoec3::Level3_CopyBuffer(OEMCrypto_SESSION hfxzlvyc,
const uint8_t *jmtmhwxd,
size_t ykyhrrwo,
OEMCrypto_DestBufferDesc *hukbtckl,
uint8_t bknrnxwi) {
OEMCryptoResult wvoec3::Level3_CopyBuffer(
OEMCrypto_SESSION hfxzlvyc,
const uint8_t *jmtmhwxd,
size_t ykyhrrwo,
const OEMCrypto_DestBufferDesc *hukbtckl,
uint8_t bknrnxwi) {
{
wuoaphwn(4) = jmtmhwxd == NULL;
if (!wuoaphwn(4)) goto hwtqzvkk;
@@ -74080,7 +74081,7 @@ OEMCryptoResult wvoec3::Level3_CopyBuffer(OEMCrypto_SESSION hfxzlvyc,
xmhuqhto:;
}
{
wuoaphwn(24) = hukbtckl->buffer.clear.max_length < ykyhrrwo;
wuoaphwn(24) = hukbtckl->buffer.clear.address_length < ykyhrrwo;
if (!wuoaphwn(24)) goto adfcsnxe;
{ return OEMCrypto_ERROR_SHORT_BUFFER; }