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
TreeHugger Robot
c623b0f98c Merge "Restrict CAS unit tests to devices that support CAS" into tm-dev am: 6e4cf1f1a9 am: cae6ea8d7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18128971

Change-Id: I60ed0b524ea279f577ed1c2f616dc10a74517283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 16:20:58 +00:00
TreeHugger Robot
a815dd2852 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: If40ae4258575ee82fc898487607bbd565e703135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 15:49:33 +00:00
TreeHugger Robot
cae6ea8d7a 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: If98c5abbba11419ba24b9b11a5a86017d6cd6ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 15:22:52 +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
98bdec95f7 Merge "Check L3 for secure stops" into tm-dev am: f4e2e9833d am: 5dd27bc39b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18192750

Change-Id: Icba6ff32acfe93790dba8f65eb2d841c8f5499c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 22:46:02 +00:00
Rahul Frias
9f7de32d0e 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: I968475e286af42e8e8cff320bbcf4a00b27a5f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 22:45:10 +00:00
Rahul Frias
2fb25bc609 Merge "Update version change canary test" into tm-dev am: e26370f0b6 am: 90a51d34fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18194076

Change-Id: Ic97fc32434b53d9a91bfdccfc3d5fcfd4fae86c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 22:44:53 +00:00
Rahul Frias
90088202fb 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: I03f2f8ed4536370d8d3b6f5d7d80beef13948b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 22:44:37 +00:00
Rahul Frias
bece59a04c Merge "Check L3 for secure stops" into tm-dev am: f4e2e9833d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18192750

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

Change-Id: I8a63cdbe0f3357588f2ad6dc7793a7895b7bc4c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 22:27:09 +00:00
Rahul Frias
5dd27bc39b Merge "Check L3 for secure stops" into tm-dev am: f4e2e9833d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18192750

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

