Commit Graph

6935 Commits

Author SHA1 Message Date
Cong Lin
df97526241 Internal factory tool implements CSR v3 am: 5e24549b1a am: 89004aecf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21725452

Change-Id: I97f8d496c3c14e1a7696a531874ce4fe6856817b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 08:02:13 +00:00
Cong Lin
eb2e9b5f72 Factory tool implements Widevine IRPC HAL v3 am: 8dc7cc0c74 am: 2dea3f9b19
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21724578

Change-Id: Ie928a2c543251c9955764cab061d3160ae9ec641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 07:53:43 +00:00
Cong Lin
0c18c8e6eb Merge "Re-generate Android L3 after memset fix" into udc-dev am: 1a2e90be1a am: db4f951028
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21726166

Change-Id: Ibb566774d0a81fa80513e70bd7d5e29e4646ab8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 07:42:47 +00:00
Cong Lin
e3f5f9e8f7 Internal factory tool implements CSR v3 am: 5e24549b1a am: e26296ce8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21725452

Change-Id: I2c2badc773712182fd8ece82971bd9ba4df58454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 07:41:58 +00:00
Cong Lin
db4f951028 Merge "Re-generate Android L3 after memset fix" into udc-dev am: 1a2e90be1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21726166

Change-Id: I467ca51eff40b561947d83e1ed8f3bbb1c930790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 07:33:28 +00:00
Cong Lin
4b877c8d64 Factory tool implements Widevine IRPC HAL v3 am: 8dc7cc0c74 am: e36864315d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21724578

Change-Id: I5b508f7c106d7c1b14bd8e94e838d198e08adb6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 07:27:50 +00:00
Cong Lin
e26296ce8b Internal factory tool implements CSR v3 am: 5e24549b1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21725452

Change-Id: Ifafbbd0708a6c37bb73275cf0a19ed3c9b30e65e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 07:17:01 +00:00
Cong Lin
e36040b7be Merge "Re-generate Android L3 after memset fix" into udc-dev am: 1a2e90be1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21726166

Change-Id: Ic7d213fad77316e1047ba8c2743c7abf501c5b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 07:09:31 +00:00
Cong Lin
89004aecf4 Internal factory tool implements CSR v3 am: 5e24549b1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21725452

Change-Id: I022cd29d6cd4a4dda30a6e21d338d647d82ab676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 06:58:53 +00:00
Cong Lin
e36864315d Factory tool implements Widevine IRPC HAL v3 am: 8dc7cc0c74
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21724578

Change-Id: I6edc87d04d6c7e4c0a1d6cb4caa325b08e839a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 06:46:29 +00:00
Cong Lin
2dea3f9b19 Factory tool implements Widevine IRPC HAL v3 am: 8dc7cc0c74
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21724578

Change-Id: I662fc8ef7238fb8be6a23a44fbd8317a826bcee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-04 06:43:14 +00:00
Cong Lin
1a2e90be1a Merge "Re-generate Android L3 after memset fix" into udc-dev 2023-03-03 19:48:04 +00:00
TreeHugger Robot
89f8438930 Merge "Update to handle spurious wake up in conditional variable" 2023-03-03 07:50:27 +00:00
Cong Lin
eed03c1bd1 Re-generate Android L3 after memset fix
This is a merge of
167280: Re-generate Android L3 after memset fix | https://widevine-internal-review.googlesource.com/c/cdm/+/167280

Original fix and commit message:
167279: Fix a few memset calls in L3 haystack | https://widevine-internal-review.googlesource.com/c/cdm/+/167279

Test: GtsMediaTest on Pixel 7
Bug: 264978856
Change-Id: Id7a801389edec23f020297b762ccf5e0e3d77c6a
2023-03-02 12:55:07 -08:00
Cong Lin
5e24549b1a Internal factory tool implements CSR v3
Widevine internal BCC extraction tool to extract CSR v3 for testing
purpose. The difference it has from the factory tool is it doesn't rely
on Widevine IRPC HAL.

It just extracts BCC/CSR in the specified format from cli.

Test: Extract CSR v3 on Pixel 7 and upload
Bug: 268246995
Change-Id: I52abe09f991c89c6e7601bcef4d980f24c020c9f
2023-03-02 12:19:43 -08:00
Cong Lin
8dc7cc0c74 Factory tool implements Widevine IRPC HAL v3
Implement IRPC HAL v3 interfaces for extracting device registration CSR.
The new interface calls OEMCrypto_GetDeviceInformation() and
OEMCrypto_GetSignedCsrPayload() and then constructs the CSR.

