Commit Graph

8134 Commits

Author SHA1 Message Date
Kyle Zhang
b3bb37f76c Add new dev apex set 11921200
The prebuilt version is AV1A.240603.001.
The branch it was built on is `vic-widevine-partner-release`.

Bug: 324294223
Change-Id: If42db8dea02eb4c15b97692c275df66b30a4dd63
(cherry picked from commit 33326c9604500cb45219f05852416734cc517799)
2024-06-06 18:33:47 +00:00
Kyle Zhang
e5223be4ef Add new dev apex set 11775005
The prebuilt version is AV1A.240428.001.
The branch it was built on is `vic-widevine-partner-release`.

Bug: 324294223
Change-Id: Ia0b63e5b667d17036f9dde6916cafa4e436278e8
(cherry picked from commit b54d86a04f00d405a054c8c88f9d42f115136467)
2024-06-06 18:33:30 +00:00
Kyle Zhang
75a9d61f93 Add new dev apex set 11662047
The prebuilt version is ZV1A.240402.001.
The branch it was built on is `trunk-widevine-release`.

Bug: 324294223
Change-Id: Idbaf0816db3487573b7b90139af865b0ed90f116
(cherry picked from commit a319d2b737f85ffb45b508537aa486bfc38a5518)
2024-06-06 18:33:11 +00:00
Kyle Zhang
1dfd8c26b6 Drop Widevine apex prebuilt files for dev 11662047
The following files have been updated as part of this change:

libwvdrmengine/apex/prebuilt/dev/com.google.android.widevine.lazy-11662047.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240402
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:10000

libwvdrmengine/apex/prebuilt/dev/com.google.android.widevine.lazy-11662047.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240402
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:10000

libwvdrmengine/apex/prebuilt/dev/com.google.android.widevine.lazy-11662047.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240402
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:10000

libwvdrmengine/apex/prebuilt/dev/com.google.android.widevine.lazy-11662047.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240402
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:10000

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

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

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

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

Built here: ab/11662047

The change is generated with prebuilt drop tool.

Bug: 324294223
Change-Id: I2fd508c7d60a0c774700757562816d0219e37240
(cherry picked from commit 5621d91cf4c92c69616018c8c82c457f5eb0e9f7)
2024-06-06 00:53:32 +00:00
Kyle Zhang
80c7641ceb Drop Widevine apex prebuilt files for dev 11775005
The following files have been updated as part of this change:

libwvdrmengine/apex/prebuilt/dev/com.google.android.widevine.lazy-11775005.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240428
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:10000

libwvdrmengine/apex/prebuilt/dev/com.google.android.widevine.lazy-11775005.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240428
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:10000

libwvdrmengine/apex/prebuilt/dev/com.google.android.widevine.lazy-11775005.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240428
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:10000

libwvdrmengine/apex/prebuilt/dev/com.google.android.widevine.lazy-11775005.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240428
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:10000

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

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

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

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

Built here: ab/11775005

The change is generated with prebuilt drop tool.

Change-Id: Ia5480be8d46cafe17f48d86e51f40fd6de707c17
(cherry picked from commit d2a007fcc8b144eb12236b508b587d3705005649)
2024-06-06 00:31:35 +00:00
Kyle Zhang
d765b3d80d Drop Widevine apex prebuilt files for dev 11921200
The following files have been updated as part of this change:

libwvdrmengine/apex/prebuilt/dev/com.google.android.widevine.lazy-11921200.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240603
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:10000

libwvdrmengine/apex/prebuilt/dev/com.google.android.widevine.lazy-11921200.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240603
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:10000

libwvdrmengine/apex/prebuilt/dev/com.google.android.widevine.lazy-11921200.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240603
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:10000

libwvdrmengine/apex/prebuilt/dev/com.google.android.widevine.lazy-11921200.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240603
versionName=
platformBuildVersionName=UpsideDownCake
compileSdkVersion=34
compileSdkVersionCodename=UpsideDownCake
sdkVersion:34
targetSdkVersion:10000

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

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

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

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

Built here: ab/11921200

The change is generated with prebuilt drop tool.