Change-Id: I865cdfa8815549eeabcdd98f85c856cd899b5561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-06 22:25:54 +00:00
Rahul Frias
f4e2e9833d Merge "Check L3 for secure stops" into tm-dev 2022-05-06 22:08:52 +00:00
Rahul Frias
e26370f0b6 Merge "Update version change canary test" into tm-dev 2022-05-06 22:06:05 +00:00
Edwin Wong
19407fdc10 Add libwvdrmmediacrypto_hal_test for AIDL service. 
[ Merge from http://go/wvgerrit/151349 ]

- move plugin and mCdm creation in SetUp() test fixture
- replace StrictMock<MockCD<> with NiceMock; otherwise,
  "uninteresting mock for isOpenSession" will return fail by default
- replace .WillOnce() for isOpenSession() with .WillRepeatedly

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

Bug: 217247987
Change-Id: I8d7189473d52738645c73c6665f4f3f6a13042f0
 2022-05-06 18:21:57 +00:00
Robert Shih
05878ffbe1 wv_factory_extraction_tool: extract provision 4.0 csr 
Bug: 231677822
Test: adb shell wv_factory_extraction_tool csr
Change-Id: I9f21514b027261f1d69c24a4d2f54051ccaac9a5
 2022-05-06 01:40:11 -07:00
Rahul Frias
13daf6d3ed Check L3 for secure stops 
[ Merge of http://go/wvgerrit/151512 ]

Parameterizing GtsMediaDrm tests exposed a few issues. If secure stops
were stored at L3 security level, retrieval would fail. This CL
checks L3 if the secure stop was not found at the default security
level.

Bug: 221249079
Test: GtsMediaTestCases
Change-Id: Ie88197f8e29457981d782199a76d38774f6faa67
 2022-05-06 01:39:24 +00:00
Rahul Frias
81e5fc3dc4 Update version change canary test 
[ Merge of http://go/wvgerrit/151571 ]

The android OS version has been updated to 13. Updating WV tests as well.
CDM version has been updated previously, so no additional changes are needed.

Bug: 231646284
Test: WV unit/integration tests
Change-Id: Ifaf2fe1f04627654725b1b221d8c3dc30029ac6c
 2022-05-05 18:29:25 -07:00
Alex Dale
a7e4321f63 Merge "Resize OEMCrypto buffer-based results on success." into tm-dev am: f980049ef0 am: eb1ea89516 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18126088

Change-Id: Ie54cff0b2b75836c8e0eb30fb77b370c3f086a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 21:29:41 +00:00
Alex Dale
874d37c7c1 Merge "Resize OEMCrypto buffer-based results on success." into tm-dev am: f980049ef0 am: 541f6a38c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18126088

Change-Id: Ifef8e49a3a40135afea2fe43906dc9d04a671010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 21:28:45 +00:00
Alex Dale
541f6a38c2 Merge "Resize OEMCrypto buffer-based results on success." into tm-dev am: f980049ef0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18126088

Change-Id: I624bf91717b136353c03f6e628021a3eaa3ac91d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 21:11:49 +00:00
Alex Dale
eb1ea89516 Merge "Resize OEMCrypto buffer-based results on success." into tm-dev am: f980049ef0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18126088

Change-Id: Ifef6d4cf3fbf2b7f3e60f43ea85cf47f3042bb3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 21:09:58 +00:00
Alex Dale
f980049ef0 Merge "Resize OEMCrypto buffer-based results on success." into tm-dev 2022-05-05 20:38:05 +00:00
Edwin Wong
1d8e7dd80d Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 am: 388ea1e988 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: I890f6acee1721ae42a7ae7d2f7acd7e86abfd621
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 18:50:01 +00:00
Edwin Wong
edad992f42 Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 am: e72d16e49f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: I33215173280f8dd3291b3700a0c1d3e380aa78de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 18:49:36 +00:00
Edwin Wong
e72d16e49f Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: I8de18718e7dffdabc660223bf61b44f2780e62ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 18:23:20 +00:00
Edwin Wong
388ea1e988 Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: Iaea267d837a01a39ee5da93b2c0d69b1cc94ea4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 18:21:33 +00:00
Edwin Wong
f607802265 Merge "Only use libbinder_ndk for aidl service." into tm-dev 2022-05-05 17:53:05 +00:00
Cong Lin
e2c6ceec3c Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b am: 2bc51795c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: I27e50e059191569aac92e1fc3c2b271c19acd681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 15:43:28 +00:00
Cong Lin
209fd5bac3 Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b am: c23c689c0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: Ic25f6e9a6db42545daf97771b3cfeaf11d29acfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 15:42:21 +00:00
Cong Lin
c23c689c0a Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: Iab06782791e7761188a04970ece4fb5da155990e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 15:18:45 +00:00
Cong Lin
2bc51795c9 Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: I6a5b61051507751917a30974b204c05aeef53635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 15:17:21 +00:00
Edwin Wong
af5f57a46c Only use libbinder_ndk for aidl service. 
[ Merged from http://go/wvgerrit/151169 ]

Test: Netflix and Google TV streaming and downloaded playback
Test: unit tests
Test: atest VtsAidlHalDrmTargetTest
Test: adb shell readelf -d /vendor/bin/hw/android.hardware.drm-service.widevine
Test: adb shell readelf -d /vendor/lib64/libwvaidl.so

Bug: 230791937
Change-Id: Ia60d9fc838bf228b40d99b076a837ae789fa2d03
 2022-05-05 15:12:55 +00:00
Cong Lin
e06c526d3b Merge "Include SPOID in provisioning 4 request" into tm-dev 2022-05-05 14:56:01 +00:00
Alex Dale
1069ae39cc Resize OEMCrypto buffer-based results on success. 
[ Merge of http://go/wvgerrit/151191 ]

Within the CDM and OEMCrypto tests, there were a few OEMCrypto function
calls where the final size of the output buffers were not being
resized.  For several of these functions, an initial call is made with
zero-length output buffers, expecting OEMCrypto to return
ERROR_SHORT_BUFFER; followed by a call with buffers at least as large
as specified by OEMCrypto.  However, for some operations, OEMCrypto
makes an estimate on the final size on the first call, specifying the
exact size only after performing the operations.

This is the case for the wrapped key returned by
OEMCrypto_LoadProvisioning().  The provisioning response contains a
padded + encrypted DRM key.  OEMCrypto does not know the actual size
of the key until decrypted, and the actual DRM key might be smaller.

There was a OEMCrypto test for OEMCrypto_BuildInformation() which
was enforcing the wrong behaviour.  This has been updated.

Bug: 230661565
Test: oemcrypto_test
Change-Id: Iad297d56ffbb085894641fdf8698ce5fd18edbf2
 2022-05-04 21:32:08 -07:00
Vicky Min
ab3ee4d73c Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: ad7a07b234 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I9228c47fe7d301029bc17aa2f8f5f00e0cad0376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:35:09 +00:00
Vicky Min
edcd9fe9f1 Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: 9c122a40ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I05d17d0d374871c5d9dbb81cc60954cb1c771186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:35:00 +00:00
Vicky Min
ad7a07b234 Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I8632a274c3ca239b4342a639d3566214a54dd689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:10:57 +00:00
Vicky Min
9c122a40ea Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I8de55fc7626dec605b18b5ccc1de1d51c65efed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:09:39 +00:00
Vicky Min
1563fb2a27 Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() 
In TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths(),
LoadResponse() should be called after EncryptAndSignResponse() so this
is moved in this CL.

Bug: 231368221
Test: OEMCryptoMemoryLoadLicense tests
Change-Id: I7a0224afb21c3ab1d896ce3cfb64e1ad544a581a
 2022-05-03 23:36:05 +00:00
Fred Gylys-Colwell
2899924d42 Update TestMaxDRMKeys to use 2048 bit keys only 
Merge from Widevine repo of http://go/wvgerrit/151254

Test: Ran tests on reference oemcrypto
Bug: 228996670
Change-Id: I6ea69bad49fa2d4272fc8bb02895c17f314c7f49
 2022-05-02 17:36:36 -07:00
Fred Gylys-Colwell
0d6fbb2d0e Restrict CAS unit tests to devices that support CAS 
Merge from Widevine repo of http://go/wvgerrit/151253

This updates the OEMCrypto unit test filters to remove
CasOnly tests if the device does not implement the cas
function OEMCrypto_LoadCasECMKeys.

Test: unit tests on Luci
Bug: 221256887
Change-Id: I7026c4318153ada1d85055704e87b2cef397ffca
 2022-05-02 15:41:52 -07:00
Lu Chen
534589fd2e Include SPOID in provisioning 4 request 
Merged from https://widevine-internal-review.googlesource.com/148554

This change was merged to master but missed in tm-dev when we stopped
the auto merging to tm-dev. Manually cherry picked it.

Test: ran OPK unit tests
Bug: 230820162
Bug: 180530495

Change-Id: Ib23f07f84096650beb4dd1950105db01e004d484
 2022-04-29 21:36:51 -07:00
TreeHugger Robot
5c089b687d Merge "Added mutex for reserved_license_ids_." into tm-dev am: da1e3c5de2 am: addc7921ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17919183

Change-Id: Icd408f6bf4212c75380adf09a48008fafc84893f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 20:13:26 +00:00
TreeHugger Robot
4d2d355983 Merge "Added mutex for reserved_license_ids_." into tm-dev am: da1e3c5de2 am: 0657c15214 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17919183

Change-Id: I52e282400d629b5964db5fb72dcc5ec5a4bd9246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 20:12:21 +00:00
TreeHugger Robot
addc7921ce Merge "Added mutex for reserved_license_ids_." into tm-dev am: da1e3c5de2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17919183

Change-Id: Ie9cdc9f0ea3e2ee6582f537f980bf55e94a10d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:56:05 +00:00
TreeHugger Robot
0657c15214 Merge "Added mutex for reserved_license_ids_." into tm-dev am: da1e3c5de2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17919183

Change-Id: I97b0a7e61e52d14135e2ddd29e56da410cb88015
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:54:44 +00:00