Also added all mandatory fields of device info in the request.

Test: Run extraction tool on Pixel 7 and upload CSR
Test: Verified Widevine remote provisioning
Bug: 268246995
Change-Id: I24097ba32c7a105266071c1341c938b5874b38d8
2023-03-02 10:51:45 -08:00
Cong Lin
771568db58 Sync oemcrypto files from cdm udc-dev to Android am: e8add8eed8 am: 830681bce9
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21643478

Change-Id: I50e2d0e33177869d5eabc78ce6deed5f2971bbe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 06:49:53 +00:00
Cong Lin
cf17c34470 Sync oemcrypto files from cdm udc-dev to Android am: e8add8eed8 am: 1641853f71
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21643478

Change-Id: I9e94fa3af05d56c31d3124e487136060eb97a9ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 06:49:06 +00:00
Cong Lin
1641853f71 Sync oemcrypto files from cdm udc-dev to Android am: e8add8eed8
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21643478

Change-Id: I3f6c81851eaeb3bc4a67abe6f87e52a59acdd7c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 06:14:47 +00:00
Cong Lin
830681bce9 Sync oemcrypto files from cdm udc-dev to Android am: e8add8eed8
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21643478

Change-Id: I2cad8fe7449b471fb784b962f93bdd340f272d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 06:14:34 +00:00
Cong Lin
e8add8eed8 Sync oemcrypto files from cdm udc-dev to Android
Changes included in this CL:

166806: Update OEMCrypto_GetDeviceInformation() | https://widevine-internal-review.googlesource.com/c/cdm/+/166806
166808: Update Android L3 after OEMCrypto_GetDeviceInformation() signature changes | https://widevine-internal-review.googlesource.com/c/cdm/+/166808
166809: Decode device info and write it to CSR payload | https://widevine-internal-review.googlesource.com/c/cdm/+/166809
167158: Fix Android include path and copy_files | https://widevine-internal-review.googlesource.com/c/cdm/+/167158
167159: Fix common typos and use inclusive language suggested by Android linter | https://widevine-internal-review.googlesource.com/c/cdm/+/167159

165618: Explicitly state python3 where needed. | https://widevine-internal-review.googlesource.com/c/cdm/+/165618

166757: Update Android.bp for Android | https://widevine-internal-review.googlesource.com/c/cdm/+/166757
164993: Refactor basic oemcrypto unit tests | https://widevine-internal-review.googlesource.com/c/cdm/+/164993
164978: Update OEMCrypto Unit Test Docs | https://widevine-internal-review.googlesource.com/c/cdm/+/164978
166941: Update make files for OEMCrypto | https://widevine-internal-review.googlesource.com/c/cdm/+/166941

165279: Refactor license unit tests | https://widevine-internal-review.googlesource.com/c/cdm/+/165279
165318: Refactor provisioning unit tests | https://widevine-internal-review.googlesource.com/c/cdm/+/165318
164800: Add extra check for renew on license load unit test | https://widevine-internal-review.googlesource.com/c/cdm/+/164800
165860: Remove duplicate definition of MaybeHex() | https://widevine-internal-review.googlesource.com/c/cdm/+/165860

164889: Updated CoreCommonRequestFromMessage and fix test | https://widevine-internal-review.googlesource.com/c/cdm/+/164889
164967: Add OPK pre-hook and post-hook error codes | https://widevine-internal-review.googlesource.com/c/cdm/+/164967
165140: Add hidden device_id_length to v18 provisioning message | https://widevine-internal-review.googlesource.com/c/cdm/+/165140
165204: Fix memory leak in oemcrypto test | https://widevine-internal-review.googlesource.com/c/cdm/+/165204

165958: Fix oemcrypto_generic_verify_fuzz mutator signature offset | https://widevine-internal-review.googlesource.com/c/cdm/+/165958

166037: Support SHA-256 in OEMCrypto Session Util | https://widevine-internal-review.googlesource.com/c/cdm/+/166037

Test: Run GtsMediaTests on Pixel 7
Bug: 270612144

