Edwin Wong
c528082645
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 1bd967f9a8 -s ours am: 7752248af7 -s ours am: c4600c0f7d -s ours am: 9d02914fd7 -s ours am: 2cdf1cf43e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13462544
Change-Id: I61065ffd0f33b3ece111de0f79472ae441538b66
2021-07-13 22:17:18 +00:00
Edwin Wong
1ef6701017
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 0558edfb31 -s ours am: ee4815ae80 -s ours am: 5e2f09293c -s ours am: 56860bc3dc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13459672
Change-Id: Ieda558f30bdd6c1efa4a8c1a7c7b760503ac64ed
2021-07-13 22:17:11 +00:00
Edwin Wong
2cdf1cf43e
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 1bd967f9a8 -s ours am: 7752248af7 -s ours am: c4600c0f7d -s ours am: 9d02914fd7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13462544
Change-Id: I4fbbd469369c9bc8e4eb7c6c06797b5680506ff8
2021-07-13 22:03:21 +00:00
Edwin Wong
56860bc3dc
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 0558edfb31 -s ours am: ee4815ae80 -s ours am: 5e2f09293c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13459672
Change-Id: I1cab6c1519ff1092ef54a7614a9a1b7a9aba8f01
2021-07-13 22:03:13 +00:00
Edwin Wong
9d02914fd7
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 1bd967f9a8 -s ours am: 7752248af7 -s ours am: c4600c0f7d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13462544
Change-Id: I688ac733506263c800ae5161e6218b0c954a111c
2021-07-13 21:44:59 +00:00
Edwin Wong
5e2f09293c
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 0558edfb31 -s ours am: ee4815ae80 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13459672
Change-Id: I552dc31fba2d6813e9bb7fa94f29e4a47618ff8c
2021-07-13 21:44:50 +00:00
Edwin Wong
c4600c0f7d
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 1bd967f9a8 -s ours am: 7752248af7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13462544
Change-Id: I80f78b99b7afc28ff06270f114fd3e7929c3a7c7
2021-07-13 21:28:38 +00:00
Edwin Wong
ee4815ae80
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 0558edfb31 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13459672
Change-Id: I9c8b8f3b2ca9d4891d89a5327f3fca39613989af
2021-07-13 21:28:31 +00:00
TreeHugger Robot
21b722330a
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into qt-dev am: 35b1be117e am: 1ea8bee2a1 -s ours am: 49462e3f0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I3e0484621df15a693a4bf868f1c229e5e04b9615
2021-06-09 23:27:08 +00:00
Cong Lin
f11c581b5b
[automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: f10acda463 am: ae49fad32b -s ours am: 6c16096c18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I445c5a1535c4ef78205093e396362dc587b5c754
2021-06-09 23:27:07 +00:00
TreeHugger Robot
49462e3f0d
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into qt-dev am: 35b1be117e am: 1ea8bee2a1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I78845333f380e606b7a05e34835b32b34df63df2
2021-06-09 23:15:16 +00:00
Cong Lin
6c16096c18
[automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: f10acda463 am: ae49fad32b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I1d4f60902b573d8f7ba76fc24406fc34db71a7d0
2021-06-09 23:14:27 +00:00
TreeHugger Robot
1ea8bee2a1
Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into qt-dev am: 35b1be117e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I6383c0dc15866b3ccad0b7b8a097fb4208f7d25d
2021-06-09 23:02:47 +00:00
Cong Lin
ae49fad32b
[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: f10acda463
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I4bcbdfd8fe317277901c52f3e8fbd1a420b2f2b8
2021-06-09 23:02:46 +00:00
TreeHugger Robot
35b1be117e
Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into qt-dev
2021-06-09 22:40:20 +00:00
TreeHugger Robot
c276a94eac
Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into rvc-dev am: d8851ceda3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629074
Change-Id: I32986d4d5aeef67ef43e99f34250c8b2bee16d63
2021-06-09 21:36:50 +00:00
Cong Lin
23fa208349
[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: e4cfcab140
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629074
Change-Id: Id73aea48ba5962021cbf6d200a55936b0ce824f7
2021-06-09 21:36:48 +00:00
TreeHugger Robot
d8851ceda3
Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into rvc-dev
2021-06-09 21:19:20 +00:00
Edwin Wong
b2ebc85c7e
[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: I7ae3b31b31288419a45b585ae5dae196d80bcdfb
2021-06-02 23:04:49 +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
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
Cong Lin
f10acda463
[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate
...
build
This is a merge of CL from widevine repo (obfuscated code only):
https://widevine-internal-review.googlesource.com/c/cdm/+/124885
The source code change that produced the obfucated code is also included
in the CL above but will not be merged to Android.
Original commit message from the fix above:
"This is a security improvement against an L3 exploit b/182584472.
The change is to store RSA private key in two parts instead of one,
and load it separately when the key is needed. This will make it
more difficult to find the entire RSA key.
This CL does the key loading part only. Key splitting is done
in Haystack in CL: cl/367515385"
New L3 system IDs included in the obfuscated code:
ID Description
22585 Android Q ARM L3 Field Provisioning 3.0
22586 Android Q ARM 64 L3 Field Provisioning 3.0
22587 Android Q x86 L3 Field Provisioning 3.0
22588 Android Q x86 64 L3 Field Provisioning 3.0
Bug: 182584472
Test: L3 unit tests
Test: GTS tests
run gts --module GtsMediaTestCases
run gts --module GtsExoPlayerTestCases
run gts --module GtsYouTubeTestCases
Change-Id: I834d3802690c2fda75cb3cfba186c41b6f5dc749
2021-05-18 15:24:57 -07:00
Cong Lin
e4cfcab140
[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate
...
build
This is a merge of CL from widevine repo (obfuscated code only):
https://widevine-internal-review.googlesource.com/c/cdm/+/124623
The source code change that produced the obfucated code is also included
in the CL above but will not be merged to Android.
Original commit message from the fix above:
"This is a security improvement against an L3 exploit b/182584472.
The change is to store RSA private key in two parts instead of one,
and load it separately when the key is needed. This will make it
more difficult to find the entire RSA key.
This CL does the key loading part only. Key splitting is done
in Haystack in CL: cl/367515385"
New L3 system IDs included in the obfuscated code:
22589 Android R ARM L3 Field Provisioning 3.0
22590 Android R ARM 64 L3 Field Provisioning 3.0
22591 Android R x86 L3 Field Provisioning 3.0
22592 Android R x86 64 L3 Field Provisioning 3.0
Bug: 182584472
Test: L3 unit tests
Test: GTS tests
run gts --module GtsMediaTestCases
run gts --module GtsExoPlayerTestCases
run gts --module GtsYouTubeTestCases
Change-Id: Ie61f39f50a70ab75547d75f89d9e38264f598bc8
2021-05-18 15:19:10 -07:00
Cong Lin
5d1b215cb7
[automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: I4ab4f7c5a15822960cd6f6c9d35e3292a726db40
2021-05-06 21:57:38 +00:00
Cong Lin
9fbcb7f1ba
[automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: I0ff731accf0aba941a7b0bffd237f21ec2e34891
2021-05-06 21:37:22 +00:00
Cong Lin
bc7c7a971d
[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069
Change-Id: Ia2d991d9513e17b98944256297e4caaabc96dd21
2021-05-06 21:21:40 +00:00
Cong Lin
b6b2367e9d
[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888
Change-Id: I53e5d60e293cbb0bb0072bd111aea2eb0547de57
2021-05-06 21:20:09 +00:00
Cong Lin
eb9a027f0a
[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev
...
Merge of [http://go/wvgerrit/123643 ]. Fix included:
http://go/wvgerrit/111603
Fix L3 block offset test and re-enable buffer overflow tests
http://go/wvgerrit/111784
Fix heap overflow test in L3 and OEMCrypto ref
Test: Ran L3 unit tests
Test: GTS tests https://android-build.googleplex.com/builds/forrest/run/L68100000872640856
Bug: 182584472
Change-Id: I237f52c715e691a52256bf01fa2422aeb34e45f3
2021-04-29 09:20:52 -07:00
Cong Lin
5ea6b86f79
[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix
...
rvc-dev
Merge of [http://go/wvgerrit/123644 ]. Fix included:
http://go/wvgerrit/111603
Fix L3 block offset test and re-enable buffer overflow tests
http://go/wvgerrit/111784
Fix heap overflow test in L3 and OEMCrypto ref
Test: Ran L3 unit tests
Test:
gts-tradefed run gts --module GtsMediaTestCases
gts-tradefed run gts --module GtsExoPlayerTestCases
Bug: 182584472
Change-Id: I70bda559c4b5158c3461dcdfee72a8953f31a942
2021-04-27 09:21:59 -07:00
Edwin Wong
f21b00847b
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846
Change-Id: Ic51d0acefb24d6265cb42adc5b7447e43c6bc681
2021-04-06 23:52:20 +00:00
Edwin Wong
c82acab577
[automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846
Change-Id: I9ffa3d2b096e62f92848ea103be82ecad48e6c08
2021-04-06 23:52:20 +00:00
Edwin Wong
e2f3b13c78
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846
Change-Id: I57e1cda75c201ab7c722d077be6aa94b22ebb617
2021-04-06 23:27:20 +00:00
Edwin Wong
a423695ea0
[automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846
Change-Id: Id2b6c02ef85c826ce7b74b0a95797082b0845f5a
2021-04-06 23:27:19 +00:00
Edwin Wong
389837df8c
Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846
Change-Id: I842a3b15c82a20085825bfda63ee023feed4a653
2021-04-06 23:06:29 +00:00
Edwin Wong
605ae2e217
[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846
Change-Id: I1cb45d35088d149f02b0bb6c408e5fee3d79c1db
2021-04-06 23:06:28 +00:00
Edwin Wong
aabd91204a
Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev
2021-04-06 22:27:14 +00:00
Edwin Wong
565bf1412a
Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847
Change-Id: I8395e9fe48ec01c35b2e0ad60a29d101f34af3ee
2021-04-06 21:53:49 +00:00
Edwin Wong
a74c0ec1f0
[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847
Change-Id: Ic310a2a04e47aea548ab74a6449c3f5835ee8049
2021-04-06 21:53:48 +00:00
Edwin Wong
a6cc3b79d2
Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev
2021-04-06 21:06:40 +00:00
Edwin Wong
6e7f17dc74
[automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: 92865466af -s ours
...
am skip reason: skip tag Change-Id Id3aece61d46d548c304782d4e1dc3a4747795c01 with SHA-1 f3ad627bcb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13617980
Change-Id: I7efab6993e597dcea31a8174290733ea3ed6b891
2021-04-05 22:01:23 +00:00
Edwin Wong
92865466af
Merge "Fix potential decrypt destPtr overflow." into rvc-dev
2021-04-05 21:22:06 +00:00
Edwin Wong
242713098f
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: f3ad627bcb am: 18065ce373 -s ours am: 49279fb200
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13462543
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I75d982f8a96803bfdf6ff9bd5807d802d80e04c6
2021-03-10 21:36:27 +00:00
Edwin Wong
49279fb200
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: f3ad627bcb am: 18065ce373 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13462543
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia1bce0f38c0ab07f1028e9ecd0f38b78b8de0d77
2021-03-10 20:56:24 +00:00
Edwin Wong
7752248af7
[automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 1bd967f9a8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13462544
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7ca4e8eeb271574476a23c21aac98540264a81a0
2021-03-10 20:12:37 +00:00
Edwin Wong
18065ce373
[RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: f3ad627bcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13462543
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36fb97d8855ef97a15c7d9d553efa874a2df7c84
2021-03-10 20:12:35 +00:00