Change-Id: Ibac3e6edce713b9d6713dec667590220deb07648
(cherry picked from commit a4055024ed1daef68a9fa2be386d53a2feaedd4a)
2024-06-06 00:26:25 +00:00
Robert Shih
faa07f65f8 Merge "Add missing aconfig container field to vendor/widevine/libwvdrmengine" into vic-widevine-dev 2024-06-03 17:49:56 +00:00
Rahul Frias
5a1b5e2b37 Haystack: Forbid DeriveKeysFromSessionKey after a license is loaded
[ Merge of http://go/wvgerrit/199050 ]

Fix to L3 renewal policy bypass attack:
OEMCrypto_DeriveKeysFromSessionKey cannot be called after a license is
loaded.

Re-generated L3 from oemcrypto-v19 branch.
Also needed to update a few tests because it now returns a different
error code.

Test: tested with
https: //widevine-internal-review.git.corp.google.com/c/cdm/+/196392
Bug: 334154045

Merged from https://widevine-internal-review.googlesource.com/197957

Change-Id: Id0e81123b140085654106e99a05ae2405091f101
2024-06-02 00:17:36 -07:00
Rahul Frias
c6e4b70ae7 Merge "Re-generate Android V L3 after renewal policy fix" into vic-widevine-dev 2024-06-02 07:14:24 +00:00
Vicky Min
df171c9d94 Fix clear lead integration tests
The original clear lead integration tests weren't following the flow of
the original bug because there was only one sample, so
DecryptMultipleSamples wasn't being called in the same way. This should
fix this.

Bug: 320785945
Merged from https://widevine-internal-review.googlesource.com/198137
(cherry picked from commit 4141e271d44c32da88dc0f02a0173fae0b45ead9)

Change-Id: Ia70e3fd78381d8d34261b95931fdb303f77f73fd
2024-06-02 07:06:03 +00:00
Yu Liu
4fa509a385 Add missing aconfig container field to vendor/widevine/libwvdrmengine
Bug: 330354107
Test: CI

Flag: NONE

Ignore-AOSP-First: It is easier to detect all the mismatch in internal
master.

Change-Id: Ib7f679e34521afcee7fae648415315f4cbab91d6
(cherry picked from commit a6f7ac137ca1ab00985c1eb8b3e96a647a5d8400)
2024-06-01 07:13:42 +00:00
Cong Lin
3122896ecb Re-generate Android V L3 after renewal policy fix
Merge of
https://widevine-internal-review.git.corp.google.com/c/cdm/+/199044

L3 builds created for this fix:
https://widevine-internal-review.git.corp.google.com/c/cdm/+/199050

Fix to L3 renewal policy bypass attack:
OEMCrypto_DeriveKeysFromSessionKey cannot be called after a license is
loaded.

System IDs:
build_arm_v() { build_arm_with_id 33097; }
build_arm64_v() { build_arm64_with_id 33098; }
build_x86_v() { build_x86_with_id 33099; }
build_x86_64_v() { build_x86_64_with_id 33100; }

Test: tested with
https: //widevine-internal-review.git.corp.google.com/c/cdm/+/196392
Test: run_level3_static_tests
Test: run wvts on Pixel7
Bug: 334154045
Change-Id: Ib188d0a37a2193f56dfd287e2f0274ba65bd7b3e
2024-05-31 17:42:58 +00:00
Robert Shih
0880898d99 Allow system user csr access
Bug: 296971609
Test: Oppo rkp_factory_extraction_tool
Change-Id: I0e51bc52cc269e69fb3d3f056dfa7fbaa414e6a5
2024-05-31 10:22:22 -07:00
Rahul Frias
0500d27ce5 Fix LicenseRenewalSpecifiedServer for SDK servers
[ Merge of http://go/wvgerrit/197972 ]

The test only needs to verify that the license has a renewal
server url. It does not need to fetch a renewal from that url.

bug: 338103523
Change-Id: I1513f8692089c3f51a53ffd6ecb62348702b8fb8
2024-05-30 10:48:53 -07:00
Rahul Frias
d926fb31ec Address missing dependencies or executables
[ Merge of http://go/wvgerrit/195850 ]

Since Widevine device builds now include APEX prebuilts,
shared library dependencies for the prebuilts are in
are in /apex/com.google.android.widevine/lib[64] rather
than /system/lib[64] or /vendor/lib[64]. When tests are
run not all the dependencies are present.

These changes include
* Statically linking missing dependencies
* Adding /apex/com.google.android.widevine/lib[64] to
  the shared library path
* Searching for some of the test executables in
  /data/nativetest[64]/vendor/

Bug: 329888778
Bug: 329891889
Bug: 329891175
Bug: 329891049

Test: ./build_and_run_all_unit_tests.sh
Change-Id: I067685cedc7701c4e6502bdac98b53e22b61ad1e
2024-05-10 18:17:10 -07:00
Vicky Min
d53caaade2 Skip entitlement session test that is only supported on CAS devices
Bug: 335398236
Merged from https://widevine-internal-review.googlesource.com/197432
(cherry picked from commit a35129440254c91a261903e499e3f2417425cfb0)
(cherry picked from commit 87d58f48d62dbc4cdbb6c2af1c5a7bda2e209efa)

Change-Id: I7f67dfbc8725cbe0a67d8eda082fa184286d2e84
2024-05-10 18:15:16 -07:00
Fred Gylys-Colwell
1f3c38d6a3 Update request url
The test server for UAT and for the SDKs now accept the same
url format for renewals.

Bug: 328763985
Change-Id: I1a58412047735efa26da7986bf19fa9a7fbaf374
2024-05-10 15:03:17 -07:00
Vicky Min
1c6ec56725 Update DecryptZeroSizeSubSample test to accept success or error
Bug: 338010108
Merged from https://widevine-internal-review.googlesource.com/198002

Change-Id: I52c72a5c1a287e8556a243b6072faf23ce4bbdad
(cherry picked from commit 8b806d128e450ab0bf9cba17e21b5ed5ff97c277)
2024-05-10 17:24:37 +00:00
Rahul Frias
c4bb374653 Merge "Update ODK version to 19.1" into vic-widevine-dev 2024-04-26 23:50:25 +00:00
Treehugger Robot
874fbfff5f Merge "Revert "Add SCP support for Android files"" into vic-widevine-dev 2024-04-22 20:04:16 +00:00
Spandan Das
1caf26737b Use prefer for source vs prebuilts selection of widevine
widevine currenty uses `use_source_config_var` and product variables to
ensure that products gets the correct selection of source or prebuilts
of widevine apex.

`use_source_config_var` is being deprecated from Soong to unfiy the
mechanisms for source vs prebuilt selection. This CL transitions
widevine to a different mechanism `prefer` for prebuilt selection to aid
the deprecation.

Test: lunch cf_x86_64_phone-trunk_staging-userdebug; m nothing; aninja
-t path droid
vendor/widevine/libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks;
// no path exists, i.e. uses source

Test: lunch osprey-trunk_staging-userdebug; m nothing; aninja -t path
droid vendor/widevine/libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks;
// path exists; i.e. uses prebuilts

Bug: 332379718

Change-Id: I78800aee49f1de83ea2ce8160923362871806d87
2024-04-18 18:25:20 +00:00
Rahul Frias
c5a48e1cf3 Merge "Fix default cipher mode for CAS unit test" into vic-widevine-dev 2024-04-18 07:18:38 +00:00
Rahul Frias
e24c8dcb86 Revert "Add SCP support for Android files"
This reverts commit 95b50d39ba.

Reason for revert: Rikers changes should go on main. We can decide that partner OEMs can pick up this feature for V once it has been well tested on main.

Change-Id: I129303cbc86e267aba013a7c314724e51477dc82
2024-04-17 01:41:01 +00:00
Jacob Trimble
95b50d39ba Add SCP support for Android files
SCP uses the JNI headers in generated code, so several targets need
the include path; this will have no effect on non-SCP builds.  Also,
in "protected" builds, there is a generated library that needs to be
linked in the final binary, but this doesn't exist in the "analysis"
step; we create an empty static library if it doesn't exist so it works
on all cases.

Merged from https://widevine-internal-review.googlesource.com/169850

Merged from https://widevine-internal-review.googlesource.com/176177

Bug: 262635528
Change-Id: Ib676d55efbcbec81de9c3123bc70afb570d6caa5
(cherry picked from commit b9482eb23c261788a4432de7566f1b1de1cf9379)
2024-04-16 20:48:35 +00:00
Matt Feddersen
985eaacfb9 Update ODK version to 19.1
[ Merge of http://go/wvgerrit/195352 ]

PiperOrigin-RevId: 618915151
Merged from https://widevine-internal-review.googlesource.com/195050

Change-Id: Ieff901a961c3f965497b62a655c3ddb536e112a0
2024-04-16 10:59:48 -07:00
Cong Lin
c33960cb7c Fix default cipher mode for CAS unit test
[ Merge of http://go/wvgerrit/194571 ]

Default to OEMCrypto_CipherMode_CBC instead of OEMCrypto_CipherMode_CENC
which is not used by CAS.

Test: CAS unit tests
Bug: 325639114
Bug: 322928572
Merged from https://widevine-internal-review.googlesource.com/193650

Change-Id: I8876d5262643015fb6a322eae6444ef4001d146d
2024-04-16 10:25:38 -07:00
Android Build Coastguard Worker
b30452a3f6 Make change and version bump to ZV1A.240402.001
Snap for 11660751 from 670a481e6f to trunk-widevine-release

Change-Id: Ia5bcb9382fc5d2d15af4a7593c108e699b9fa176
2024-04-02 23:02:03 +00:00
Treehugger Robot
670a481e6f Merge "Remove unnecessary "_external" suffix from libcppbor" into main 2024-04-01 18:50:02 +00:00
Kalesh Singh
b95370a746 Merge "widevine_generic: Set max page size 16k" into main 2024-04-01 18:05:08 +00:00
Kalesh Singh
d9079fb300 widevine_generic: Set max page size 16k
Bug: 322391670
Change-Id: Ic5a9c6e33e675d33138127915c6ab9910742f6d7
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
2024-04-01 18:04:59 +00:00
Shawn Willden
688a572357 Remove unnecessary "_external" suffix from libcppbor
Test: Build
Change-Id: I8e4d65bafe9d4b4bbc576c8c9c995bddf0a957a2
2024-04-01 10:24:45 -06:00
Kyle Zhang
6033e52b3d Merge "Integration tests to verify clear lead content plays successfully" into main 2024-03-29 04:39:46 +00:00
Treehugger Robot
c482048f00 Merge "Bump version to 19.1.0 and update OPK changelog" into main 2024-03-28 23:50:08 +00:00
Kyle Zhang
3c3e7cdb47 Merge "Label unused parameters in ODK" into main 2024-03-28 23:37:50 +00:00
Kyle Zhang
85223cf29a Merge "Lock v19.1 API" into main 2024-03-28 23:26:55 +00:00
Treehugger Robot
2b80494f57 Merge "Add BCC extract tool for BCC uploading test" into main 2024-03-28 23:04:05 +00:00
Matt Feddersen
daa6f5f738 Bump version to 19.1.0 and update OPK changelog
Merged from https://widevine-internal-review.googlesource.com/194911

Change-Id: I366df6f46622d6333e7f77cbef3cb5dc9b1d2710
2024-03-28 14:26:50 -07:00
Vicky Min
d05d3738b4 Integration tests to verify clear lead content plays successfully
Also added a unit test to verify that decryption without a license fails
with the correct error code. Also changed comment types for policy
integration tests and core integration tests to be picked up by Doxygen.

Bug: 320785945
Merged from https://widevine-internal-review.googlesource.com/194910

Change-Id: Ibdb70683003bb430dde9b4a1bd9fc9839bace342
2024-03-28 14:09:01 -07:00
Matt Feddersen
fb1554a10b Lock v19.1 API
Merged from https://widevine-internal-review.googlesource.com/195130

Change-Id: I44760c19bc1457017ffacdda5f3c40f4a66edccb
2024-03-28 14:04:35 -07:00
John Bruce
53d0f5cd6a Label unused parameters in ODK
This is necessary so we can remove `-Wno-unused-parameter` in the CDM and OPK builds.

PiperOrigin-RevId: 618255022
Merged from https://widevine-internal-review.googlesource.com/194110

Change-Id: I67b9b8cd27422c4b62d361d627fd1c05ed0cbdef
2024-03-28 13:57:46 -07:00
Android Build Coastguard Worker
44437eb40f Make change and version bump to ZV1A.240326.001
Snap for 11630212 from ee77a96d74 to trunk-widevine-release

Change-Id: I883796fc638ca2f52102d9b636b2ec1c7d1964bb
2024-03-26 23:31:34 +00:00
Treehugger Robot
24027c5ebf Merge "Quit test setup when test is skipped" into main 2024-03-26 23:00:40 +00:00
Rahul Frias
ee77a96d74 Merge changes I55b1eb04,I839db69a,I43e845b8,I56b6d301,Ia59bfacf, ... into main
* changes:
  Unit tests for forbidden RSA key usage
  Add DRM reprovisioning request generation
  Correct copyright header
  Fix bcc length for printing
  Update ODK version to 18.4
  Adjust skipping tests when provisioning skipped
  Change test storage to use protobuf
  Remove WvCdmEnginePreProvTestStaging
  Rename and clarify Drm Reprovisioning token types
2024-03-26 06:09:26 +00:00
Treehugger Robot
284b6bef68 Merge "Skip License Release tests when there is no usage table" into main 2024-03-25 20:04:28 +00:00
Fred Gylys-Colwell
202350959d Quit test setup when test is skipped
The SetUp for child classes do not automatically quit when
the parent SetUp is skipped.

Bug: 305093063
Change-Id: I606a949ef0e94fa87a97268856b7f2d8b9135ebe
2024-03-21 16:58:05 -07:00
Alex Dale
f7944b4dac Merge "Update support for HDCP levels on Android and CE CDM." into main 2024-03-21 21:00:59 +00:00
Cong Lin
1fd5a8bf37 Add BCC extract tool for BCC uploading test
Extract BCC and build info from oemcrypto, construct BCC uploading
record and dumps it out a JSON file.

The BCC uploader will pick up the output file later.

Bug: 312787974
Change-Id: Ie8ef6a75408e8ef8355b1c0de14532de0ae83732
2024-03-21 13:35:46 -07:00
Vicky Min
c001e2f5a4 Skip License Release tests when there is no usage table
Bug: 330364107
Merged from https://widevine-internal-review.googlesource.com/194574

Change-Id: I25db60e239b157d736d89506280c3d218215fb6f
2024-03-21 11:46:42 -07:00
Rahul Frias
a798692e4e Unit tests for forbidden RSA key usage
[ Partial merge of http://go/wvgerrit/188279 ]

This CL adds unit tests to verify that the following
forbidden uses of an RSA private key do not work:

- ForbidPrepAndSign -- A cast cert key cannot sign a license
  request.
- ForbidUseAsDRMCert -- A cast cert cannot be used with the
  DRM cert's padding scheme and it cannot be used to derive
  keys from a session key.
- *ForbidRSASignatureForDRMKey* -- A DRM cert key cannot be
  used with GenerateRSASignature.
- *OEMCertForbidGenerateRSASignature* -- An OEM cert key
  cannot be used with GenerateRSASignature.

Bug: 251875110
Test: WVTS
Change-Id: I55b1eb04465023352edea55ba4ef532d1cd07231
2024-03-20 23:59:55 -07:00
Rahul Frias
b3157f2328 Add DRM reprovisioning request generation
[ Merge of http://go/wvgerrit/192010 ]

Adding files not merged in ag/26501922

Updates the CDM to add support for DRM reprovisioning request creation.
- Load the baked-in certificate for use as the client token.
- Add functions to build and sign a drm reprovisioning request.
- Update the Rikers L3 OEMCrypto implementation to support signing
  provisioning requests and getting embedded certificate.
- Update client id token to handle DRM reprovisioning.
- Add OEMCrypto function to load the baked-in device certificate in
  Rikers CDMs and stubs for non-Rikers CDMs.
- Add dynamic adapter support for getting embedded device certificate
  only on L3.

Bug: 305093063
Test: WVTS
Change-Id: I839db69a48c1add196f9b56e6ee3812f549f814d
2024-03-20 23:30:26 -07:00