diff options
| author | New Tobin Paradigm <email@mattatobin.com> | 2019-11-10 15:35:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-10 15:35:44 -0500 |
| commit | b00601953bade944cd6df9cde6fcdd1f10d76feb (patch) | |
| tree | 71531773f24b5e2ed5f47d8958cfa7268a169bcf /media/psshparser/PsshParser.cpp | |
| parent | ccb7e2c646eebbd4742b072f6f02195659fb0d9d (diff) | |
| parent | c43b770a0399b5e03a6f6e4d2292e0408b186433 (diff) | |
| download | UXP-b00601953bade944cd6df9cde6fcdd1f10d76feb.tar UXP-b00601953bade944cd6df9cde6fcdd1f10d76feb.tar.gz UXP-b00601953bade944cd6df9cde6fcdd1f10d76feb.tar.lz UXP-b00601953bade944cd6df9cde6fcdd1f10d76feb.tar.xz UXP-b00601953bade944cd6df9cde6fcdd1f10d76feb.zip | |
Merge pull request #1277 from adeshkp/remove-adobe-primetime
Remove Adobe Primetime support
Diffstat (limited to 'media/psshparser/PsshParser.cpp')
| -rw-r--r-- | media/psshparser/PsshParser.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/media/psshparser/PsshParser.cpp b/media/psshparser/PsshParser.cpp index e5d0acd26..3f76a9b4a 100644 --- a/media/psshparser/PsshParser.cpp +++ b/media/psshparser/PsshParser.cpp @@ -108,11 +108,6 @@ const uint8_t kSystemID[] = { 0xac, 0xe3, 0x3c, 0x1e, 0x52, 0xe2, 0xfb, 0x4b }; -const uint8_t kPrimetimeID[] = { - 0xf2, 0x39, 0xe7, 0x69, 0xef, 0xa3, 0x48, 0x50, - 0x9c, 0x16, 0xa9, 0x03, 0xc6, 0x93, 0x2e, 0xfb -}; - bool ParseCENCInitData(const uint8_t* aInitData, uint32_t aInitDataSize, @@ -163,11 +158,6 @@ ParseCENCInitData(const uint8_t* aInitData, // Insufficient bytes to read SystemID. return false; } - if (!memcmp(kPrimetimeID, sid, sizeof(kSystemID))) { - // Allow legacy Primetime key system PSSH boxes, which - // don't conform to common encryption format. - return true; - } if (memcmp(kSystemID, sid, sizeof(kSystemID))) { // Ignore pssh boxes with wrong system ID. |