widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,024 Commits 2 Branches 0 Tags
e0ac595bce8f6a65b577c968c7d7410759e79b13
Commit Graph

5024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edwin Wong
e0ac595bce [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours am: e75f7c63b5 am: 6f307fb311 -s ours am: 255f525c31 am: b616798ff7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: I80e96716db76a6f56a2d10c0d59083d1dbc860f6
 2021-06-02 23:44:34 +00:00
Edwin Wong
7be256c177 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: 0253cb580e -s ours am: ad1d8778e4 -s ours am: 62e23e0369 am: 85bbf55e91 -s ours am: a9fbf4de43 am: 38654a3fd7 -s ours am: 17c2aaabb4 am: 4527a65122 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496

Change-Id: I80de50c2c1459b682ec5118f0aaffbe2ac31a728
 2021-06-02 23:43:13 +00:00
Edwin Wong
773605718b [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours am: e75f7c63b5 am: 1a04368a9e -s ours am: 81ecbed63a am: 0726cebfad -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: Ibd49cb166d3d70c2c4b6345351a73a069984c2c0
 2021-06-02 23:42:45 +00:00
Edwin Wong
b616798ff7 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours am: e75f7c63b5 am: 6f307fb311 -s ours am: 255f525c31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: Ia48e0e631ff396b63d6fe526b51473e53fe57b26
 2021-06-02 23:27:30 +00:00
Edwin Wong
4527a65122 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: 0253cb580e -s ours am: ad1d8778e4 -s ours am: 62e23e0369 am: 85bbf55e91 -s ours am: a9fbf4de43 am: 38654a3fd7 -s ours am: 17c2aaabb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496

Change-Id: Icc58febeb32d5c6d50a5491f05606e72d4211bf8
 2021-06-02 23:26:15 +00:00
Edwin Wong
0726cebfad [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours am: e75f7c63b5 am: 1a04368a9e -s ours am: 81ecbed63a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: Id620972719e7df47cbde546c6a5788b390e9e9ff
 2021-06-02 23:25:43 +00:00
Edwin Wong
255f525c31 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours am: e75f7c63b5 am: 6f307fb311 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: Id300ffcd7ed8b9f37d4758ac802ae3427111c0b5
 2021-06-02 23:18:39 +00:00
Edwin Wong
17c2aaabb4 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: 0253cb580e -s ours am: ad1d8778e4 -s ours am: 62e23e0369 am: 85bbf55e91 -s ours am: a9fbf4de43 am: 38654a3fd7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496

Change-Id: I6782e4de8ddc7bf62d38790f7f9d24b64b02f63d
 2021-06-02 23:18:00 +00:00
Edwin Wong
81ecbed63a [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours am: e75f7c63b5 am: 1a04368a9e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: I63f905b093c4f151a026adc123ae66120483cb17
 2021-06-02 23:17:46 +00:00
Edwin Wong
6f307fb311 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours am: e75f7c63b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: Iac6fa4a12541c9e95c733186e4607d7c52973e1d
 2021-06-02 23:04:37 +00:00
Edwin Wong
38654a3fd7 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: 0253cb580e -s ours am: ad1d8778e4 -s ours am: 62e23e0369 am: 85bbf55e91 -s ours am: a9fbf4de43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496

Change-Id: I2c246da19bedc2440e777c8edddf2e5619d8fa74
 2021-06-02 23:03:37 +00:00
Edwin Wong
1a04368a9e [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours am: e75f7c63b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: Ida8db64dddf24fcfcc2ee83d035e6bd79ec240ea
 2021-06-02 23:03:23 +00:00
Edwin Wong
a9fbf4de43 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: 0253cb580e -s ours am: ad1d8778e4 -s ours am: 62e23e0369 am: 85bbf55e91 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496

Change-Id: Id5014667cb634351d19e8b4012d2db0c7f32d365
 2021-06-02 22:47:40 +00:00
Edwin Wong
e75f7c63b5 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: I983a6944369ff77e27c8d64fba5937dffc3554de
 2021-06-02 22:47:30 +00:00
Edwin Wong
85bbf55e91 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: 0253cb580e -s ours am: ad1d8778e4 -s ours am: 62e23e0369 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496

Change-Id: Ib88e34bacd5afb0ead74ba2a6526083366ea2822
 2021-06-02 22:25:40 +00:00
Edwin Wong
d74cf5a35f [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: I84bf657fa0999fda46a89c02260ce31323164b9e
 2021-06-02 22:25:26 +00:00
Edwin Wong
62e23e0369 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: 0253cb580e -s ours am: ad1d8778e4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496

Change-Id: If6f783b3af331eedd1b9f1a1a887990978c0c52e
 2021-06-02 22:04:34 +00:00
Edwin Wong
787f7e2158 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: I3fa1dadd8d1294eff10ba86b9a7adf49e08e3bca
 2021-06-02 22:04:24 +00:00
Alex Dale
94482a800f [automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (2/3 DRM Cert)" am: 06b637ed95 am: f5917c0704 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14605397

Change-Id: Ifdc02a7fe82b185d6f152ed1451f2413d73abb14
 2021-06-02 20:33:49 +00:00
Alex Dale
94ee23d5b6 [automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (2/3 DRM Cert)" am: 06b637ed95 -s ours am: c0caabd0d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14605397

Change-Id: Idb30bde9d75a8c72c9639db5577013214c0cdabd
 2021-06-02 20:31:45 +00:00
Alex Dale
c0caabd0d5 [automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (2/3 DRM Cert)" am: 06b637ed95 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14605397

Change-Id: Ib974b26b26b66590c6887a7760627e8b2b001840
 2021-06-02 20:17:09 +00:00
Alex Dale
f5917c0704 [DO NOT MERGE] Revert "Restructed reference root of trust (2/3 DRM Cert)" am: 06b637ed95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14605397

Change-Id: I4517d183e287da0b053dd7045c44139f74ded5dc
 2021-06-02 20:13:00 +00:00
Alex Dale
06b637ed95 [DO NOT MERGE] Revert "Restructed reference root of trust (2/3 DRM Cert)" 
This reverts commit f6f5099604.

Reason for revert: Feature missed deadline

Bug: 135283522
Change-Id: Ic86930ee3444c5a6aa1d78ae3a12a9030c29ef92
 2021-06-02 17:41:53 +00:00
Alex Dale
72ecc1cc46 Merge "New usage entries are moved lower after creation." into sc-dev am: 9c47be6aa8 am: 0c32615d69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14354899

Change-Id: I933da5bbfd9ae7fbb0d6f198206ee8627195e3ff
 2021-05-26 23:01:47 +00:00
Alex Dale
a48adbebee Merge "New usage entries are moved lower after creation." into sc-dev am: 9c47be6aa8 am: 7291bb5fc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14354899

Change-Id: Ida1f6ae19721d74bd420696e501cdfb1b0bd39fd
 2021-05-26 23:00:07 +00:00
Alex Dale
7291bb5fc5 Merge "New usage entries are moved lower after creation." into sc-dev am: 9c47be6aa8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14354899

Change-Id: I787b73bebb3be6efc37293540980878611e524f0
 2021-05-26 22:46:26 +00:00
Alex Dale
0c32615d69 Merge "New usage entries are moved lower after creation." into sc-dev am: 9c47be6aa8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14354899

Change-Id: If9e45c38e7408811abd7c78ee10536ddbeb71a54
 2021-05-26 22:45:33 +00:00
Alex Dale
9c47be6aa8 Merge "New usage entries are moved lower after creation." into sc-dev 2021-05-26 22:31:03 +00:00
TreeHugger Robot
c0e81feeb4 Merge "Sync L3 headers in sc-dev" into sc-dev am: 5af95f48ed am: 818d93da2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14669194

Change-Id: Ie7f916fd4d9be326e8d55d06aeadc5f580aec204
 2021-05-26 00:37:59 +00:00
TreeHugger Robot
1015e07fa6 Merge "Sync L3 headers in sc-dev" into sc-dev am: 5af95f48ed am: c03abd803e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14669194

Change-Id: Ia1a34bbf9345785b2a1de059170f01ea8967954e
 2021-05-26 00:36:11 +00:00
TreeHugger Robot
c03abd803e Merge "Sync L3 headers in sc-dev" into sc-dev am: 5af95f48ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14669194

Change-Id: I980597582e858da14aee587535fd310fbcb545bb
 2021-05-26 00:23:01 +00:00
TreeHugger Robot
818d93da2b Merge "Sync L3 headers in sc-dev" into sc-dev am: 5af95f48ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14669194

Change-Id: I29f7456d0afe12b2a4f578e290dde5b2c6643c0c
 2021-05-26 00:21:09 +00:00
TreeHugger Robot
5af95f48ed Merge "Sync L3 headers in sc-dev" into sc-dev 2021-05-26 00:02:54 +00:00
Fred Gylys-Colwell
479ef5ce8e Add fudge to duration tests am: 20833734e1 am: 0f39baa33c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14664668

Change-Id: Ibf53a3a65a7ee05700d7d4cad0909059fcd52816
 2021-05-25 22:40:04 +00:00
Fred Gylys-Colwell
05ae982332 Add fudge to duration tests am: 20833734e1 am: fd451af75b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14664668

Change-Id: I8966f72720a092701e0e15aeb19a75d7fcd82b68
 2021-05-25 22:38:14 +00:00
Fred Gylys-Colwell
fd451af75b Add fudge to duration tests am: 20833734e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14664668

Change-Id: I16f3d23c16e35dd01b6ff669b911f741b1397c68
 2021-05-25 22:23:58 +00:00
Fred Gylys-Colwell
0f39baa33c Add fudge to duration tests am: 20833734e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14664668

Change-Id: Icf3d6a82b7c537839dbee2d7dcb6145f8fc4b1b5
 2021-05-25 22:22:11 +00:00
Fred Gylys-Colwell
4ebcbda709 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev am: eaa1e6d4a0 am: 042a715e93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14486069

Change-Id: I7e004644cdc2e8f9f63675d11f48a2501eb12761
 2021-05-25 20:55:41 +00:00
Fred Gylys-Colwell
9a13a70164 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev am: eaa1e6d4a0 am: c6cfc6a296 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14486069

Change-Id: I0c7fa50afb40a5d2f4337dd9a1c229709556f3ad
 2021-05-25 20:53:54 +00:00
Fred Gylys-Colwell
c6cfc6a296 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev am: eaa1e6d4a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14486069

Change-Id: I9f470bb6e857fe9718a7989a33ba597401bbc8ec
 2021-05-25 20:38:06 +00:00
Fred Gylys-Colwell
042a715e93 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev am: eaa1e6d4a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14486069

Change-Id: Ie54dd7ffc4f354cb368fb23fbeb672feb67ad0f1
 2021-05-25 20:36:19 +00:00
Fred Gylys-Colwell
20833734e1 Add fudge to duration tests 
Merge from Widevine repo of http://go/wvgerrit/125046

Add some extra fudge to the termination time. This assumes that flaky
tests were caused by roundoff error.

Bug: 175741647
Change-Id: I9bcc86f9b9540e5985df647dd1b5c5d439556e2b
 2021-05-25 20:26:43 +00:00
Fred Gylys-Colwell
eaa1e6d4a0 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev 2021-05-25 20:19:49 +00:00
Alex Dale
e583f2213a Check for open session when initializing usage table. am: 023b06eded am: e0f31dc2b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14296026

Change-Id: I535702147bfadcc31e1ad5ca0e9e82cbe26fa5e6
 2021-05-24 21:47:47 +00:00
Alex Dale
f423cc7a4e Check for open session when initializing usage table. am: 023b06eded am: 51ec04bd43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14296026

Change-Id: I32551ce5190f240b1f2a0fe8a86688dbcd11c90e
 2021-05-24 21:46:38 +00:00
Alex Dale
51ec04bd43 Check for open session when initializing usage table. am: 023b06eded 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14296026

Change-Id: Id8abc3e56f0495edad72fffa20579887e1ae2045
 2021-05-24 21:32:39 +00:00
Alex Dale
e0f31dc2b5 Check for open session when initializing usage table. am: 023b06eded 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14296026

Change-Id: I4b0b46d585f99c492e30e608a0a18708fc40b042
 2021-05-24 21:30:44 +00:00
Alex Dale
884550333d New usage entries are moved lower after creation. 
[ Merge of http://go/wvgerrit/124004 ]

When the CDM creates a new usage entry for an offline or streaming
license, the new entry is immediately moved to the lowest available
entry index that has been marked as vacant (kStorageTypeUnknown).

When a license is released, its meta data that is managed by the CDM
is cleared; however, the usage entry's index is marked vacant, but it
is not released.  This creates wasted entry space in the usage table.
Unfortunately, defragging the table is computationally expensive and
may not be able to actually free up much space depending on when it
is performed.

For a typical user, this will likely not be an issue as the table
can get quite large compared to the number of licenses an app uses
and the table is partially cleaned on each boot.

GTS tests, however, have reached a point where they fill the usage
table before all tests are complete.  This is causing many unexpected
failures for devices.  Most of these tests release their license, but
the CDM never reaches a state where it can clean up the table.

By moving newly created entries to the lowest available index directly
after creating the entries, the table never needs to grow unless all
entries are in use.  Clean up is now almost never required.

Bug: 180639135
Bug: 180638990
Bug: 180638530
Test: MediaDrmTest#testWidevineApi28
Change-Id: I1a68d90d51384094298b27037778747ce7435374
 2021-05-24 12:51:44 -07:00
Cong Lin
d542cb91b5 Sync L3 headers in sc-dev 
Merge of these CLs from Widevine sc-dev:

modified:   libwvdrmengine/level3/include/clear_cache_function.h
  Add cache flush assembly for arm64 L3 to Android header | http://go/wvgerrit/124828
  Address compilation errors | http://go/wvgerrit/113083

modified:   libwvdrmengine/level3/include/level3_file_system_android.h
  Update Widevine Copyright header for android | http://go/wvgerrit/108084

Bug: 184866351
Test: Header changes for clearing cache is verified by one of the partners on their arm64 target;
https: //b.corp.google.com/issues/175432203#comment13

Change-Id: I0ac8f339f65d02abb3080020fbc715b9c0db85b2
 2021-05-20 14:56:20 -07:00
Alex Dale
023b06eded Check for open session when initializing usage table. 
[ Merge of http://go/wvgerrit/122984 ]

There was an issue encountered by some vendors with how the usage
table was initialized on some devices.  Previously, the CDM would
open an OEMCrypto session first, then initialize the usage table
(loading existing or creating a new one).  On these devices,
OEMCrypto_CreateUsageTableHeader() and OEMCrypto_LoadUsageTableHeader()
would fail if there were any open sessions.

This CL changes the initialization process to create/load the usage
table before opening an OEMCrypto session.

This change also lays the ground work for another usage table fix
to address GTS tests failure.

In the process, several of the functions for the usage table have been
split up into smaller chunks of code.  This required additional changes
to the usage table unittest to keep them up to date.

Bug: 169195093
Bug: 180639135
Test: Linux unittests and MediaDrmTest
Change-Id: Ifbf35f5d8cff5b89fea9b16edb998c84803f4fbe
 2021-05-19 10:39:51 -07:00