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

6287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
eb5e32602e Merge "Loosen KCB encryption checks in L3 am: 9935fae50d am: 18eb27fcd4" into tm-d1-dev-plus-aosp 2022-05-22 07:26:04 +00:00
Cong Lin
196d291162 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: I4c6a1c8a181406509f4b3e045a45d852b3ffdd45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:26:01 +00:00
Cong Lin
ddc1a24543 Loosen KCB encryption checks in L3 am: 9935fae50d am: 18eb27fcd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: Ic9d17c65f0cdbf280c44447bb70bc94dfd91316e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:26:01 +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
18eb27fcd4 Loosen KCB encryption checks in L3 am: 9935fae50d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965

Change-Id: Ia4bce27cdc2e18bb7fdedd1eb3640315ac91f875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-22 07:08:33 +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
Automerger Merge Worker
0089fad7fc Merge "Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: 22c314b3c5" into tm-d1-dev-plus-aosp 2022-05-16 08:05:37 +00:00
Robert Shih
edfc22c061 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: I5aab87e4686521d02b96273c4507ea907281ac17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:05:35 +00:00
Robert Shih
1584175d60 Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562 am: f8bd90fe71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673

Change-Id: I5628a86db0390964d189bbb3748fa574706532fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 08:05:34 +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
f8bd90fe71 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: I354f65e931b14d00f0f7da7951e94e3a1a89f67d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 07:39:39 +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
3b1f15ddee Move system ID extraction outside of CryptoSession. am: 9d169a00bb am: 11a55d2e8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: I85184973cdf55c6ef21729c06c7f9404056657d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:39:53 +00:00
Alex Dale
c9c8ecd1e3 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: I521b19d7a705a28b9c29b27fccb50af1fa027f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:39:36 +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
11a55d2e8e Move system ID extraction outside of CryptoSession. am: 9d169a00bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016

Change-Id: If5782404e3ffff41a2377d6bd2d0a35851f78529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 18:18:23 +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
ca085f1d41 Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46 am: c01aca1d4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422

Change-Id: Ia7c19d70f0c0c695f06a25cbec1e1b962666d1c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:39:44 +00:00
Alex Dale
a669b0acfd 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: I2319d49bbaba97d0020f12167625fa4632136449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:39:20 +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
c01aca1d4d 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: Ia06436ff571d566428b059e3cfb7e052988f4e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:01:56 +00:00
Alex Dale
8ac7ca3f46 Merge "Added metrics for production readiness." into tm-dev 2022-05-12 22:10:24 +00:00
Automerger Merge Worker
df80023bde Merge "Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: e277ac0aaf" into tm-d1-dev-plus-aosp 2022-05-12 03:30:02 +00:00
Edwin Wong
ee0dee053b Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a am: e277ac0aaf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868

Change-Id: I37198ee18979f45e702fe5e338abb243ae1966c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:29:59 +00:00
Edwin Wong
990a818041 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: Ifb08a21ad728b6e03e27b23f772f7d84931f6a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:29:58 +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
e277ac0aaf 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: Ic0e965c34364ace57f6b10b8ddbaf637b954d1a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 03:09:13 +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
2305263b2d 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: I59bc66217b8170a2ad369732bbb8ac6e4dcf4fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:40:42 +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
c31ba7f4ff Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a am: 56594f7018 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572

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

Change-Id: I6d8b16e2da6c3a4fa96f699f2dcdcf2e3de21271
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:18:35 +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
4d928c4906 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: I79b5410b3ca4afa015c4f4fef4c63f36c470d2f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 00:25:16 +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
0d71f292ac 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: Ib2878aeb966a701e758805877969e02a4d332951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 23:51:42 +00:00
Edwin Wong
310347ff63 Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716 am: cba60f02a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898

Change-Id: Iec6f953fb2e7bd96fd2f133661d25a56b77f4cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 23:42:41 +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
cba60f02a9 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: I4a3a7fa6a4ae632f9deb42e51fc7ee1e5aa8c71c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 23:23:59 +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
3aa2a55386 Added CDM support for production readiness reporting. am: cd5afa88a6 am: 6fe5fe9b47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18195696

Change-Id: I355fd69f77f5b3da330c8e60c6834ea6fc186e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 22:03:43 +00:00
Alex Dale
1f9bb0ca5e 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: I1cdb57ee5bcab40aa1f7f3f7f640cba249fea185
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 22:03:37 +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
6fe5fe9b47 Added CDM support for production readiness reporting. am: cd5afa88a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18195696

Change-Id: Iecd0aed0d46bf9e18c2cec2f504744739ad07f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 21:37:17 +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
0bce7db223 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: If5013b9db92b4c088571891d0a2b55b4f614ea58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 17:37:51 +00:00
TreeHugger Robot
1055f995d3 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: I701d069da5a721e9f48bfb28c79d1d70bac76a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 17:23:33 +00:00
TreeHugger Robot
3878c1370e Merge "Update TestMaxDRMKeys to use 2048 bit keys only" into tm-dev am: c4a2a08ee6 am: a815dd2852 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18132819

Change-Id: I67aad683dd17f2b3652dc025ab199e03555cda3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 16:59:27 +00:00