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

6299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dale
df6e4a468a [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours am: 3904f05bae -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I2eab3638548fbd99d5c6c07d21a4c74803d7ba76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 02:56:46 +00:00
Alex Dale
3904f05bae [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: Iacf2fde2cb6f2af8a71df98a733104a1056c06da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 02:11:46 +00:00
Alex Dale
f585abface [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I43fd01d3791ec2013f3228931b02e15a8e4f1869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 01:38:50 +00:00
Alex Dale
48ee2ad7d6 [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I453ca04a231b4e35ce10276eb8b3ca79a7d11e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 01:14:18 +00:00
Alex Dale
fc6dccb126 [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I45272ccad7ac19273fd76ca4997c48890af04bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 00:41:50 +00:00
Alex Dale
e099962d1f [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I25e190f73804d5e1487dd0224bba77b14c2f8e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 00:11:39 +00:00
Alex Dale
ae71d6ecd0 Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21778594

Change-Id: I52f0a38cf00d477c7b3937fc50fb881cad57573c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 23:40:17 +00:00
Alex Dale
fc365ed31e Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev 2023-03-31 23:16:37 +00:00
Presubmit Automerger Backend
fb319ba5dc [automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours am: dfe7c493de -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history

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

Change-Id: I6fac25c59bfcb90015d669eb825b190c1adc89e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:42:27 +00:00
Presubmit Automerger Backend
dfe7c493de [automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history

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

Change-Id: I8bbaea855ec14d368b5e9492c51fbdf49c759bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:06:43 +00:00
Presubmit Automerger Backend
263a86047c [automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history

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

Change-Id: Idf333bf485c83ecb1eb9a923701e181191f34c7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:13:59 +00:00
Presubmit Automerger Backend
20441c9b5b [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21892284

Change-Id: I6a0c0d45198d938ab60cf6faa241254613d5d861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:44:50 +00:00
Alex Dale
a54e3a924e Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 8ef7063d37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21900046

Change-Id: Ifd3597f01ea72172065c44cf467248b63372a3f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:02:20 +00:00
Alex Dale
8ef7063d37 Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21900046

Change-Id: I016f0cf66e4d90a32d087c0d492cb52bd3392e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 16:25:19 +00:00
Presubmit Automerger Backend
0aef7b0dd2 [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21892284

Bug: 258188673
Change-Id: Id1ee612fa3efa0d9c001dba00d76ed137d1f9594
Merged-In: If71a0e7a81f376cf28688a590b6cb9dcea699545
 2023-03-09 04:21:32 +00:00
Alex Dale
48bfaab32f Add mutex to CdmEngine for use of cert_provisioning_. 
[ Merge of http://go/wvgerrit/167529 ]
[ PoC http://ag/21900113 ]

Bug: 258188673
Test: sts-tradefed run sts-dynamic-develop -m StsHostTestCases \
    -t android.security.sts.Bug_258188673
Test: GtsMediaTestCases
Change-Id: If71a0e7a81f376cf28688a590b6cb9dcea699545
Merged-In: If71a0e7a81f376cf28688a590b6cb9dcea699545
 2023-03-08 20:19:44 -08:00
Alex Dale
491dfe7690 Add mutex to CdmEngine for use of cert_provisioning_. 
[ Merge of http://go/wvgerrit/167500 ]
[ PoC http://ag/21891126 ]

Bug: 258188673
Test: sts-tradefed run sts-dynamic-develop -m StsHostTestCases \
    -t android.security.sts.Bug_258188673
Test: GtsMediaTestCases
Change-Id: If71a0e7a81f376cf28688a590b6cb9dcea699545
Merged-In: If71a0e7a81f376cf28688a590b6cb9dcea699545
 2023-03-08 20:18:00 -08:00
Alex Dale
7129e9c7ec Add mutex to CdmEngine for use of cert_provisioning_. 
[ Merge of http://go/wvgerrit/167337 ]
[ PoC http://ag/21737796 ]

Bug: 258188673
Test: sts-tradefed run sts-dynamic-develop -m StsHostTestCases \
    -t android.security.sts.Bug_258188673
Test: GtsMediaTestCases
Change-Id: If71a0e7a81f376cf28688a590b6cb9dcea699545
Merged-In: If71a0e7a81f376cf28688a590b6cb9dcea699545
 2023-03-08 20:15:15 -08:00
Edwin Wong
2c4c12551f [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours am: c6aebda041 -s ours am: 4e4f786a0b -s ours am: ac68fb78b8 -s ours 
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

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

Change-Id: I12431a19cc095ed11530745250a35566154ae078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 04:41:11 +00:00
Edwin Wong
ac68fb78b8 [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours am: c6aebda041 -s ours am: 4e4f786a0b -s ours 
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

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

Change-Id: I53a7ede31d47b3cb2c636c4a398b296575fb7e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 04:05:13 +00:00
Edwin Wong
4e4f786a0b [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours am: c6aebda041 -s ours 
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

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

Change-Id: Ic60d2c5e9224661a6f746461aee846ee38388cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 03:24:00 +00:00
Edwin Wong
c6aebda041 [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours 
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

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

Change-Id: I57cd6e58382b33e77434c746724cef9f0cc84c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 02:49:29 +00:00
Edwin Wong
10c9a1f4e6 [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours 
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

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

Change-Id: I506d74ecdd7a9802feec0dc8124d0b9c764bf8c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 02:10:24 +00:00
Edwin Wong
b2203809a1 [automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours 
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history

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

Change-Id: I2b87d3b73337af1b55ed6245e02dd8a302665323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:51:32 +00:00
Presubmit Automerger Backend
0ede12c0c9 [automerger skipped] Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece am: fab129def9 -s ours am: 312566b17b -s ours am: c8c5914c43 -s ours 
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 4222daa047 is already in history

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

Change-Id: I752b28746094139f06c159469b1e43ff7e7cbe90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:18:25 +00:00
Edwin Wong
58513d031e Fixed race condition in closeSession am: 97bbc07174 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856

Change-Id: I06263def49d360c37b8103c137a3e2ce95cce733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:15:30 +00:00
Presubmit Automerger Backend
c8c5914c43 [automerger skipped] Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece am: fab129def9 -s ours am: 312566b17b -s ours 
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 4222daa047 is already in history

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

Change-Id: I1f6b0f7c24f455afa96e4d5d0c616a1666b9ca6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 00:42:53 +00:00
Edwin Wong
b0f8ed6518 Fixed race condition in closeSession am: 4222daa047 am: 0d063388de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20918774

Change-Id: Ieb1a7a2c8bd6d8d5d9488124cfb4998041232104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 00:25:12 +00:00
Presubmit Automerger Backend
312566b17b [automerger skipped] Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece am: fab129def9 -s ours 
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 4222daa047 is already in history

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

Change-Id: If75c6ac21293ac6efac21ef97e9dc178e16a97a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 00:21:43 +00:00
Edwin Wong
0d063388de Fixed race condition in closeSession am: 4222daa047 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20918774

Change-Id: I89dd8d6e85e00e22b06ac6d454411024874f3730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 23:49:11 +00:00
Presubmit Automerger Backend
fab129def9 Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282394

Change-Id: Id9437ef2c22f04ac37782214a41da52a9a8bf107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 23:48:11 +00:00
Presubmit Automerger Backend
08771dfece Fixed race condition in closeSession 2p: 08acec9c3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282393

Bug: 258189255
Change-Id: I2135835a745d28cc90980cc16405a1c28f64f35c
Merged-In: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3
 2023-03-06 18:12:05 +00:00
Edwin Wong
4222daa047 Fixed race condition in closeSession 
Merged from http://go/wvgerrit/165061
poc: http://go/ag/20978750

Fix race that corrupts mCryptoSessions std::map,
and race that occurs when CryptoSessions are used after free.

Test: poc
Test: atest MediaDrmParameterizedTests
Test: atest GtsMediaTestCases

Bug: 258189255
Change-Id: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3
Merged-In: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3
 2023-03-06 08:00:46 +00:00
Edwin Wong
97bbc07174 Fixed race condition in closeSession 
Merged from http://go/wvgerrit/165059
poc: http://go/ag/20978761

Fix race that corrupts mCryptoSessions std::map,
and race that occurs when CryptoSessions are used after free.

Test: poc
Test: atest MediaDrmParameterizedTests
Test: atest GtsMediaTestCases

Bug: 258189255
Change-Id: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3
Merged-In: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3
 2023-02-06 18:29:02 +00:00
Edwin Wong
08acec9c3a Fixed race condition in closeSession 
Merged from http://go/wvgerrit/165498
poc: http://go/ag/20978761

Fix race that corrupts mCryptoSessions std::map,
and race that occurs when CryptoSessions are used after free.

Test: poc
Test: atest MediaDrmParameterizedTests
Test: atest GtsMediaTestCases

Bug: 258189255
Change-Id: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3
Merged-In: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3
 2023-02-06 18:28:14 +00:00
Cong Lin
a4b942e176 [DO NOT MERGE] Update L3 Android T with new system id after key free fix 
Merge of https://widevine-internal-review.googlesource.com/c/cdm/+/165219

Original commit message:

Update Android L3 v17 with new system ID after key free fix

Android Arm L3 v17 Provisioning 3.0 2023       28923
Android Aarch64 L3 v17 Provisioning 3.0 2023   28924
Android X86 L3 v17 Provisioning 3.0 2023       28925
Android X86 64 L3 v17 Provisioning 3.0 2023    28926

Fix key double free issue in L3

Cherry-pick the fix from:
https://widevine-internal-review.googlesource.com/c/cdm/+/164885/
https://widevine-internal-review.googlesource.com/c/cdm/+/164958/

Then generated L3 on top of tm-widevine-release code base.
Re-used in tm-qpr-dev.

Original commit message:

During license loading if an error occurs, all the loaded keys will be
freed. Later at session termination, the previously freed keys get freed
again, which screwed up the key table.

This CL prevents the double free by checking if the key index is already
freed, and updates the freed index to be kKeyDataArrayCount.

Test: ran L3 unit tests
Test: verified GTS tests on arm32 device
Test: ran GTS media tests on Pixel4
Bug: 252434586
Bug: 267486513

Change-Id: I8ebc19260b37615efd77a533bd005f2b9485182a
 2023-02-03 18:48:47 +00:00
Robert Shih
5f3f0cf2af Merge "Add "version" to device info in prov4 upload tool" into tm-qpr-dev 2023-02-01 22:09:02 +00:00
Robert Shih
fdb47a37da Surface wv_factory_extraction_tool on ab 
[ Merge of go/wvgerrit/165108 ]

Bug: 234078142
Bug: 238831085
Test: adb shell wv_factory_extraction_tool csr
Change-Id: I3c689b5719a0a72410d6d8cb95c7c416e67931e5
 2023-01-25 15:58:04 +00:00
Rahul Frias
263d675e0e Add "version" to device info in prov4 upload tool 
[ Merge of http://go/wvgerrit/160457 ]

Bug: 255921326
Bug: 262198471
Test: WV android unit tests
Merged from https://widevine-internal-review.googlesource.com/160427

Change-Id: I3e2b7158c72fb4321b67053995f62483da934a18
Merged-In: I3e2b7158c72fb4321b67053995f62483da934a18
 2023-01-25 07:51:44 -08:00
TreeHugger Robot
65afc697d1 Merge "[DO NOT MERGE] Fix out of bounds buffer error in CreateCoreLicenseResponse()" into tm-dev am: 29aa1f3732 am: e19017df16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18687130

Change-Id: Iac9f6d50283755f09824171b53ca63496e7fb4c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 20:26:27 +00:00
Vicky Min
a132079383 [DO NOT MERGE] Fix out of bounds buffer error in CreateCoreLicenseResponse() am: 0890df5b16 am: 6ededbee26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18687130

Change-Id: I75d4644ea89dc7b041e3cdff07c0c4e1550ac0c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 20:26:25 +00:00
TreeHugger Robot
e19017df16 Merge "[DO NOT MERGE] Fix out of bounds buffer error in CreateCoreLicenseResponse()" into tm-dev am: 29aa1f3732 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18687130

Change-Id: I05fd119e8cd15008ed1d0632168348ecab6d986c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 19:26:25 +00:00
Vicky Min
6ededbee26 [DO NOT MERGE] Fix out of bounds buffer error in CreateCoreLicenseResponse() am: 0890df5b16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18687130

Change-Id: I1e8539f39b2b60562f0bb688ae91380ac2bc1e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 19:26:23 +00:00
TreeHugger Robot
29aa1f3732 Merge "[DO NOT MERGE] Fix out of bounds buffer error in CreateCoreLicenseResponse()" into tm-dev 2022-11-30 18:44:57 +00:00
Vicky Min
0890df5b16 [DO NOT MERGE] Fix out of bounds buffer error in CreateCoreLicenseResponse() 
In CreateCoreLicenseResponse(), there seems to be an out of bounds
potential error due to a missing check that the index used for
license_response.parsed_license->key_array is valid. Adding a check
for this here.

Bug: 217677571
Test: fuzz tests
Change-Id: I37f7228f87992ba5284c553d7b07ef97d6a66ab3
(cherry picked from commit eb711ea0ec)
 2022-11-30 17:27:23 +00:00
Vicky Min
8c71d5acd0 [DO NOT MERGE] Fix out of bounds buffer error in CreateCoreLicenseResponse() 
In CreateCoreLicenseResponse(), there seems to be an out of bounds
potential error due to a missing check that the index used for
license_response.parsed_license->key_array is valid. Adding a check
for this here.

Bug: 217677571
Test: fuzz tests
Change-Id: I37f7228f87992ba5284c553d7b07ef97d6a66ab3
(cherry picked from commit eb711ea0ec)
 2022-11-21 22:58:29 +00:00
Alex Dale
381f879ff7 Added mutex protection for session_property_set_. 
[ Merge of http://go/wvgerrit/154575 ]
[ Cherry-pick of http://ag/19498242 ]

There is a rare race condition experienced by some Android devices
where the a new client property set is being added while another is
being removed.  The C++ stl library does not provided thread
protection by default.

This CL adds a new mutex for the client property set map which prevents
multiple threads accessing the property sets concurrently.

Bug: 235238226
Test: GtsMediaTestCases on redfin
Change-Id: I32cf11bfb1332295ba1245071102ff0adc35259d
(cherry picked from commit aaa97a5d60)
(cherry picked from commit 6109ec6d66)
 2022-08-10 21:34:32 +00:00
Cong Lin
0698bcdefe Add unit test for clear KCB in LS SDK 16.4 response am: 8c4c238324 am: b363f54f9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18973819

Change-Id: Id78fb4d41f4d7a9b7e090dec2a1d00952e65ebb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:26:41 +00:00
Cong Lin
b363f54f9e Add unit test for clear KCB in LS SDK 16.4 response am: 8c4c238324 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18973819

Change-Id: Ibcdf7c29ad2392a2ee49873aacd5a8f831dbc251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-18 08:10:52 +00:00
Cong Lin
8c4c238324 Add unit test for clear KCB in LS SDK 16.4 response 
This is a merge from:
https://widevine-internal-review.googlesource.com/c/cdm/+/152897
and http://go/wvgerrit/153709

Adding a new OEMCrypto unit test will allow partners to correct a
problem earlier in their integration.

Verifies current oemcrypto implementation handles clear KCB in a
mocked 16.4 license response.

Unit test release date updated to 2022-06-17.

Test: run_x86_64_tests; opk_ta
Bug: 235870170
Bug: 234645065
Change-Id: I59fef2c25f5c007624447d4f46147d96adeddad9
 2022-06-17 15:02:09 -07:00