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; }

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; }

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; }

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; }

17
libwvdrmengine/level3/x86/libl3oemcrypto.cpp
View File

@@ -68491,7 +68491,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
OEMCrypto_SESSION jcrkonan, const uint8_t *hhveywzp, size_t yxvwomnu,
bool jtytpqro, const uint8_t *wkzubynq, size_t nkpelpma,
OEMCrypto_DestBufferDesc *poqthycc,
const OEMCrypto_CENCEncryptPatternDesc *dfesckrs, uint8_t hcyarflg) {
const OEMCrypto_CENCEncryptPatternDesc_V15 *dfesckrs, uint8_t hcyarflg) {
{
ffweumqb(17) = hhveywzp == NULL;
if (!ffweumqb(17)) goto wopjiuji;
@@ -68514,7 +68514,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
wpdcpxqc:;
}
{
ffweumqb(20) = poqthycc->buffer.clear.max_length < yxvwomnu;
ffweumqb(20) = poqthycc->buffer.clear.address_length < yxvwomnu;
if (!ffweumqb(20)) goto qdgtguem;
{ return OEMCrypto_ERROR_SHORT_BUFFER; }
@@ -69313,11 +69313,12 @@ OEMCryptoResult wvoec3::Level3_LoadEntitledContentKeys(
gvhkuwen->emtzfubn();
return yknatbfo(36);
}
OEMCryptoResult wvoec3::Level3_CopyBuffer(OEMCrypto_SESSION rcllrvtu,
const uint8_t *gdwyybvl,
size_t fdvjchqd,
OEMCrypto_DestBufferDesc *romvkqbu,
uint8_t oaxlmvji) {
OEMCryptoResult wvoec3::Level3_CopyBuffer(
OEMCrypto_SESSION rcllrvtu,
const uint8_t *gdwyybvl,
size_t fdvjchqd,
const OEMCrypto_DestBufferDesc *romvkqbu,
uint8_t oaxlmvji) {
{
ffweumqb(0) = gdwyybvl == NULL;
if (!ffweumqb(0)) goto dgjozwzo;
@@ -69340,7 +69341,7 @@ OEMCryptoResult wvoec3::Level3_CopyBuffer(OEMCrypto_SESSION rcllrvtu,
ruwwnscq:;
}
{
ffweumqb(14) = romvkqbu->buffer.clear.max_length < fdvjchqd;
ffweumqb(14) = romvkqbu->buffer.clear.address_length < fdvjchqd;
if (!ffweumqb(14)) goto lgxdswag;
{ return OEMCrypto_ERROR_SHORT_BUFFER; }

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; }