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

6944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dale
4880b0cd65 [automerger skipped] Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 18dce87499 -s ours am: e827a6da8a -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 6e5ab021d8 is already in history

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

Change-Id: I562325aecd5805b18e8c65e411dfb98b7c3eb698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 01:04:34 +00:00
Alex Dale
7cd71fb983 Merge "Android CDM: Restored secure stop tests." into udc-dev am: 9d82b224eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294726

Change-Id: Ia11d9365598a223e099155ce468324dadb4f3b0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 00:49:19 +00:00
Rahul Frias
2489d1e68e Merge changes I44095261,I30829ad7 into udc-dev am: 98543b50cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22239717

Change-Id: Ia76469df5e8a50d6fc772603526553150c5806d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:17:12 +00:00
Alex Dale
e827a6da8a [automerger skipped] Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 18dce87499 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 6e5ab021d8 is already in history

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

Change-Id: If4f49c6361697b16312f5be4f1ca2988a9674421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:17:46 +00:00
Alex Dale
18dce87499 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: I9653a720ab006450409ba021c695c9d74947ca61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 16:24:37 +00:00
Alex Dale
9d82b224eb Merge "Android CDM: Restored secure stop tests." into udc-dev 2023-03-30 06:11:58 +00:00
Rahul Frias
98543b50cb Merge changes I44095261,I30829ad7 into udc-dev 
* changes:
  Dump BCC on failed provisioning request
  Refresh corpus for oemcrypto fuzz tests with modified format
 2023-03-29 23:34:40 +00:00
