Commit Graph

5912 Commits

Author SHA1 Message Date
John W. Bruce
fe23bc40dc Update OEM Certificate scripts for Python 3
(This is a merge from the Widevine repo of http://go/wvgerrit/131084.)

This patch updates the OEM Certificate scripts to work in Python 3.
Previously, the scripts were nominally Python-2-only, though I actually
couldn't get them to run in either Python 2 or 3. The following changes
were necessary to make the scripts work in Python 3:

1) print() is now a function, not a keyword.
2) xrange() is now range().
3) StringIO is now part of the io package.
4) Python 3 no longer lets you mix strings and byte buffers
   indiscriminately. As such, the code needed to be made more crisp
   about when it is treating a file or other blob of data as binary vs.
   text. Many instances of StringIO had to become BytesIO, and several
   literals had to be turned into byte literals. Passphrase command-line
   parameters are now parsed to UTF-8 bytes during argument parsing.

Bug: 151736642
Test: oem_certificate_test.py
Change-Id: I8ea5d0fda2ea5a2c0289be7612be0b4e508c4abf
2021-09-28 10:08:40 -07:00
John W. Bruce
68187b9f02 Fix -Wshorten-64-to-32 errors in BoringSSL interactions
(This is a merge from the Widevine Repo of http://go/wvgerrit/134310.)

This patch fixes code that would trigger -Wshorten-64-to-32 by
implicitly narrowing a variable from 64 to 32 bits. Most of the time, it
does this by making the implicit conversion explicit. The cause of most
of these is that OpenSSL uses "int" for the length of things rather than
size_t. (While BoringSSL sometimes uses int and sometimes uses size_t.)

One exception is LogBoringSSLError(). We have a couple copies of this
function around, and they varied slightly. This patch brings them all
in-line, which conveniently also removes any code in them that would
deal with integer variables.

GetRandBytes() now takes a size_t and downcasts to BoringSSL's native
int internally, so that callers can pass in a size_t value as they would
expect.

There's also an interesting case in oec_session_util.cpp. Because
BoringSSL and OpenSSL disagree about the width of an error code, we have
to use the "auto" type for a temporary variable that holds an error, in
order to retain compatibility with both.

Bug: 194971260
Test: x86-64
Test: x86-64-openssl
Change-Id: I88bc62b4cda396f8a1eabd1a3cb7d1b03f47a33f
2021-09-27 18:17:04 -07:00
Jeff Tinker
1c4216fd28 Properly close plugins on SIGTERM and exit am: e28f98cc82 am: b847732abd am: 98301a2ef2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15888307

Change-Id: Id14090aed16bb37a2b00651e47e7a09ab0e4bbb1
2021-09-25 01:06:53 +00:00
Jeff Tinker
fb2d40ad92 Properly close plugins on SIGTERM and exit am: e28f98cc82 am: 4d9f094d32 am: ecf8dd86ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15888307

Change-Id: Ie0a643f3c2a3b5ded6f595af4faa09695afc23ef
2021-09-25 01:06:33 +00:00
Jeff Tinker
98301a2ef2 Properly close plugins on SIGTERM and exit am: e28f98cc82 am: b847732abd
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15888307

Change-Id: I7e5486a8aca5870fef736e28e9644dd6631a51e6
2021-09-25 00:57:08 +00:00
Jeff Tinker
ecf8dd86ea Properly close plugins on SIGTERM and exit am: e28f98cc82 am: 4d9f094d32
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15888307

Change-Id: I2cedc78aa83936d308e1395bab31b62640bb074f
2021-09-25 00:56:24 +00:00
Jeff Tinker
b847732abd Properly close plugins on SIGTERM and exit am: e28f98cc82
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15888307

Change-Id: I31c72dac86d0a8b68b0763cd9e215c36ad67f67a
2021-09-25 00:45:23 +00:00
Jeff Tinker
4d9f094d32 Properly close plugins on SIGTERM and exit am: e28f98cc82
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15888307

Change-Id: I1ec42bab8728d0845461ea038405c1b1156db2c1
2021-09-25 00:45:21 +00:00
Jeff Tinker
e28f98cc82 Properly close plugins on SIGTERM and exit
test: adb reboot while playing netflix and check logcat
  to make sure session are closed.

[ Merge of http://go/wvgerrit/133063 ]

bug: 193099676
Change-Id: I375695673b0c366e09fb857f5ae7a9cb6b946779
2021-09-22 09:22:03 -07:00
Cong Lin
f28696393a Merge "Re-generate L3 builds after security patch protecting RSA key" 2021-09-22 06:37:44 +00:00
[2~
39a44cce72 Re-generate L3 builds after security patch protecting RSA key
Merge from http://go/wvgerrit/133446

Commit message from Widevine repo:

"This change is to protect L3 RSA key from leaking in memory. After
this change, the RSA key, when loaded in memory, is XOR masked with
a key_mask."

The source CL that generates the new L3 libraries is here:
http://go/wvgerrit/130949

Test: L3 unit tests
Test: GTS test result https://android-build.googleplex.com/builds/abtd/run/L24400000950905884
Test: RSA performance test OEMCryptoLoadsCertificate.RSAPerformance
Test: Manual reboot tests on Pixel4
Bug: 183417993

Change-Id: I190e585ad03b8749e3487f9d3f0109be61a3c815
2021-09-13 09:32:07 -07:00
Vicky Min
9278c909d3 Sync fake clock for nonce tests
Because the fake clock is getting out of sync with the real clock
for the nonce flood tests, add a call to TestSleep::SyncFakeClock()
in Clock::GetCurrentTime() to force a sync.

Merged from http://go/wvgerrit/133223

Test: duration_use_case_test and nonce flood tests on bonito
Bug: 198329759
Change-Id: Idfd92c6cc57750a52477189461220c682b302082
2021-09-09 17:05:28 +00:00
Edwin
e083486fe4 Update cts drm tests with new package name.
Drm tests have moved to android.mediadrm.cts package.

As part of bug b/171226061 to separate DRM test
classes to enable better tracking of test failures
through the OWNERs files.

Also remove obsolete MediaPlayer2DrmTest to match
ag/15388921 once it is merged.

Test: atest CtsMediaDrmTestCases

Bug: 190625926
Change-Id: I906889b32ac6be2335757fc4e17ca4b695236b4a
2021-08-11 22:45:47 -07:00
David Liu
45f6a97f91 Add SetupWraith into allow list of invoke signRSA API, and remove priv_app from the allow list and modify the error message. am: 18be093969 am: 9763fb735e am: 2a44303572
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14523182

Change-Id: I40bc8259f248e9eea67df675a78a41064c3459c0
2021-07-14 22:42:58 +00:00
David Liu
15fbef6726 Add SetupWraith into allow list of invoke signRSA API, and remove priv_app from the allow list and modify the error message. am: 18be093969 am: d1f5a0c93b am: 388f3f55e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14523182

Change-Id: I43d551b46ddcddf078cfb7ad47cd33a7c98b5e21
2021-07-14 22:41:04 +00:00
David Liu
2a44303572 Add SetupWraith into allow list of invoke signRSA API, and remove priv_app from the allow list and modify the error message. am: 18be093969 am: 9763fb735e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14523182

Change-Id: I8d04e7124414ae75d6a5074f1bea1c0215ac262a
2021-07-14 22:25:38 +00:00
David Liu
388f3f55e2 Add SetupWraith into allow list of invoke signRSA API, and remove priv_app from the allow list and modify the error message. am: 18be093969 am: d1f5a0c93b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14523182

Change-Id: Ia5e91edd55343c11db4f37e9a26bb3cfda0c87e1
2021-07-14 22:25:15 +00:00
David Liu
348f3c4121 Add SetupWraith into allow list of invoke signRSA API, and remove priv_app from the allow list and modify the error message. am: 18be093969 am: efa57e9083
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14523182

Change-Id: I241cba408d87a5bf4bbac4f8d418c91ded82ed41
2021-07-14 22:20:27 +00:00
David Liu
d1f5a0c93b Add SetupWraith into allow list of invoke signRSA API, and remove priv_app from the allow list and modify the error message. am: 18be093969
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14523182

Change-Id: I51a738b11f0684ffaffceb21824cfb2cd06dc5e0
2021-07-14 22:11:09 +00:00
David Liu
9763fb735e Add SetupWraith into allow list of invoke signRSA API, and remove priv_app from the allow list and modify the error message. am: 18be093969
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14523182

Change-Id: I3318103aeb79d1a9c5bf64114720a27653c38919
2021-07-14 22:10:12 +00:00
David Liu
efa57e9083 Add SetupWraith into allow list of invoke signRSA API, and remove priv_app from the allow list and modify the error message. am: 18be093969
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14523182

Change-Id: I33b9a1bd7214b71398f7e82d7b0ed4b32837c89c
2021-07-14 22:10:02 +00:00
David Liu
18be093969 Add SetupWraith into allow list of invoke signRSA API, and remove priv_app from the allow list and modify the error message.
Doc: https://docs.google.com/document/d/19LFE0xWE6E-TfM8MQbxk2lCyNeW-nALBrGA6VX6Donc/edit?resourcekey=0-pe8SXOdScbmqtVQHRDubVw#

Test: Manual

Bug: b/175603696
Change-Id: Ibde963798d3fc5d4696b2d547f0ef3beab579d38
2021-07-14 18:11:04 +00:00
Cong Lin
4fb0683fcf [automerger skipped] [RESTRICT AUTOMERGE] Clear mmapped page before releasing and re-generate am: 48cc1e57b8 -s ours am: 973140383a -s ours am: 7435874685 -s ours am: 74a17c47f7 -s ours am: 022c58fcc1 -s ours am: abad8b076d -s ours am: 1801e7b59b -s ours am: 3081decb03 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98432f4c951f1ea5f15b6dd9972f0cda2cc82e73
2021-07-13 23:29:09 +00:00
Edwin Wong
ff1ebeb514 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 51371f481f -s ours am: 5da29fc65d -s ours am: 91e37cf24d -s ours am: bc7b258652 -s ours am: 928d86b5f9 -s ours am: 371d57e83d -s ours am: 7dc1e1a67a -s ours am: 34acb92d6f -s ours
am skip reason: subject contains skip directive

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

Change-Id: If20959117be8df386410d0c40b0d68cb162ae637
2021-07-13 23:29:05 +00:00
Cong Lin
4eebd33b8a [automerger skipped] [RESTRICT AUTOMERGE] Clear mmapped page before releasing and re-generate am: 48cc1e57b8 -s ours am: 973140383a -s ours am: 7435874685 -s ours am: 74a17c47f7 -s ours am: 022c58fcc1 -s ours am: abad8b076d -s ours am: 71eb16ed62 -s ours am: cd2f9bf341 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I51655feee70e9a0cdf08d384fa2ad4a11ca2b08c
2021-07-13 23:29:02 +00:00
Edwin Wong
1eb5c3d974 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 51371f481f -s ours am: 5da29fc65d -s ours am: 91e37cf24d -s ours am: bc7b258652 -s ours am: 928d86b5f9 -s ours am: 371d57e83d -s ours am: 5e3f2f3c0a -s ours am: ef16aa0ebb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6cad5f9a99bf4930b680b2884fd11f98b1904160
2021-07-13 23:28:54 +00:00
TreeHugger Robot
c587b991cf [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability."" into pi-dev am: 28016986f5 -s ours am: dc4566325a -s ours am: 304a9d6423 -s ours am: c7f016adf4 -s ours am: 1a5a91f9ca -s ours am: 438399ab07 -s ours am: 75a902bd97 -s ours am: 561e93812d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0a3066c16da25e143b950030093f1559eebd226
2021-07-13 23:28:45 +00:00
Edwin Wong
3dc13e8204 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into oc-mr1-dev am: 1e44ea96ef -s ours am: 0914ef7cd2 -s ours am: 46c2ba1705 -s ours am: e9f480cf2b -s ours am: 4f4a2af69c -s ours am: 4407f320e5 -s ours am: 3299b5417c -s ours am: 1e532b2b72 -s ours am: 8f506283cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifd42698081478f012fb7f7bfdf7844b08027165e
2021-07-13 23:28:30 +00:00
Automerger Merge Worker
26b49883ea Merge "[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability."" into pi-dev am: 28016986f5 -s ours am: dc4566325a -s ours am: 304a9d6423 -s ours am: c7f016adf4 -s ours am: 1a5a91f9ca -s ours am: 438399ab07 -s ours am: 85d7d611e9 -s ours" into sc-v2-dev-plus-aosp am: dd31a2a29f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31c13c3c43b51f2d98299d369d1503a38554025b
2021-07-13 23:28:23 +00:00
Edwin Wong
8ed1fedf3f [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into pi-dev am: 9452ee5a55 -s ours am: 18fe74f4d9 -s ours am: de20725d1a -s ours am: 794a05c0ec -s ours am: 8799db1d69 -s ours am: df1f987847 -s ours am: 5440f2db97 -s ours am: 168702d12d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib0cbf09f8cfb56c79b797551b8b12f35582f26c5
2021-07-13 23:28:11 +00:00
Edwin Wong
7453d49136 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into oc-mr1-dev am: 1e44ea96ef -s ours am: 0914ef7cd2 -s ours am: 46c2ba1705 -s ours am: e9f480cf2b -s ours am: 4f4a2af69c -s ours am: 4407f320e5 -s ours am: 3299b5417c -s ours am: 366d842ad0 -s ours am: 4e85840040 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia8227c18975d20f991e2511e878bf6d08fb4426b
2021-07-13 23:27:59 +00:00
Edwin Wong
dfc2154731 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into pi-dev am: 9452ee5a55 -s ours am: 18fe74f4d9 -s ours am: de20725d1a -s ours am: 794a05c0ec -s ours am: 8799db1d69 -s ours am: df1f987847 -s ours am: 3099310381 -s ours am: 8ae62711e5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83d50724fd8abbe11b03c5162fa46d7580ef6954
2021-07-13 23:27:44 +00:00
Edwin Wong
d22ca07459 [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: c528082645 -s ours am: 1cb7b8fee7 -s ours am: b5931dd714 -s ours am: 058663d651 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I12b5e98aef3085c4ac6c999986d5708743da028b
2021-07-13 23:27:10 +00:00
Edwin Wong
0dcfdff59f [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: 1ef6701017 -s ours am: f78ceb89b9 -s ours am: 960461b917 -s ours am: f4e2be4afb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie80f0a40ff1cca6c3174df6f875a661d8a526e44
2021-07-13 23:24:24 +00:00
Edwin Wong
e47f8b10f4 [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: c528082645 -s ours am: 1cb7b8fee7 -s ours am: 3aae25b259 -s ours am: 0f68c7becb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id3ddf912f6d77b9a7cec5b1a96c4e51aecb96fe3
2021-07-13 23:23:52 +00:00
Edwin Wong
ab2e65fd9a [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: 1ef6701017 -s ours am: f78ceb89b9 -s ours am: 1c0e337803 -s ours am: ec8b0f7ce6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If833eab76339bbbf27cb0b75be240bc8da2018e2
2021-07-13 23:23:38 +00:00
Cong Lin
da5e7f2f47 [automerger skipped] [RESTRICT AUTOMERGE] Clear mmapped page before releasing and re-generate am: 48cc1e57b8 -s ours am: 973140383a -s ours am: 7435874685 -s ours am: 74a17c47f7 -s ours am: cb5284d36c -s ours am: a49cfcb410 -s ours am: ff836df5f6 -s ours am: 1cf37b90ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie776236bf89bee105f2e1e00867de11bb9c9f30b
2021-07-13 23:23:03 +00:00
Cong Lin
86c8e8f152 [automerger skipped] [RESTRICT AUTOMERGE] Clear mmapped page before releasing and re-generate am: 48cc1e57b8 -s ours am: 973140383a -s ours am: 7435874685 -s ours am: 74a17c47f7 -s ours am: cb5284d36c -s ours am: a49cfcb410 -s ours am: 9a667504bf -s ours am: aee7de9daa -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iea0d821869244b1ca4e6bd6ad24f10566176ef45
2021-07-13 23:22:59 +00:00
Edwin Wong
6b0d6895c6 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 51371f481f -s ours am: 5da29fc65d -s ours am: 91e37cf24d -s ours am: bc7b258652 -s ours am: 1ed274e277 -s ours am: 87a2619504 -s ours am: 9e64fe3525 -s ours am: bc6abb031c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icd47cf345bb6d140bf0d12bf14848326e0a119f6
2021-07-13 23:22:47 +00:00
Edwin Wong
57ecab58f9 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 51371f481f -s ours am: 5da29fc65d -s ours am: 91e37cf24d -s ours am: bc7b258652 -s ours am: 1ed274e277 -s ours am: 87a2619504 -s ours am: 9f8589bd8e -s ours am: 8f3e217a12 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I57a1359534c6ac6a50865a3d38558236ae3132f9
2021-07-13 23:22:34 +00:00
TreeHugger Robot
7b8abe3983 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability."" into pi-dev am: 28016986f5 -s ours am: dc4566325a -s ours am: 304a9d6423 -s ours am: c7f016adf4 -s ours am: aeecbd368f -s ours am: 1740627ebe -s ours am: c349557133 -s ours am: 8240b45ba5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib1847c95217e76559ec8aede56d8f16759d2d70d
2021-07-13 23:22:24 +00:00
TreeHugger Robot
52ccb96845 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability."" into pi-dev am: 28016986f5 -s ours am: dc4566325a -s ours am: 304a9d6423 -s ours am: c7f016adf4 -s ours am: aeecbd368f -s ours am: 1740627ebe -s ours am: 775c967001 -s ours am: e12f41497f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2961ef02b8d0e41e3786775d124ae40acc45180e
2021-07-13 23:22:12 +00:00
Edwin Wong
90bbf154dc [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into oc-mr1-dev am: 1e44ea96ef -s ours am: 0914ef7cd2 -s ours am: 46c2ba1705 -s ours am: e9f480cf2b -s ours am: 4f4a2af69c -s ours am: 940acd72f9 -s ours am: ffb41d8081 -s ours am: 32a6602df4 -s ours am: 0587211ffa -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idaaafd2c3f5d656f749938a47fefbd995e4a8501
2021-07-13 23:22:02 +00:00
Edwin Wong
7c8a9c9e30 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into oc-mr1-dev am: 1e44ea96ef -s ours am: 0914ef7cd2 -s ours am: 46c2ba1705 -s ours am: e9f480cf2b -s ours am: 4f4a2af69c -s ours am: 940acd72f9 -s ours am: ffb41d8081 -s ours am: 24056340b2 -s ours am: f868ef6afe -s ours
am skip reason: subject contains skip directive

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

Change-Id: I33a6fe71b4c88ee5ce351d2b09b1ffead2ee6ef0
2021-07-13 23:21:45 +00:00
Edwin Wong
955bc12fda [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into pi-dev am: 9452ee5a55 -s ours am: 18fe74f4d9 -s ours am: de20725d1a -s ours am: 794a05c0ec -s ours am: bc5d15d4f3 -s ours am: 2cb2a3ef00 -s ours am: 10e3a99933 -s ours am: be58140c55 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idbd7c0984c8f0b8b536eae18c9e5775c0ef50f5c
2021-07-13 23:21:34 +00:00
Edwin Wong
edb4cb1399 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into pi-dev am: 9452ee5a55 -s ours am: 18fe74f4d9 -s ours am: de20725d1a -s ours am: 794a05c0ec -s ours am: bc5d15d4f3 -s ours am: 2cb2a3ef00 -s ours am: 7dde61e17e -s ours am: 448cc265e1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ec585776589aa55d1a9485e0db210e10cb9f090
2021-07-13 23:21:05 +00:00
Edwin Wong
56e459dbeb [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: bd4018a652 -s ours am: 83ba088584 -s ours am: 2c411464d7 -s ours am: 6a9634c118 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia7e408731593f197e5f498b794b6cbef168696a0
2021-07-13 23:20:20 +00:00
Edwin Wong
6e1b4a4fe3 [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: 34196e65a2 -s ours am: f54bc3c1aa -s ours am: 2e408117e3 -s ours am: 34185b1885 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7ed86859c237db506a66525b3b0c1a0f04cd060
2021-07-13 23:20:06 +00:00
Edwin Wong
073cd64deb [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: bd4018a652 -s ours am: 83ba088584 -s ours am: 6ff7f938fd -s ours am: 34f60b0011 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f5987e34fbb94062983a07cbf0226e201d364c1
2021-07-13 23:19:14 +00:00
Edwin Wong
0d9371276a [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: 34196e65a2 -s ours am: f54bc3c1aa -s ours am: 4ff2690813 -s ours am: 7a02bdf3e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I273c227d7c2ed3a7966b9bd3f0289fcd80d80960
2021-07-13 23:18:59 +00:00