Commit Graph

7189 Commits

Author SHA1 Message Date
Fred Gylys-Colwell
2f45350921 Update oemcrypto unit tests version number
Merge from Widevine repo of http://go/wvgerrit/169074

And update a few scripts that check for version number.

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

Bug: 275264353
Test: luci tests
Change-Id: Ic3c16323e993075c9bfe206fc73bf82c0e67f65b
2023-03-28 20:30:22 +00:00
John "Juce" Bruce
8dd8fc5a79 Update CHANGELOG for late-breaking OPK v17.1.1 changes
Merge from Widevine repo of http://go/wvgerrit/169073

Due to the late-breaking maximum_minor_version change, we had to revise
the CHANGELOG on the release branch. This patch ports this change to the
development branches.

Bug: 275264353
Test: luci tests
Change-Id: I46a18bd05ad1ae2afc766eaaf39c563f82f4eeea
2023-03-28 20:30:22 +00:00
Fred Gylys-Colwell
d7ee89bab0 Filter Cast Reciver tests
Merge from Widevine repo of http://go/wvgerrit/169070

This turns on the cast receiver tests for any device that
claims to support this feature. Previously, we had to
explicitly request these tests on the command line.

But since they do not pass for Prov 4.0, we fitler them out
in this case and reference a bug tracking that work.

We also switch to using GTEST_SKIP to skip the tests instead
of modifying the GTEST_FILTER.

Bug: 251240681
Bug: 269310676
Bug: 259455058
Bug: 259454969
Merged from https://widevine-internal-review.googlesource.com/166497

Change-Id: I1bcd749243a474b3f638547aa43c2805e86731af
2023-03-28 20:30:22 +00:00
Matt Feddersen
803617b783 Document RSA keypair issue on OP-TEE 64-bit
Merge from Widevine repo of http://go/wvgerrit/169069
Merged from https://widevine-internal-review.googlesource.com/167604

Bug: 275264353
Test: luci tests
Change-Id: Ib77b2f7d3855779dd6d97696d6066ad361e6e416
2023-03-28 20:30:22 +00:00
Vicky Min
64521717d8 Use GTEST_SKIP to skip prov 3.0 tests
Merge from Widevine repo of http://go/wvgerrit/169068

We want to transition to using GTEST_SKIP to skip unit tests instead of
modifying the GTEST_FILTER variable. This does so for provisioning 3.0
tests.

Bug: 251240681
Merged from https://widevine-internal-review.googlesource.com/167498

Change-Id: I997e1051f3bd7925bc69cf1b269a5bbbae8031b7
2023-03-28 20:30:22 +00:00
John "Juce" Bruce
d3183f504e Remove V17 backwards-compatibility decrypt functions
Merge from Widevine repo of http://go/wvgerrit/169066

Now that we only have to support the v18 API, we can drop the v17
versions of these functions. For SelectKey, the new function fully
replaces it, so it has been removed. For the other functions, the v18
functions were calling the v17 functions previously. Now, they have been
rolled together.

These functions were not actually deprecated in the OEMCryptoCENC.h
header to allow OPK's serialization generator to still support them for
backwards-compatibility. Now that they are gone, this patch also
deprecates the functions.

Bug: 240995221
Merged from https://widevine-internal-review.googlesource.com/167338

Change-Id: I10261142121d4de8c96e2cd5fac570f7b536a82e
2023-03-28 20:30:22 +00:00
Vicky Min
54e6b3d45d Small changes to refactored unit tests
Merge from Widevine repo of http://go/wvgerrit/169064

This CL should cleanup some minor issues that existed after the initial
CLs refactoring the unit tests went in. The issues fixed should be:
1) duplicate decrypt tests
2) decrypt tests added to be run
3) removed unecessary header files
4) refactored some provisioning tests that I had previously overlooked

Bug: 253779846
Merged from https://widevine-internal-review.googlesource.com/167537

Change-Id: Ic474fbcf69a08c0482b5e74d0c80be2cd16702d8
2023-03-28 20:30:22 +00:00
John "Juce" Bruce
ea3d319879 Add CHANGELOG entry for OPK v17.1.1
Merge from Widevine repo of http://go/wvgerrit/169062

Bug: 269670984
Merged from https://widevine-internal-review.googlesource.com/167378

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

Change-Id: I309aff7aa0e7f662893f20e54975009c427a525f
2023-03-28 20:30:22 +00:00
Vicky Min
26aa378ca5 Refactor usage table tests
Merge from Widevine repo of http://go/wvgerrit/169061