Change-Id: Iff0820a2de7d043a820470a130af65b0dcadb759
2023-02-28 11:21:05 -08:00
Rahul Frias
2596328005 Merge changes Ia54117ff,I4d469a73,I926d8309 into udc-dev am: 3f7ecbc43e am: 2801c4f0a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21547602

Change-Id: I7be0d694d1747927b403e0e3996e126811307f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 21:42:23 +00:00
John "Juce" Bruce
b4825d97c1 Remove hash algorithm from renewal requests am: 340810f77f am: 7ae015312f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21589311

Change-Id: I4eab48b517014298c359491c7f51a9ea0e4de8ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 21:39:59 +00:00
Bob Badour
2e00efcc02 [LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine am: 1625b15b31 am: 6d073bfa32
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21559175

Change-Id: I79a18f21beb7db6b5dd1719cb5582db89857914c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-27 18:15:50 +00:00
Nisha CT
75eef5c3a3 Update to handle spurious wake up in conditional variable
Bug: 265234582
Bug: 217181322
Test: make libwvdrmengine

Change-Id: I6256f60ab871184298c1bfc44632c501a2db018c
2023-02-27 04:13:08 +00:00
Rahul Frias
19ce6f8ee8 Merge changes Ia54117ff,I4d469a73,I926d8309 into udc-dev am: 3f7ecbc43e am: fab9cd9cce
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21547602

Change-Id: Ie3e964835af20647b81ca6309b77625f5d6a3285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25 01:25:04 +00:00
John "Juce" Bruce
8dcf93cce2 Remove hash algorithm from renewal requests am: 340810f77f am: 371d8e51f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21589311

Change-Id: I24f42bd3baec8e03aaa5dac8d0bfb77fc360ad54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25 01:24:51 +00:00
Rahul Frias
fab9cd9cce Merge changes Ia54117ff,I4d469a73,I926d8309 into udc-dev am: 3f7ecbc43e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21547602

Change-Id: I757b482b08b2603f581c8f96cc915489f2897a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25 00:48:02 +00:00
Rahul Frias
2801c4f0a4 Merge changes Ia54117ff,I4d469a73,I926d8309 into udc-dev am: 3f7ecbc43e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21547602

Change-Id: Iea2cb59c5f43ebce184a234a9a921b47f55c9149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25 00:46:07 +00:00
John "Juce" Bruce
371d8e51f2 Remove hash algorithm from renewal requests am: 340810f77f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21589311

Change-Id: I0803cf5e51c82d22df2707f59f1857f9c9c842cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25 00:45:20 +00:00
John "Juce" Bruce
7ae015312f Remove hash algorithm from renewal requests am: 340810f77f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21589311

Change-Id: Ib868b0d2cd98c464d123443f46845a2554440cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25 00:44:12 +00:00
Rahul Frias
3f7ecbc43e Merge changes Ia54117ff,I4d469a73,I926d8309 into udc-dev
* changes:
  Remove comment.
  Request debug headers and log URL correctly
  Integration tests for renew on license load
2023-02-25 00:09:25 +00:00
John "Juce" Bruce
340810f77f Remove hash algorithm from renewal requests
(Merged from http://go/wvgerrit/165859.)

Since renewal requests are signed with the MAC keys and not an
asymmetric key, it does not make sense to query OEMCrypto for the
asymmetric key hash algorithm nor to include the result in the renewal
request.

Bug: 262427121
Test: opk_ta
Change-Id: Ib309b63b79e553f4754c013718df242247ab9488
2023-02-24 21:11:50 +00:00
Bob Badour
6d073bfa32 [LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine am: 1625b15b31
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21559175

Change-Id: I7ae97d3ba7e6fda630b60fe3a04fb26fb7fe4fa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 05:28:29 +00:00
Bob Badour
aaf508ce50 [LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine am: 1625b15b31
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21559175

Change-Id: Ia940c301627724db4877e8dadc4138e21ee73d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 02:47:55 +00:00
Bob Badour
1625b15b31 [LSC] Add LOCAL_LICENSE_KINDS to vendor/widevine
Added legacy_proprietary to:
  libwvdrmengine/apex/prebuilt/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I95cd31dc2d2cea5b266a22b6f6c87db1cfec4f68
2023-02-23 07:23:04 -08:00
Rahul Frias
f63a0b287d Remove comment.
Merged from https://widevine-internal-review.googlesource.com/164120

Based on review comment in PS10 of http://go/ag/20608670

Bug: 262797186
Test: GtsMediaTestCases
Change-Id: Ia54117ffd0882de161e772fc1ca180a8d3f27480
2023-02-22 15:53:42 -08:00
Rahul Frias
c41b6cb713 Request debug headers and log URL correctly
Merged from https://widevine-internal-review.googlesource.com/165861

We want debug headers to help diagnose b/186031735. I also
saw that we were only logging the domain name for some
errors instead of the full URL.

Bug: 186031735
Test: GtsMediaTestCases
Change-Id: I4d469a73e54f86d4d3b5d50bd0030fdb2a36df50
2023-02-22 15:09:22 -08:00
Rahul Frias
ca79034a3d Integration tests for renew on license load
Merged from https://widevine-internal-review.googlesource.com/164468

We need to add integration tests in the form of duration license tests
in order to test that this feature works with licenses from a real
server.

Bug: 253513745
Test: WV unit/integration tests
Change-Id: I926d8309ed24183ae117e3f66fb92fec2d95c310
2023-02-22 13:59:22 -08:00
TreeHugger Robot
7c5f53f861 Merge "Drop nonupdatable Widevine prebuilt files to android source tree." 2023-02-16 00:28:10 +00:00
Rahul Frias
04d136df36 Merge "Logging for L1 devices falling back to L3" 2023-02-15 21:53:10 +00:00
Kyle Zhang
2e143c1b06 Drop nonupdatable Widevine prebuilt files to android source tree.
The following files have been updated as part of this change:

libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=331613000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000

libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=331613000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000

libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=331613000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000

libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=331613000
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=33
compileSdkVersionCodename=UpsideDownCake
sdkVersion:UpsideDownCake
targetSdkVersion:10000

Built here: ab/9591839

Bug: 251299786
Change-Id: Iea7c522571f1648c1f6fa05e6024e4fe49037e3a
2023-02-15 21:50:38 +00:00
Rahul Frias
ca583d9510 Logging for L1 devices falling back to L3
[ Merge of http://go/wvgerrit/161877 ]

This change introduces some logging to shed some light on
why some L1 devices fallback to L3.

* Additional logging has been added to indicate whether a lookup of
  the symbols for OEMCrypto_Initialize, OEMCrypto_APIVersion
  or OEMCrypto_Terminate failed.
* OEMCrypto_Initialize error code is saved and reported later.

Bug: 245887116
Test: GtsMediaTestCases
Change-Id: Ice4d966d2fee458de2fae28a1355f292f879c38b
2023-02-14 14:11:08 -08:00
Alex Dale
b11890a694 Provide BCC in WVDrmFactory dumpsys.
[ Merge of go/wvgerrit/c/cdm/+/165138 ]

Enabled the Widevine DRM service on Android to return the raw boot
certificate chain via the CDM status query capabilities.  This
property key is not available for app-level queries.

The BCC is dumped by the WVDrmFactory when requested to print all
CDM properties via dumpsys.

Bug: 234095402
Test: request_license_test
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -p
Change-Id: I34695b0655b4c609979577e9986974bc0fbda898
2023-02-13 13:27:50 -08:00
Alex Dale
1deba6cee1 Merge "Delete secure stops by key set ID." 2023-02-09 23:17:59 +00:00
Cong Lin
0a9e639c15 [automerger skipped] [DO NOT MERGE] Update L3 Android T with new system id after key free fix am: a4b942e176 am: 95d87f3936 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3354ce705fb7cde7d7535570be3756654dd25976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 21:35:57 +00:00
Cong Lin
95d87f3936 [DO NOT MERGE] Update L3 Android T with new system id after key free fix am: a4b942e176
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21218719

Change-Id: I79df83fc2250399f71d1e20e17444781e09d53cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 20:55:46 +00:00
Bob Badour
96fbf2481a Merge "Vendor projects are proprietary." 2023-02-09 18:53:02 +00:00
TreeHugger Robot
e2fd67cb3c Merge "Add non-updatable Widevine Apex in build" 2023-02-09 18:52:07 +00:00
Bob Badour
c34ecdc774 Vendor projects are proprietary.
Test: m droid dist
Change-Id: I19435feeece687cf7977ea62faac7a9692315449
2023-02-08 21:44:52 -08:00