Kyle Zhang
c48d2d8ea6
Add new release apex set 12498615
...
Bug: 324294223
Change-Id: I97d29ff5d38edb1d7b8c603428cf224d7cd9e7d9
2024-10-15 18:34:59 +00:00
Kyle Zhang
d73997bc0b
Revert "Limit output buffer size during decrypt fallback"
...
Revert submission 28914157
Reason for revert: b/372348308
Reverted changes: /q/submissionid:28914157
Change-Id: Ib77156ffe6abed0f8feee5d9f60f24a90e749ff8
2024-10-14 22:28:42 +00:00
Alex Dale
f1da7b637d
removeOfflineLicense() respects plugin security level.
...
[ Merge of http://go/wvgerrit/208470 ]
The MediaDrm plugin API removeOfflineLicense() would check both
L1 and L3 for the offline license. While this is generally acceptable,
apps might force set L3 via the setStringProperty(), which should
cause the DRM plugin to behave as if it is L3 only.
This change will cause the WVDrmPlugin only remove L3 key set IDs while
in L3 mode. L1 key set IDs in this case will be treated as non-existing.
Bug: 357863269
Bug: 372105842
Test: DRM Compliance ATP via ABTD
Test: libwvdrmdrmplugin_hal_test on Oriole
Change-Id: I81dddbacaee28da6c0a94527b0e390e86f55f81f
(cherry picked from commit 0aa6aad1af
2024-10-12 00:02:46 +00:00
Alex Dale
71fce8f352
getOfflineLicenseKeySetIds() respects plugin security level.
...
[ Merge of http://go/wvgerrit/208430 ]
The MediaDrm plugin API getOfflineLicenseKeySetIds() was listing
both L1 and L3 offline licenses. While this is generally acceptable,
apps might force set L3 via the setStringProperty(), which should
cause the DRM plugin to behave as if it is L3 only.
This change will cause the WVDrmPlugin list L3 only if the app had
set the security level to L3.
Bug: 357863269
Bug: 372105842
Test: DRM Compliance ATP via ABTD
Test: libwvdrmdrmplugin_hal_test on Oriole
Change-Id: I1a6e10b7eb880eef4ba36ed31b12ebfe8617f002
(cherry picked from commit 26b888b094
2024-10-12 00:02:06 +00:00
Alex Dale
894beae755
Merge "Fixed HLS parsing of bad content IDs." into vic-widevine-dev
2024-10-03 20:29:46 +00:00
Cong Lin
2ad9f624b8
Merge "Add "bootCertificateChainSignature" to Drm plugin getPropertyByteArray()" into vic-widevine-dev
2024-10-03 18:19:37 +00:00
Kyle Zhang
7cecdb163c
Merge "Drop Widevine apex prebuilt files for release 12439404" into vic-widevine-dev
2024-10-02 19:29:19 +00:00
Alex Dale
380148e3e6
Fixed HLS parsing of bad content IDs.
...
[ Merge of http://go/wvgerrit/207457 ]
When parsing Widevine's HLS key data, the key details are contained
in a data URI in the HLS X-KEY URI field. The data of the URI is a
base64 encoded JSON object, containing the information required to
generate the license request. The "content_id" field of the JSON
object is expected to be a base64 encoded; however, the HLS parser
did not verify that the decoding was successful. In the event that
was not successful, the decoder would return an empty string, which
the parser would attempt to access the first element by reference
which may be a null reference.
In C++, creating a reference from a null point (without actually
accessing the value) is undefined; however most C++ implemenations
will not cause a segment fault; but it is not guarenteed by the
standard.
This change checks if the decoding was successful before attempting
to store the decoded "content_id" value.
A unit test is added to ensure that a parser fails gracefully.
Bug: 356210640
Test: HlsParseTest.BadHlsData_InvalidContentId
Change-Id: Ie2ad42d69953258659178dd1464d830b2723c6c7
2024-10-01 21:14:19 -07:00
Cong Lin
d92d3a884d
Add "bootCertificateChainSignature" to Drm plugin getPropertyByteArray()
...
This allows Widevine RKP HAL to query BCC signature via DRM interface
during BCC extraction for remote provisioning phase 3. The query returns
the "additional_signature" field from
OEMCrypto_GetBootCertificateChain().
Test: Manual BCC extraction on Pixel 9
Bug: 355160637
Change-Id: I1a310a80c0cfef82ee3697f06c1293d5c1c3896a
2024-10-02 00:43:54 +00:00
Kyle Zhang
02c4b721f5
Add new release apex set 12439404
...
Bug: 324294223
Change-Id: I6026a57a55c2d6f7965d4b2c0befded3cfa9accd
2024-10-01 23:42:25 +00:00
Kyle Zhang
034919b6a0
Drop Widevine apex prebuilt files for release 12439404
...
The following files have been updated as part of this change:
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.lazy
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.lazy
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.lazy
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.lazy
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.lazy-12439404.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.lazy
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.lazy-12439404.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.lazy
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.lazy-12439404.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.lazy
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.lazy-12439404.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.lazy
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.nonupdatable-12439404.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.nonupdatable-12439404.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.nonupdatable-12439404.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.nonupdatable-12439404.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190241001
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
The change is generated with prebuilt drop tool.
Change-Id: I7c6fc37d98b0febdc4934b70390f16497e5bc4d4
2024-10-01 23:36:08 +00:00
Robert Shih
4ef3e2cee8
Remove level1_failed_ cache
...
Bug: 313497311
Test: Samsung QA
Change-Id: Ic3bddf5340f37a19bd44800681fec6f0c0520d19
2024-09-30 17:27:56 +00:00
Cong Lin
22256e145c
Merge "Fix test message format for cast receiver" into vic-widevine-dev
2024-09-25 17:10:24 +00:00
Kyle Zhang
6c9eb3f981
Merge "Respect TARGET_BUILD_PACKAGE_WIDEVINE to build widevine apex" into vic-widevine-dev
2024-09-20 21:00:23 +00:00
Cong Lin
0ea1b8f8fd
Fix test message format for cast receiver
...
Merge of https://widevine-internal-review.git.corp.google.com/c/cdm/+/206431
Message to be signed by CAST funciton is supposed to be in a certain
format: "constant prefix + SHA1(message)".
Some of our current CAST tests uses random message which break this
specification. This fixes the input message.
Test: Cast tests with run_fake_l1_tests
Bug: 359893908
Change-Id: I6b318d749971d837f13daa7b147313e8e0b1d3d0
2024-09-12 18:07:37 +00:00
Vicky Min
51944dc331
Allow key_session to be set to oec_session when creating entitled key
...
session
Bug: 358042250
Change-Id: If636f252aec6c95e23a91ee410f9cadf0ebad5d9
(cherry picked from commit 232d01b83abb6fe9ff9f4148bf79dc5dab8ee946)
2024-09-09 18:02:32 +00:00
Rahul Frias
d27b58202e
Merge changes I58806276,Ic112b459 into vic-widevine-dev
...
* changes:
Clang format long line
Update test data for entitled license test
2024-09-09 17:12:40 +00:00
Vicky Min
e642847b81
Update license holder to handle Android license releases
...
Since the CDM engine handles license releases for CE CDM and Android
differently, this changes the license release test to accomodate for
that.
Bug: 348712053
Change-Id: Ibc768e5d5c31ef8c2226b63dc622ffabfc0591fe
2024-09-04 19:33:16 +00:00
Kyle Zhang
4ec936167d
Respect TARGET_BUILD_PACKAGE_WIDEVINE to build widevine apex
...
Bug: 358666871
Bug: 347658720
Change-Id: I49bdc4f20b8b423947f14f81d5f83b4e0bfd6280
2024-09-03 18:34:01 +00:00
Fred Gylys-Colwell
b0bf7187f0
Clang format long line
...
Error not found in go/wvgerrit/199931
Change-Id: I58806276ab0a710444f6632d4c824607b8ebd17c
2024-08-23 23:26:37 -07:00
Fred Gylys-Colwell
135d6c608d
Update test data for entitled license test
...
A new set of license data was created on UAT so that we
could have keys that match those in the license returned by
a License SDK and by those generated by UAT.
It should be more clear now which data is just made up, and
which data has to match some golden values based on the made
up data.
Bug: 338323091
Test: WVTS
Change-Id: Ic112b4594afb99c6f43e011f59ee7592d4809189
2024-08-23 23:26:28 -07:00
Kyle Zhang
1a036457ee
Merge "Respect RELEASE_PACKAGE_WIDEVINE in device.mk" into vic-widevine-dev
2024-08-23 06:52:48 +00:00
Kyle Zhang
077c1133da
Respect RELEASE_PACKAGE_WIDEVINE in device.mk
...
Bug: 338239204
Change-Id: Ib1f6a6438c70155ae4cb05afb0f132055697372d
(cherry picked from commit 6964a3aad6b30476b904592be046cbaa371a61c9)
2024-08-21 18:25:42 +00:00
John W. Bruce
0b47bd6a50
Increase size of BCC buffer in OEC tests
...
We are receiving reports from partners in the field that they are
failing the OEMCrypto tests only because the tests assume the BCC will
fit into 5k of memory but their BCC is nearly 8k in size.
This patch increases the buffer to 10k.
Bug: 354834629
Test: x86-64
Merged from https://widevine-internal-review.googlesource.com/204773
Change-Id: I360196518b7651139c003505253d1aed6a0c3907
2024-08-21 05:12:51 +00:00
John W. Bruce
a5bce8122e
Limit output buffer size during decrypt fallback
...
This is based on a patch submitted by Amlogic.
When we're doing decrypt fallback, either in the CDM or the OEMCrypto
tests, we sometimes fall back to a point where we're synthesizing new
samples and/or subsamples for the content being decrypted. When this
happens and the output buffer is clear, we should limit the size of the
output buffer to only the space needed to hold the output.
Previously, we've been passing the entire output buffer to every call.
This can create a problem if the reason for the fallback is a lack of
enough memory to communicate the buffers to the TA, since the output
buffer will remain the same size as the total output. Restricting the
buffer passed to each call to only the space needed by that call will
reduce the memory requirement.
Bug: 354834629
Test: x86-64
Merged from https://widevine-internal-review.googlesource.com/204810
Merged from https://widevine-internal-review.googlesource.com/204953
Change-Id: I412f43d8f88c72072ef1dd5293436bdb58e500b3
2024-08-21 05:11:49 +00:00
John W. Bruce
5a4a8fdede
Remove OEMCryptoLicenseTest.RejectCbc1API16
...
This test should have been removed in v17, when we allowed this pattern
to be used with cbcs. Although we can't start enforcing the correct
behavior until v20 now, we can remove enforcement of the incorrect
behavior.
Bug: 356173926
Merged from https://widevine-internal-review.googlesource.com/204832
Merged from https://widevine-internal-review.googlesource.com/204870
Change-Id: Idc6e3109286daabb83874d52ad3abaff5e14badb
2024-08-21 05:10:09 +00:00
Cong Lin
27bc52e3f4
Filter increment counter tests for L3
...
Since L3 doesn't support license/prov counters yet.
Test: run_level3_static_tests
Bug: 354822652
Merged from https://widevine-internal-review.googlesource.com/204153
Change-Id: I8d8cff20cb27d38d2b6169ec76f3a20ffda18461
2024-08-07 19:24:32 +00:00
John W. Bruce
41346502c0
Fix OEMCrypto documentation for (0,0) patterns
...
The docs on OEMCrypto_DecryptCENC() weren't updated correctly when we
allowed the (0,0) pattern in v17. This patch brings the header docs
in-line with the handwritten part of the devsite documentation.
Merged from http://go/wvgerrit/204630
Bug: 336330529
Change-Id: Ic6c81d8f04904b83c34fbc0235ebbae8705a4182
2024-08-01 16:32:09 +00:00
Kyle Zhang
38434032e1
Merge "Add new release apex set 12141839" into vic-widevine-dev
2024-07-29 23:01:21 +00:00
Kyle Zhang
979e2a46e1
Add new release apex set 12141839
...
Bug: 324294223
Change-Id: If139d31130c584f1a48b84c034a1dfa751ac880e
2024-07-26 21:37:06 +00:00
Kyle Zhang
69022525bb
Drop Widevine apex prebuilt files for release 12141839
...
The following files have been updated as part of this change:
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/com.google.android.widevine.lazy.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/com.google.android.widevine.nonupdatable.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.lazy-12141839.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.lazy-12141839.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.lazy-12141839.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.lazy-12141839.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.lazy
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.nonupdatable-12141839.apks[standalones/standalone-arm64_v8a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.nonupdatable-12141839.apks[standalones/standalone-armeabi_v7a.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.nonupdatable-12141839.apks[standalones/standalone-x86.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
libwvdrmengine/apex/prebuilt/release/com.google.android.widevine.nonupdatable-12141839.apks[standalones/standalone-x86_64.apex]
package: name=com.google.android.widevine.nonupdatable
versionCode=190240725
versionName=
platformBuildVersionName=15
compileSdkVersion=35
compileSdkVersionCodename=15
sdkVersion:34
targetSdkVersion:35
The change is generated with prebuilt drop tool.
Change-Id: Ieb903c8ec94e3f124f1aa2a7056e4dd6dfa07254
2024-07-26 21:30:53 +00:00
Kyle Zhang
8defa640ff
Add java path to args of dev_sign_bundle
...
Bug: 339855197
Change-Id: I61d2ea24570857c96fe0b1d273efc5c288386888
(cherry picked from commit 925fa55b4340cc57ced3da52e7d9d4a99ea5405d)
2024-07-16 06:26:25 +00:00
Kyle Zhang
c5f6bc0a95
Merge "Haystack: Forbid DeriveKeysFromSessionKey after a license is loaded" into vic-widevine-dev
2024-07-09 21:25:24 +00:00
Alex Dale
b282ec92b6
Improved SystemIdExtractor's opened/closed session behavior.
...
[ Merge of http://go/wvgerrit/201577 ]
[ Cherry-pick of http://ag/28133919 ]
VIC specific: No DRM reprovisioning support
The SystemIdExtractor did not properly define behavior when working
with opened/closed CryptoSessions. Due to the CryptoSession's class
dual role of being both a session and a general handle into the
crypto engine, small bugs relying on undefined behavior which happened
to return expected output allowed tests to pass.
This CL makes the following changes:
1) Have SystemIdExtractor verify caller expectations when session is
open.
2) Improved SystemIdExtractor to operate when CryptoSession is opened
or closed.
3) Updates several SystemIdExtractorTest cases to better test defined
behavior without relying on undefined behavior.
4) Better code comments; hopefully some which will help prevent future
misuse of the internal APIs.
Test: system_id_extractor_unittest on Oriole
Test: WVTS on oriole
Bug: 329713288
Change-Id: I65518fe62f43e8060ea752852eb08a3d7132e2a0
2024-07-02 14:24:37 -07:00
Treehugger Robot
11025293aa
Merge changes from topic "vic-drop" into vic-widevine-dev
...
* changes:
Add new dev apex set 11921200
Add new dev apex set 11775005
Add new dev apex set 11662047
2024-06-29 01:15:24 +00:00
Treehugger Robot
4cefe502bd
Merge "Drop Widevine apex prebuilt files for dev 11775005" into vic-widevine-dev
2024-06-29 01:15:24 +00:00
Treehugger Robot
a04ff05d64
Merge "Drop Widevine apex prebuilt files for dev 11921200" into vic-widevine-dev
2024-06-29 01:15:24 +00:00
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