Alex Dale
e928670c85 Android CDM: Restored secure stop tests. 
[ Semi-revert of http://ag/20183443 ]
[ Merge of http://go/wvgerrit/168898 ]

These tests were removed from Android last quarter; however, they
now need to be restored.  These tests will be removed in Android V.

To help with ambiguity around where the CDM is operating on a single
or set of usage info messages, the variables have been renamed to
propery indicate plurality.

Bug: 263319220
Test: cdm_extended_duration_test
Test: request_license_test
Test: libwvdrmdrmplugin_hal_test
Change-Id: I38b16dd5811069fafaeab5ffc19d0f8a8095f0cf
 2023-03-28 21:26:06 -07:00
Kyle Zhang
430b87c0b0 Merge "Integrate apex version info to Widevine CDM property" into udc-dev am: b5ec1ae108 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22105407

Change-Id: Id52395bdd3c597fe4dfc50b4fa21e001607b82a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 23:02:51 +00:00
Kyle Zhang
b5ec1ae108 Merge "Integrate apex version info to Widevine CDM property" into udc-dev 2023-03-28 22:31:45 +00:00
Rahul Frias
b3a57e7375 Dump BCC on failed provisioning request 
[ Merge of http://go/wvgerrit/168357  and http://go/wvgerrit/168177 ]

When we get an error from the provisioning server while
running a test, we should log extra provisioning
information.

Bug: 273990016
Test: GtsMediaTestCases
Change-Id: I44095261e07ae079c632873f254d8e6879bab8c3
 2023-03-28 20:28:57 +00:00
Fred Gylys-Colwell
e51bb19296 Refresh corpus for oemcrypto fuzz tests with modified format 
Merge from Widevine repo of http://go/wvgerrit/165958
and  http://go/wvgerrit/165862

Bug: 275264353
Test: test only code

Change-Id: I30829ad72d58e2233f4cc9963d17cb07314b7720
 2023-03-28 20:28:57 +00:00
Alex Dale
0d4909b80d Merge "Fixed test and log formatting for CdmResponseType." into udc-dev am: 5ed89d16e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22141214

Change-Id: Ic2533872fdcfe0cdb33a59adf2fd49c225cd8c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 19:44:15 +00:00
Alex Dale
5ed89d16e2 Merge "Fixed test and log formatting for CdmResponseType." into udc-dev 2023-03-28 19:21:20 +00:00
Cong Lin
be32be97e9 Merge "Fix CSR in wv factory upload tool" into udc-dev am: b7280404bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294062

Change-Id: Ice7e07b02004a428c77485187d1882a8c325431d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 18:28:26 +00:00
Kyle Zhang
ce1fb4f089 Integrate apex version info to Widevine CDM property 
Bug: 272587114
Test: dumpsys android.hardware.drm.IDrmFactory/widevine -p
Change-Id: Ica99867511391c252b67f40162665380bd2d8740
 2023-03-28 18:14:02 +00:00
Cong Lin
b7280404bd Merge "Fix CSR in wv factory upload tool" into udc-dev 2023-03-28 18:02:05 +00:00
Jooyung Han
25833a3cf6 Set min_sdk_version for the Widevine APEX am: a4de7eb9b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22307320

Change-Id: Ie1219f46b4e419d777fa554f28de24916722c22d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 17:39:21 +00:00
Jooyung Han
a4de7eb9b5 Set min_sdk_version for the Widevine APEX 
also remove `use_vndk_as_stable: true` to remove dependency to VNDK
libs.

Bug: 251299786
Test: build WV APEX with V and install it on U device
Change-Id: Ie7f7f9b699119478d4b33f95ab9e6ba7f459346c
 2023-03-28 06:57:46 +00:00
Jooyung Han
64845e114e Link dependencies statically am: 81171a7e75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22302466

Change-Id: Ie884238ed1477e35e3b80e8fd25253bdc21bf81d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 05:53:17 +00:00
Jooyung Han
81171a7e75 Link dependencies statically 
This reduces the APEX size from 6754304 to 4378624.

Bug: 274818387
Test: m com.google.android.widevine
Test: adb install $OUT/vendor/apex/com.google.android.widevine.apex
Test: adb reboot
Change-Id: Ib31291e5ee35297b9d85120f5eca118ebf10f55f
(cherry picked from commit 78f0b81ece)
 2023-03-27 23:43:17 +00:00
Cong Lin
6db1ae5167 Fix CSR in wv factory upload tool 
Merge of https://widevine-internal-review.googlesource.com/c/cdm/+/169024

The CSR extracted by WV internal BCC extraction tool is missing a
field "unverifiedDeviceInfo". This is required by the RKP's device
uploading tool for the CSR to be accepted.

Also updated the size of the randomly generated challenge from 32 bytes
to 64 bytes, same as what is used by rpk_factory_extraction_tool.

Test: extracted CSR v2 and v3 and dry run uploading
Bug: 275075496
Change-Id: Icc776f810c81ac6589d82935950167925f95f906
 2023-03-27 21:10:03 +00:00
Alex Dale
52bd76e0e2 Fixed test and log formatting for CdmResponseType. 
[ Merge of http://go/wvgerrit/168397 ]

When CdmResponseType (enum) was transformed to CdmResponseType
(struct), the test printers where not updated to print the result
of failed comparisons.  In addition, several logs statements were
updated haphazardly, leaving inconsistencies and potential
compiler-specific behavior.

This CL replaces CdmResponseType std::string operator with a ToString()
method.  This is to make it consistent with Google's C++ style guide
on conversion operators vs methods.  The string conversion function is
now defined in wv_cdm_types.cpp instead of inline in the header file.

The PrintTo function has been implemented along with the other CDM
test printers in test_printers.cpp.

Bug: 273989359
Test: run_x86_64_tests
Test: MediaDrmParameterizedTests on redfin
Test: Forrest drm_compliance
Change-Id: Ibfaa17029046b75b1c8c278f7bd7e04a24379848
 2023-03-27 11:21:45 -07:00
Fred Gylys-Colwell
fc44dc5f8f Remove some names am: bfa8d39a63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22200007

Change-Id: I01045b5af37d598c67e71426ac4ffdc6047da8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-27 04:34:51 +00:00
Fred Gylys-Colwell
bfa8d39a63 Remove some names 
Merge from Widevine repo of http://go/wvgerrit/168657

Some people who have left were still in OWNERS files and TODOs.

Bug: 274772704
Test: comments only
Change-Id: I583da815586e5ca52316b2e238d1c1bb3a5e919a
 2023-03-27 02:45:01 +00:00
Fred Gylys-Colwell
69d7e27b72 Fix logging error type am: ab8c06906a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21649733

Change-Id: I6103161495f1b04f5e07c4c70ad96199ab659fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 21:46:11 +00:00
Fred Gylys-Colwell
ab8c06906a Fix logging error type 
Merge from Widevine repo of http://go/wvgerrit/166942

The error type is no longer an enumeration.

Bug: 271146682

Change-Id: I64f60fde94d1e8a586128a59f1455041622444b6
 2023-03-23 16:23:43 +00:00
Alex Dale
ce18c3222d Avoid null dereference with empty BCC strings. am: ce25b9d44c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22162393

Change-Id: I5b96ada4caece6a0bdde0fb03d2f4354e72a6e38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 22:18:18 +00:00
Alex Dale
ce25b9d44c Avoid null dereference with empty BCC strings. 
[ Merge of http://go/wvgerrit/168482 ]

The function OEMCrypto_GetBootCertificateChain() does not always
provide an additional signature depending on the device.  However, the
CDM would still attempt to dereference the first character in the
additional signature buffer when empty.  This CL changes how the data
pointer to an output string is acquired.  Empty string will instead
pass in a null pointer.

Bug: 272643393
Test: run_prov40_tests
Test: atest GtsMediaTestCases
Change-Id: I10b0a3c7df4fc73272aa701bb01c60672645d4fc
(cherry picked from commit a878e7b98d)
 2023-03-20 20:29:58 +00:00
TreeHugger Robot
996cfd0449 Merge "Add Widevine lazy apex" into udc-dev am: 4e8c713f8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22105405

Change-Id: I6b216c473ef1cc7825a123da89112bbc65420c09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 04:58:09 +00:00
TreeHugger Robot
4e8c713f8b Merge "Add Widevine lazy apex" into udc-dev 2023-03-18 04:02:05 +00:00
Cong Lin
358924fa20 Merge "Update Android L3 after entitled key session fix" into udc-dev am: 412e1bfa13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22101165

Change-Id: I68391b76f79306c55cb5f932dcc8bd9176aa8634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 19:02:12 +00:00
Cong Lin
412e1bfa13 Merge "Update Android L3 after entitled key session fix" into udc-dev 2023-03-16 18:18:09 +00:00
Alex Dale
fbe1429eab Merge "Add mutex to CdmEngine for use of cert_provisioning_." into udc-dev am: 7c213563ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21921282

Change-Id: Ib54ef7e8c3478c82c3e512c8f657cd0a6c7fbe87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:20:35 +00:00
Alex Dale
7c213563ca Merge "Add mutex to CdmEngine for use of cert_provisioning_." into udc-dev 2023-03-15 21:34:37 +00:00
Kyle Zhang
2be47ada77 Add Widevine lazy apex 
Bug: 244498309
Test: m com.google.android.widevine.lazy
Change-Id: I226ae922e9ab7817353d3e94d509b9579c6551e1
 2023-03-15 21:02:14 +00:00
Cong Lin
3dd24639b3 Update Android L3 after entitled key session fix 
This is a merge of
https://widevine-internal-review.googlesource.com/c/cdm/+/168143

Original commit message:
Level3_RemoveEntitledKeySession(key_session) can be called when the
entitled key_session is already released by its entitlement session.
Do not return an error if the key_session to be removed is no longer
valid.

Test: run_dynamic_level3, oemcrypto unit tests on Pixel
Test: GTS media tests
Bug: 264688931
Change-Id: If0e0d0db2137c29e1dab4df321cf11ebcad2451f
 2023-03-15 09:52:05 -07:00
Pete Bentley
7dacf25ae9 Include hmac.h in test_base.cpp. am: 4247f72e79 am: 965a7f308d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21985924

Change-Id: Iee1b6d6041450f50b89d796b1938170920c137d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 19:05:23 +00:00
Pete Bentley
965a7f308d Include hmac.h in test_base.cpp. am: 4247f72e79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21985924

Change-Id: I83c97a129c52454782e9d1641ec3fec5c36fb568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 18:31:19 +00:00
Pete Bentley
4247f72e79 Include hmac.h in test_base.cpp. 
Cherry-pick note: Compile fix only, needed for latest AOSP BoringSSL in tm-qpr-dev-plus-aosp and downstream branches, e.g. udc-*-dev.

Original change description:
Include what you use - this is no longer pulled in
by the other headers used in this file.

Bug: 272749540
Test: m
Change-Id: I0d4b480e47f84f367d1a9547b89811c52073a2fc
Merged-In: I0d4b480e47f84f367d1a9547b89811c52073a2fc
(cherry picked from commit c785e91ec3)
 2023-03-13 10:44:08 +00:00
TreeHugger Robot
6bcd6d2de7 Merge "Adding ApexInfo utility" into udc-dev am: cb0d5e24be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21702626

Change-Id: I92d217e9213790463f69464403aabd76e511ad43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:01:29 +00:00
TreeHugger Robot
cb0d5e24be Merge "Adding ApexInfo utility" into udc-dev 2023-03-10 06:11:13 +00:00
Alex Dale
6e5ab021d8 Add mutex to CdmEngine for use of cert_provisioning_. 
[ Merge of http://go/wvgerrit/167618 ]
[ PoC http://ag/21922303 ]

Bug: 258188673
Test: sts-tradefed run sts-dynamic-develop -m StsHostTestCases \
    -t android.security.sts.Bug_258188673
Test: GtsMediaTestCases
Change-Id: If71a0e7a81f376cf28688a590b6cb9dcea699545
 2023-03-09 14:01:40 -08: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
Robert Shih
69fa06c614 Compact aidl exception message am: 3c9cbc6cbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21874559

Change-Id: Ia4bf88b55beb4b1889aad66a284bc513ecdc8d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 06:07:59 +00:00
Robert Shih
3c9cbc6cbe Compact aidl exception message 
[ Merge of go/wvgerrit/c/cdm/+/167499 ]

Bug: 249941041
Change-Id: I81ce1ecef22bd87c6d879d1ccfd6874e9786f892
 2023-03-07 19:08:02 +00:00
Edwin Wong
8aaf50ef90 [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: 2c4c12551f -s ours am: cedf65d414 -s ours am: 5552ec447f -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: I70adc2f8e25857dacb8074c8b9098cd87ec30c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 06:09:52 +00:00
Edwin Wong
5552ec447f [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: 2c4c12551f -s ours am: cedf65d414 -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: Ida2ee9374cb9ebd525f9cc230a75db283d24afe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 05:48:54 +00:00
Edwin Wong
e7f75ff4cd [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: c28a938337 -s ours am: b8b30aadf7 -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: Ie29794cce35b37988db284138736db77ca57c500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 05:15:00 +00:00
Edwin Wong
cedf65d414 [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: 2c4c12551f -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: I3d65dea4740c81bdbb0636eef3fe19f505bf082e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 05:12:43 +00:00