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

6260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rahul Frias
d1d77a58ba Allow provisioning model to be queried am: cd593979e9 am: f66cc64bea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18624153

Change-Id: I7fa6a53743aa8757ab66edf3e1a75d20dbab15bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 04:23:45 +00:00
Rahul Frias
f66cc64bea Allow provisioning model to be queried am: cd593979e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18624153

Change-Id: I68d1a67f4b98b74ea7f543101e9a321486ebb22d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 04:07:58 +00:00
Rahul Frias
cd593979e9 Allow provisioning model to be queried 
[ Merge of http://go/wvgerrit/152674 ]

This allows an app to query the provisioning model. Possible
values are { "DrmCertificate", "Keybox", "OEMCertificate",
"BootCertificateChain" }

An app can use these to disntinguish between provisioning models.
Provisioning 4.0 (boot certificate chain) requires a double provisioning
step.

Bug: 234057551
Test: WV unit/integration tests, libwvdrmdrmplugin_hal_test
Change-Id: I1611488ec632a0e5a9e1d106b7475e8f5a2a5a13
 2022-05-26 16:22:16 -07:00
Cong Lin
28ca5aa3cf Loosen KCB encryption checks in L3 am: 9935fae50d am: 9feaf68ea5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: I5257ca933846b7b60b2c83046b617a46171421d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:25:59 +00:00
Cong Lin
9feaf68ea5 Loosen KCB encryption checks in L3 am: 9935fae50d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: If52667414b27b20b16c0e84f0b92a906b75b4834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:09:58 +00:00
Cong Lin
9935fae50d Loosen KCB encryption checks in L3 
This is a merge from:
https://widevine-internal-review.googlesource.com/c/cdm/+/152372

The L3 source change which produced these libraries is:
https://widevine-internal-review.googlesource.com/c/cdm/+/152371/

Original commit message:
To address the bug with certain 16.4.x SDK versions returning a
clear key control block (KCB) for clients newer than 16.5, the
exact version check to determine whether key control blocks are
clear or not has been loosened.

Original behavior:
- ODK version >= 16.5.x --> Assume clear
- ODK version <= 16.4.x --> Assume encrypted
New behavior:
- No KCB IV --> Assume clear
- Otherwise --> Assume encrypted

This CL also includes a change to oemcrypto/include/OEMCryptoCENC.h
The changes to OEMCryptoCENC.h in the CL are comments or variable name
change. So it should be safe.
This change was merged to wv tm-dev here:
https://widevine-internal-review.googlesource.com/c/cdm/+/148411
So, adding it to Android tm-dev.

Test: run_level3_static_tests, CdmDecryptTest/CdmTestWithDecryptParam.* against LS SDK 16.4.2 & 17.0
Bug: 232557453
Change-Id: I2bbb5ab3ea33a16bd6c198077e5aefe960737ea0
 2022-05-22 06:35:22 +00:00
Robert Shih
0ff5a94b18 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: 22c314b3c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I4caf1a7412913122341c2d24271036be8bbac357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:05:33 +00:00
Robert Shih
22c314b3c5 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I8bc719c40571d8ecac10a23e982d5a83dd537213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 07:40:55 +00:00
Robert Shih
186e489562 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev 2022-05-16 06:17:33 +00:00
Alex Dale
62c43f71d4 Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: e28711c3ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: Ia7f7342cb648251893282c56c899f944afd81eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:39:33 +00:00
Alex Dale
e28711c3ca Move system ID extraction outside of CryptoSession. am: 9d169a00bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: Ifa0f6c87c52a3090edc3977d86522163bb68738b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:20:40 +00:00
Alex Dale
9d169a00bb Move system ID extraction outside of CryptoSession. 
[ Merge of http://go/wvgerrit/151391 ]

This CL moves the logic for extracting the system ID from keybox or
OEM certificate (from OEMCrypto or device files) to a dedicated
SystemIdExtractor.

Before Provisioning 4.0, the system ID could only be found from data
returned by OEMCrypto.  However, with provisioning 4.0, the system ID
can now be found in the OEM certificate that is stored on the device
files.

Bug: 232020319
Test: system_id_extractor_unittest
Test: Forest L37800000954493485
Change-Id: Ie1b7987906e2e4fef015cd659a947b6dbb7594b1
 2022-05-12 19:22:03 -07:00
Alex Dale
f298a5adca Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: 53e513dc05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: Ie48bb4f7460e193c5d678c98a4086bf1fbf80517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:40:18 +00:00
Alex Dale
53e513dc05 Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: Ifac854ca29c96aff77a35f59e726ede451828929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:04:01 +00:00
Alex Dale
8ac7ca3f46 Merge "Added metrics for production readiness." into tm-dev 2022-05-12 22:10:24 +00:00
Edwin Wong
ba8e028d3b Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: 67522b7b65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: I7967755fcea35ab9518d9f640a4fdf3dfb110e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:29:55 +00:00
Edwin Wong
67522b7b65 Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: I2f20175c6204807803a0745de0d47e06e8042fcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:10:44 +00:00
Edwin Wong
cf3771e54a Add hal_metrics_adapter_unittest for AIDL service. 
[ Merged from http://go/wvgerrit/151750 ]

Test: m hal_metrics_adapter_unittest -j128
Test: m hal_metrics_adapter_unittest  WV_UNITTESTS_BUILD_TARGET=hidl -j128
Test: adb push $(OUT)/data/nativetest/hal_metrics_adapter_unittest  /data/nativetest/.
Test: adb shell  LD_LIBRARY_PATH=/vendor/lib64 /data/nativetest/hal_metrics_adapter_unittest

Bug: 217247987
Change-Id: I0c890d2fab754bf993632659293a0272c863b11f
 2022-05-11 22:01:35 +00:00
Edwin
c4d06d6ea6 Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 9586d34201 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: Ieb328c30bd47b7863b614ed8c451507f60d9b704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:30:43 +00:00
Edwin
9586d34201 Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

Change-Id: Idc534a847bf4d3a592fc0217178b8e1740e9ab21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:55:27 +00:00
Edwin
5202862e9a Add libwvdrmdrmplugin_hal_test for AIDL service 
[ Merged from http://go/wvgerrit/150769 ]

- remove OpenSessions_1_1, only applies to hidl
- move plugin and mCdm creation in SetUp() test fixture
- reset plugin and mCdm smart pointers in TearDown
- reduce code duplication
- remove MockDrmPluginListener, send*Event has gone private

Test: m libwvdrmdrmplugin_hal_test -j128
Test: m libwvdrmdrmplugin_hal_test WV_UNITTESTS_BUILD_TARGET=hidl -j128
Test: adb push $(OUT)/data/nativetest/libwvdrmdrmplugin_hal_test /data/nativetest/.
Test: adb shell LD_LIBRARY_PATH=/vendor/lib64 /data/nativetest/libwvdrmdrmplugin_hal_test

Bug: 217247987
Change-Id: I8bc0a390a88facbc890cf26872fd089afe87850a
 2022-05-11 05:36:40 +00:00
Alex Dale
88a7ff7685 Added metrics for production readiness. 
[ Merge of http://go/wvgerrit/151749 ]

Extended CryptoSession for recording the result of
OEMCrypto_ProductionReady().

Only OEMCrypto_SUCCESS is considered "production ready".  With the
exception of OEMCrypto_ERROR_NOT_IMPLEMENTED, any other result is
vendor-specific and indicates not being production ready.

Bug: 231655151
Test: metrics_collections_unittest
Change-Id: Ia0e5603d7ee1290238cce63d0194ae1aced424c1
 2022-05-10 18:04:11 -07:00
Robert Shih
ca2440f556 dumpsys widevine: print hex IDs to avoid garbled text 
Includes minor format change for easier ingestion by other tools.

Bug: 231677822
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine
Change-Id: Ibd13c84bd8f93ea0fc6cbd38b56ef39541ecc867
 2022-05-11 00:50:11 +00:00
Robert Shih
f5a65bec87 Merge "wv_factory_extraction_tool: extract provision 4.0 csr" into tm-d1-dev am: 63ad411c0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18197386

Change-Id: Ife931e549deb37776967e6932eb1a23da5ed5495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:25:15 +00:00
Robert Shih
63ad411c0e Merge "wv_factory_extraction_tool: extract provision 4.0 csr" into tm-d1-dev 2022-05-11 00:10:36 +00:00
Edwin Wong
900cf7bf2e Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: 2054705413 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898

Change-Id: Id8041755dd4685c8f7d33f4e014cfcf97cdeddad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 23:51:43 +00:00
Edwin Wong
2054705413 Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898

Change-Id: I836dd3e5a995d261133c73e99137078827d0f680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 23:25:36 +00:00
Edwin Wong
f8146ee716 Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev 2022-05-10 23:12:05 +00:00
Alex Dale
72eeca4e98 Added CDM support for production readiness reporting. am: cd5afa88a6 am: 867954b412 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18195696

Change-Id: I387fd16ca6833f3904bdbfbf20da66e407f9f130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 22:03:45 +00:00
Alex Dale
867954b412 Added CDM support for production readiness reporting. am: cd5afa88a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18195696

Change-Id: I21f1bf89e4b9821f5b01ced5530a45763543947f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:40:38 +00:00
Alex Dale
cd5afa88a6 Added CDM support for production readiness reporting. 
[ Merge of http://go/wvgerrit/151518 ]

Extended the CDM layer to report OEMCrypto's production readiness
via string property query.

If OEMCrypto implementents OEMCrypto_ProductionReady(), then the
reported readiness by the CDM will report "True" or "False".

If OEMCrypto does not implement OEMCrypto_ProductionReady() then no
level of readiness is assumed, and the CDM will report "Unknown".

Bug: 231655151
Test: run_prov30_tests and request_license_test
Change-Id: I6afe481ef00ac129d02b004eca89a65810bfbff8
 2022-05-10 13:35:43 -07:00
TreeHugger Robot
76d4139f83 Merge "Update TestMaxDRMKeys to use 2048 bit keys only" into tm-dev am: c4a2a08ee6 am: 57ea6e5985 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18132819

Change-Id: I9aab47ba7cf2244fdc43893408d096724f37b08f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 15:18:41 +00:00
TreeHugger Robot
489e04277f Merge "Restrict CAS unit tests to devices that support CAS" into tm-dev am: 6e4cf1f1a9 am: 699e4255b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18128971

Change-Id: I241956fb9a0660108f0789c1477bab42a276f3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 15:12:49 +00:00
TreeHugger Robot
57ea6e5985 Merge "Update TestMaxDRMKeys to use 2048 bit keys only" into tm-dev am: c4a2a08ee6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18132819

Change-Id: I3e6086f2081d3a1a19a3cf9f9582012b3de8d094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 14:25:18 +00:00
TreeHugger Robot
699e4255b9 Merge "Restrict CAS unit tests to devices that support CAS" into tm-dev am: 6e4cf1f1a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18128971

Change-Id: Iad7c2038d6045ebfa1a49c9a5517e865caa86da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 14:21:48 +00:00
TreeHugger Robot
c4a2a08ee6 Merge "Update TestMaxDRMKeys to use 2048 bit keys only" into tm-dev 2022-05-09 09:34:58 +00:00
TreeHugger Robot
6e4cf1f1a9 Merge "Restrict CAS unit tests to devices that support CAS" into tm-dev 2022-05-09 09:34:55 +00:00
Rahul Frias
47a8318852 Merge "Check L3 for secure stops" into tm-dev am: f4e2e9833d am: bece59a04c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18192750

Change-Id: I2f6e807199ae318adca4e3f80c09e8e383739514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 22:45:07 +00:00
Rahul Frias
f39815c3cc Merge "Update version change canary test" into tm-dev am: e26370f0b6 am: bacd3dd9d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18194076

Change-Id: Ic59bc26709ae7dcc9fec84832378951d4ddebf76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 22:44:50 +00:00