Bug: 253779846
Merged from https://widevine-internal-review.googlesource.com/167477

Change-Id: I6046e59449700c8be05641f71dcbb2bba6ce493b
2023-03-28 20:30:22 +00:00
Vicky Min
6897bc1a1c Refactor decrypt unit tests
Merge from Widevine repo of http://go/wvgerrit/169052

Refactor the decrypt unit tests into a separate file.

Bug: 253779846
Merged from https://widevine-internal-review.googlesource.com/167180

Change-Id: I10a4a987b0d597f0c6d2953c0723bea4d790fb9c
2023-03-28 20:30:22 +00:00
Rahul Frias
b3a57e7375 Dump BCC on failed provisioning request
[ Merge of http://go/wvgerrit/168357  and http://go/wvgerrit/168177 ]

When we get an error from the provisioning server while
running a test, we should log extra provisioning
information.

Bug: 273990016
Test: GtsMediaTestCases
Change-Id: I44095261e07ae079c632873f254d8e6879bab8c3
2023-03-28 20:28:57 +00:00
Matt Feddersen
dbd5bd2a4d Update OPK v18 documentation
Merge from Widevine repo of http://go/wvgerrit/169050

- Update changelog
- Update copy parter files script to include linux port
- Update opk_partner_test script (used to make sure everything works out
  of the box) with third party dependencies, refactored downloads into
  a public setup.sh script
- Remove WTPI_BUILD_INFO from OPK makefiles and gyp files, since it is
  no longer needed
- Remove FILES.md since it is out of date and ree-sources.mk and
  tee-sources.mk satisfy the same purpose
- Add debug flag in comments for OP-TEE and Linux ports. As a hint for
  how to enable debug in OPK
- Remove oemcrypto_build_info.h since it is no longer needed. Move the
  XSTR macro it contained to oemcrypto_api_macros.h
- Add provisioning method macro to OPTEE and Linux build files to hint
  at how to build Prov 2 and Prov 4 using the same build files but
  different build-time values.

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

Bug: 275264353
Test: luci tests
Change-Id: I220e3296f631d895a7c4504454635fe396efc0a4
2023-03-28 20:28:57 +00:00
Fred Gylys-Colwell
e51bb19296 Refresh corpus for oemcrypto fuzz tests with modified format
Merge from Widevine repo of http://go/wvgerrit/165958
and  http://go/wvgerrit/165862

Bug: 275264353
Test: test only code

Change-Id: I30829ad72d58e2233f4cc9963d17cb07314b7720
2023-03-28 20:28:57 +00:00
Ian Benz
c579a79462 Fix null passed to memcpy in generic verify fuzz
Merge from Widevine repo of http://go/wvgerrit/169048

Do not generate a new signature during mutation if a key handle cannot
be retrieved by OEMCrypto_GetKeyHandle().

Bug: 275264353
Test: luci tests
Change-Id: I9a804328c4b6d3e50d14c3f9c71043e71a88e3da
2023-03-28 20:28:57 +00:00
Fred Gylys-Colwell
322355dbbf Update documentation for Cast
Merge from Widevine repo of http://go/wvgerrit/169044

Document changes needed for supporting cast and provisioning
4.0 at the same time.

Bug: 259454830
Merged from https://widevine-internal-review.googlesource.com/166459

Change-Id: Iebf50d856c18f29db66352041b2b0429c43bd594
2023-03-28 20:28:57 +00:00
Fred Gylys-Colwell
9e7877a95d Document lacking signature of Prov 3.0 message
Merge from Widevine repo of http://go/wvgerrit/169039

Bug: 243734378
Merged from https://widevine-internal-review.googlesource.com/166458

Change-Id: I3eae16d09cf42e554d450f746390744ef580ac03
2023-03-28 20:28:57 +00:00
Alex Dale
a12d64a257 Merge "Fixed test and log formatting for CdmResponseType." into udc-dev am: 5ed89d16e2 am: 0d4909b80d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22141214

Change-Id: I322508da13c3400a8faa9470b9926369549d2e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 20:12:51 +00:00
Alex Dale
0d4909b80d Merge "Fixed test and log formatting for CdmResponseType." into udc-dev am: 5ed89d16e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22141214

Change-Id: Ic2533872fdcfe0cdb33a59adf2fd49c225cd8c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 19:44:15 +00:00
Alex Dale
85997c0ac0 Merge "Fixed test and log formatting for CdmResponseType." into udc-dev am: 5ed89d16e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22141214

Change-Id: Ib52efd43666b2624b63e41a352b59937985edde0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 19:42:41 +00:00
Alex Dale
5ed89d16e2 Merge "Fixed test and log formatting for CdmResponseType." into udc-dev 2023-03-28 19:21:20 +00:00
Cong Lin
637372b6a2 Merge "Fix CSR in wv factory upload tool" into udc-dev am: b7280404bd am: 3ace58cdaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294062

Change-Id: I527a24edac55f7402b460a1fe66a9f2c45a4fa2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 19:18:27 +00:00
Jooyung Han
1f774c49df Set min_sdk_version for the Widevine APEX am: a4de7eb9b5 am: 95b76106f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22307320

Change-Id: Ic5bed986a085d7a8c0bf11558b4320ee29d5f798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 19:05:39 +00:00
Cong Lin
0238d0adc8 Merge "Fix CSR in wv factory upload tool" into udc-dev am: b7280404bd am: be32be97e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294062

Change-Id: I831de296514b5b863b9cb8d6fdee88eb990bd54a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 18:49:46 +00:00
Jooyung Han
6c2484518c Set min_sdk_version for the Widevine APEX am: a4de7eb9b5 am: 25833a3cf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22307320

Change-Id: I4b8818ef8dfe4b75b85cd2cd3c0d623485a1d487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 18:42:00 +00:00
Cong Lin
be32be97e9 Merge "Fix CSR in wv factory upload tool" into udc-dev am: b7280404bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294062

Change-Id: Ice7e07b02004a428c77485187d1882a8c325431d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 18:28:26 +00:00
Cong Lin
3ace58cdaf Merge "Fix CSR in wv factory upload tool" into udc-dev am: b7280404bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294062

Change-Id: I887c673683d3e55813d01a0f9a7ad3f6a3c76e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 18:19:58 +00:00
Kyle Zhang
ce1fb4f089 Integrate apex version info to Widevine CDM property
Bug: 272587114
Test: dumpsys android.hardware.drm.IDrmFactory/widevine -p
Change-Id: Ica99867511391c252b67f40162665380bd2d8740
2023-03-28 18:14:02 +00:00
Cong Lin
b7280404bd Merge "Fix CSR in wv factory upload tool" into udc-dev 2023-03-28 18:02:05 +00:00
Jooyung Han
25833a3cf6 Set min_sdk_version for the Widevine APEX am: a4de7eb9b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22307320

Change-Id: Ie1219f46b4e419d777fa554f28de24916722c22d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 17:39:21 +00:00
Jooyung Han
95b76106f3 Set min_sdk_version for the Widevine APEX am: a4de7eb9b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22307320

Change-Id: Ia6acded434b5c5b8a1991c2063830545481da971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 17:35:27 +00:00
Jooyung Han
a4de7eb9b5 Set min_sdk_version for the Widevine APEX
also remove `use_vndk_as_stable: true` to remove dependency to VNDK
libs.

Bug: 251299786
Test: build WV APEX with V and install it on U device
Change-Id: Ie7f7f9b699119478d4b33f95ab9e6ba7f459346c
2023-03-28 06:57:46 +00:00
Jooyung Han
5c0b508bdc Link dependencies statically am: 81171a7e75 am: 91496be299
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22302466

Change-Id: If4f18199d5f6fd5caf1dc30925b3b11447b88cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 06:19:39 +00:00
Jooyung Han
dc2cbfa975 Link dependencies statically am: 81171a7e75 am: 64845e114e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22302466

Change-Id: I66d3a86cddf9ab6414f8e2c328f2fd35df483254
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 06:18:35 +00:00
Jooyung Han
91496be299 Link dependencies statically am: 81171a7e75
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22302466

Change-Id: I9651e2bbc54e911885e5cb1955653f4d9e397209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 05:53:32 +00:00
Jooyung Han
64845e114e Link dependencies statically am: 81171a7e75
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22302466

Change-Id: Ie884238ed1477e35e3b80e8fd25253bdc21bf81d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 05:53:17 +00:00
Jooyung Han
81171a7e75 Link dependencies statically
This reduces the APEX size from 6754304 to 4378624.

Bug: 274818387
Test: m com.google.android.widevine
Test: adb install $OUT/vendor/apex/com.google.android.widevine.apex
Test: adb reboot
Change-Id: Ib31291e5ee35297b9d85120f5eca118ebf10f55f
(cherry picked from commit 78f0b81ece)
2023-03-27 23:43:17 +00:00
Cong Lin
6db1ae5167 Fix CSR in wv factory upload tool
Merge of https://widevine-internal-review.googlesource.com/c/cdm/+/169024

The CSR extracted by WV internal BCC extraction tool is missing a
field "unverifiedDeviceInfo". This is required by the RKP's device
uploading tool for the CSR to be accepted.

Also updated the size of the randomly generated challenge from 32 bytes
to 64 bytes, same as what is used by rpk_factory_extraction_tool.

Test: extracted CSR v2 and v3 and dry run uploading
Bug: 275075496
Change-Id: Icc776f810c81ac6589d82935950167925f95f906
2023-03-27 21:10:03 +00:00
Alex Dale
52bd76e0e2 Fixed test and log formatting for CdmResponseType.
[ Merge of http://go/wvgerrit/168397 ]

When CdmResponseType (enum) was transformed to CdmResponseType
(struct), the test printers where not updated to print the result
of failed comparisons.  In addition, several logs statements were
updated haphazardly, leaving inconsistencies and potential
compiler-specific behavior.

This CL replaces CdmResponseType std::string operator with a ToString()
method.  This is to make it consistent with Google's C++ style guide
on conversion operators vs methods.  The string conversion function is
now defined in wv_cdm_types.cpp instead of inline in the header file.

The PrintTo function has been implemented along with the other CDM
test printers in test_printers.cpp.

Bug: 273989359
Test: run_x86_64_tests
Test: MediaDrmParameterizedTests on redfin
Test: Forrest drm_compliance
Change-Id: Ibfaa17029046b75b1c8c278f7bd7e04a24379848
2023-03-27 11:21:45 -07:00
Jooyung Han
d73a9ac608 Merge "Link dependencies statically" 2023-03-27 06:21:36 +00:00
Automerger Merge Worker
4ccde4549a Merge "Remove some names am: bfa8d39a63 am: fc44dc5f8f" 2023-03-27 05:00:47 +00:00
Fred Gylys-Colwell
908a254f82 Remove some names am: bfa8d39a63 am: fc44dc5f8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22200007

Change-Id: I38f671cf20e1f31f98780e598fb0517ce48a38db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-27 05:00:44 +00:00
Fred Gylys-Colwell
7cac6766d3 Remove some names am: bfa8d39a63 am: 4450b67c36
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22200007

Change-Id: Ia80888770b7823a2506f2f210f7024e8fadd4801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-27 05:00:39 +00:00
Fred Gylys-Colwell
4450b67c36 Remove some names am: bfa8d39a63
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22200007

Change-Id: Iee7d035c851d9892a8c254c7a4e433730b4adc89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-27 04:34:53 +00:00
Fred Gylys-Colwell
fc44dc5f8f Remove some names am: bfa8d39a63
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22200007

Change-Id: I01045b5af37d598c67e71426ac4ffdc6047da8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-27 04:34:51 +00:00
Fred Gylys-Colwell
bfa8d39a63 Remove some names
Merge from Widevine repo of http://go/wvgerrit/168657

Some people who have left were still in OWNERS files and TODOs.

Bug: 274772704
Test: comments only
Change-Id: I583da815586e5ca52316b2e238d1c1bb3a5e919a
2023-03-27 02:45:01 +00:00
Fred Gylys-Colwell
3beaf0aaf9 Fix logging error type am: ab8c06906a am: 2de79a7ede
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21649733

Change-Id: I50170b50d63335041947c5185d165fa13c522593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 22:16:03 +00:00
Fred Gylys-Colwell
c5150faa6e Fix logging error type am: ab8c06906a am: 69d7e27b72
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21649733

Change-Id: Ia8f82d0271a4a148aab9c9a2e9b937561ce58bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 22:14:52 +00:00
Fred Gylys-Colwell
2de79a7ede Fix logging error type am: ab8c06906a
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21649733

Change-Id: I315e84089536f0af41fcea33dee8ece4d2a630e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 21:46:21 +00:00
Fred Gylys-Colwell
69d7e27b72 Fix logging error type am: ab8c06906a
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21649733

Change-Id: I6103161495f1b04f5e07c4c70ad96199ab659fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 21:46:11 +00:00
Jooyung Han
78f0b81ece Link dependencies statically
This reduces the APEX size from 6754304 to 4378624.

Bug: 274818387
Test: m com.google.android.widevine
Test: adb install $OUT/vendor/apex/com.google.android.widevine.apex
Test: adb reboot
Change-Id: Ib31291e5ee35297b9d85120f5eca118ebf10f55f
2023-03-24 15:27:40 +09:00