widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,990 Commits 2 Branches 0 Tags
1015e07fa6ea1cf4338d0a316987d71d5dc1858d
Commit Graph

4990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
1015e07fa6 Merge "Sync L3 headers in sc-dev" into sc-dev am: 5af95f48ed am: c03abd803e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14669194

Change-Id: Ia1a34bbf9345785b2a1de059170f01ea8967954e
 2021-05-26 00:36:11 +00:00
TreeHugger Robot
c03abd803e Merge "Sync L3 headers in sc-dev" into sc-dev am: 5af95f48ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14669194

Change-Id: I980597582e858da14aee587535fd310fbcb545bb
 2021-05-26 00:23:01 +00:00
TreeHugger Robot
5af95f48ed Merge "Sync L3 headers in sc-dev" into sc-dev 2021-05-26 00:02:54 +00:00
Fred Gylys-Colwell
479ef5ce8e Add fudge to duration tests am: 20833734e1 am: 0f39baa33c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14664668

Change-Id: Ibf53a3a65a7ee05700d7d4cad0909059fcd52816
 2021-05-25 22:40:04 +00:00
Fred Gylys-Colwell
05ae982332 Add fudge to duration tests am: 20833734e1 am: fd451af75b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14664668

Change-Id: I8966f72720a092701e0e15aeb19a75d7fcd82b68
 2021-05-25 22:38:14 +00:00
Fred Gylys-Colwell
fd451af75b Add fudge to duration tests am: 20833734e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14664668

Change-Id: I16f3d23c16e35dd01b6ff669b911f741b1397c68
 2021-05-25 22:23:58 +00:00
Fred Gylys-Colwell
0f39baa33c Add fudge to duration tests am: 20833734e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14664668

Change-Id: Icf3d6a82b7c537839dbee2d7dcb6145f8fc4b1b5
 2021-05-25 22:22:11 +00:00
Fred Gylys-Colwell
4ebcbda709 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev am: eaa1e6d4a0 am: 042a715e93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14486069

Change-Id: I7e004644cdc2e8f9f63675d11f48a2501eb12761
 2021-05-25 20:55:41 +00:00
Fred Gylys-Colwell
9a13a70164 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev am: eaa1e6d4a0 am: c6cfc6a296 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14486069

Change-Id: I0c7fa50afb40a5d2f4337dd9a1c229709556f3ad
 2021-05-25 20:53:54 +00:00
Fred Gylys-Colwell
c6cfc6a296 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev am: eaa1e6d4a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14486069

Change-Id: I9f470bb6e857fe9718a7989a33ba597401bbc8ec
 2021-05-25 20:38:06 +00:00
Fred Gylys-Colwell
042a715e93 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev am: eaa1e6d4a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14486069

Change-Id: Ie54dd7ffc4f354cb368fb23fbeb672feb67ad0f1
 2021-05-25 20:36:19 +00:00
Fred Gylys-Colwell
20833734e1 Add fudge to duration tests 
Merge from Widevine repo of http://go/wvgerrit/125046

Add some extra fudge to the termination time. This assumes that flaky
tests were caused by roundoff error.

Bug: 175741647
Change-Id: I9bcc86f9b9540e5985df647dd1b5c5d439556e2b
 2021-05-25 20:26:43 +00:00
Fred Gylys-Colwell
eaa1e6d4a0 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev 2021-05-25 20:19:49 +00:00
Alex Dale
e583f2213a Check for open session when initializing usage table. am: 023b06eded am: e0f31dc2b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14296026

Change-Id: I535702147bfadcc31e1ad5ca0e9e82cbe26fa5e6
 2021-05-24 21:47:47 +00:00
Alex Dale
f423cc7a4e Check for open session when initializing usage table. am: 023b06eded am: 51ec04bd43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14296026

Change-Id: I32551ce5190f240b1f2a0fe8a86688dbcd11c90e
 2021-05-24 21:46:38 +00:00
Alex Dale
51ec04bd43 Check for open session when initializing usage table. am: 023b06eded 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14296026

Change-Id: Id8abc3e56f0495edad72fffa20579887e1ae2045
 2021-05-24 21:32:39 +00:00
Alex Dale
e0f31dc2b5 Check for open session when initializing usage table. am: 023b06eded 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14296026

Change-Id: I4b0b46d585f99c492e30e608a0a18708fc40b042
 2021-05-24 21:30:44 +00:00
Cong Lin
d542cb91b5 Sync L3 headers in sc-dev 
Merge of these CLs from Widevine sc-dev:

modified:   libwvdrmengine/level3/include/clear_cache_function.h
  Add cache flush assembly for arm64 L3 to Android header | http://go/wvgerrit/124828
  Address compilation errors | http://go/wvgerrit/113083

modified:   libwvdrmengine/level3/include/level3_file_system_android.h
  Update Widevine Copyright header for android | http://go/wvgerrit/108084

Bug: 184866351
Test: Header changes for clearing cache is verified by one of the partners on their arm64 target;
https: //b.corp.google.com/issues/175432203#comment13

Change-Id: I0ac8f339f65d02abb3080020fbc715b9c0db85b2
 2021-05-20 14:56:20 -07:00
Alex Dale
023b06eded Check for open session when initializing usage table. 
[ Merge of http://go/wvgerrit/122984 ]

There was an issue encountered by some vendors with how the usage
table was initialized on some devices.  Previously, the CDM would
open an OEMCrypto session first, then initialize the usage table
(loading existing or creating a new one).  On these devices,
OEMCrypto_CreateUsageTableHeader() and OEMCrypto_LoadUsageTableHeader()
would fail if there were any open sessions.

This CL changes the initialization process to create/load the usage
table before opening an OEMCrypto session.

This change also lays the ground work for another usage table fix
to address GTS tests failure.

In the process, several of the functions for the usage table have been
split up into smaller chunks of code.  This required additional changes
to the usage table unittest to keep them up to date.

Bug: 169195093
Bug: 180639135
Test: Linux unittests and MediaDrmTest
Change-Id: Ifbf35f5d8cff5b89fea9b16edb998c84803f4fbe
 2021-05-19 10:39:51 -07:00
TreeHugger Robot
ea6f596e96 Merge "Validate decryption with entitled keys in OEC tests" into sc-dev am: e233e68de1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506727

Change-Id: Iae742c9f96d689c05970c8630555f03b976d351b
 2021-05-17 22:13:41 +00:00
TreeHugger Robot
69d18ebcf9 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev am: 418d322961 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506726

Change-Id: If04536a13255810ddcb9416ce17daec641fa7fcd
 2021-05-17 22:13:37 +00:00
TreeHugger Robot
e233e68de1 Merge "Validate decryption with entitled keys in OEC tests" into sc-dev 2021-05-17 22:09:52 +00:00
TreeHugger Robot
418d322961 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev 2021-05-17 22:09:21 +00:00
TreeHugger Robot
d49e3362ea Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev am: 4948331656 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I3101e409d3a14764a22b14db023dd93e364abd54
 2021-05-17 22:05:20 +00:00
Alex Dale
ce38cd3a5e [DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)" am: fe28d4cafc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I0b5496505deaab8d596fea3ec4f5804eb7b88824
 2021-05-17 22:05:20 +00:00
TreeHugger Robot
4948331656 Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev 2021-05-17 21:50:36 +00:00
Alex Dale
fe28d4cafc [DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)" 
This reverts commit 9f7e2c4413.

Reason for revert: Feature missed deadline

Bug: 135283522
Change-Id: I63eb0431762fd13c64bef926fb1e64b6edacb156
 2021-05-17 19:08:53 +00:00
John W. Bruce
d742daf9c7 Validate decryption with entitled keys in OEC tests 
(This change is merged from http://go/wvgerrit/124825)

The OEMCrypto tests have tests that verify that entitled keys can be
loaded but not that they can be successfully used for decrypt. This
patch adds a decrypt portion to the existing tests.

As part of this, the existing Session::EncryptCTR() method and portions
of Session::TestDecryptCTR() are lifted to be static functions so they
can be shared across unrelated classes in oec_session_util.cpp.
EncryptCTR() had no dependence on its enclosing class and is unchanged
other than being moved outside the class.

To reduce ambiguity with the new decrypt verification, this patch also
renames EntitledMessage::VerifyEntitlementTestKeys() to the
more-specific EntitledMessage::VerifyKCBs(). Its behavior is unchanged.

Bug: 186782279
Test: x86-64 platform
Test: opk_ta platform
Test: build_and_run_all_unit_tests
Change-Id: I15156882907b0987215087aaf43b4666fedc171a
 2021-05-11 12:52:24 -07:00
John W. Bruce
ed17d09c1b Remove asserts from GenerateSimpleSampleDescription() 
(This change is merged from http://go/wvgerrit/124824)

GenerateSimpleSampleDescription() only had asserts to check parameters
that only came from other test code, so they weren't testing anything of
use. With the asserts removed, it's no longer necessary to wrap calls to
GenerateSimpleSampleDescription() with ASSERT_NO_FATAL_FAILURE(), which
a lot of callers were already forgetting to do anyway. This also
simplifies a future patch that will generalize the decryption test code
to work with entitlement licenses.

Bug: 186782279
Test: x86-64 platform
Test: build_and_run_all_unit_tests
Change-Id: I987427fdfee4826d77ab95344f9aca8c374b2001
 2021-05-11 12:49:22 -07:00
TreeHugger Robot
14b30786d9 Merge "[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev" into sc-dev am: ddaae9a17b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494

Change-Id: I18c398e5c85161b1700461f962f51e1c72c8260e
 2021-05-10 22:19:13 +00:00
Cong Lin
3aee415125 [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev am: 22f8ee9498 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494

Change-Id: I88e6f7a369777d2347139378abd9a1e7e343a844
 2021-05-10 22:19:11 +00:00
TreeHugger Robot
ddaae9a17b Merge "[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev" into sc-dev 2021-05-10 22:02:06 +00:00
Fred Gylys-Colwell
d3942b242c LUCI: Add build fuzz tests script to presubmits 
Merge from Widevine repo of http://go/wvgerrit/123803

Update fuzz build script to use gyp from third_party folder.

Test: ran fuzz tests on luci
bug: 186271314
bug: 184866351
Change-Id: If530872aa1e60d2108932610415aa5315979390c
 2021-05-10 17:44:50 +00:00
Rahul Frias
361dbbe269 Merge "Disallow the ability to load offline licenses more than once" into sc-dev am: bb0b6b4ba5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14307365

Change-Id: If44b6b6e4bca49936efa3e76fd885774da0763e8
 2021-05-07 22:34:22 +00:00
Rahul Frias
bb0b6b4ba5 Merge "Disallow the ability to load offline licenses more than once" into sc-dev 2021-05-07 22:21:03 +00:00
Cong Lin
8eceff3037 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 8b84dd36a1 am: 5ed13c2c28 -s ours am: 1e032deed0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: Ib39d6a6434fef9d56005a87b72ef4175b604f574
 2021-05-06 22:31:05 +00:00
Cong Lin
b13379127c [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours am: 1fb5b4d68c am: 6514bde77e -s ours am: 1a3c6d7228 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: Ifface1d7fbd00cca3436ad185611cbc3b21ca376
 2021-05-06 22:30:47 +00:00
Cong Lin
1e032deed0 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 8b84dd36a1 am: 5ed13c2c28 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: I0d40134cf46b8362ada5feb640154a3c6d3de2c6
 2021-05-06 22:26:02 +00:00
Cong Lin
1a3c6d7228 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours am: 1fb5b4d68c am: 6514bde77e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: I140d768a4af03f7b5d9a216007a3b252ae27f28d
 2021-05-06 22:24:26 +00:00
Cong Lin
647ca0e3a0 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 5d1b215cb7 -s ours am: 23558d65b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: I50db61137856d3411757c5749fd154e4497852a0
 2021-05-06 22:22:10 +00:00
Cong Lin
23558d65b4 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 5d1b215cb7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: I3bb67f7b01ff3ac4522f0bfd5943e259c4d2c3bd
 2021-05-06 22:14:09 +00:00
Cong Lin
5ed13c2c28 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 8b84dd36a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: Iaf8cceab7ea631943c110149eb1bfdfd62830db2
 2021-05-06 22:13:30 +00:00
Cong Lin
6514bde77e [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours am: 1fb5b4d68c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: Ibe45158298b415d67de3132f598095d983d8af81
 2021-05-06 22:13:27 +00:00
Cong Lin
5d1b215cb7 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: I4ab4f7c5a15822960cd6f6c9d35e3292a726db40
 2021-05-06 21:57:38 +00:00
Cong Lin
8b84dd36a1 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: I6d284a16c6e5d40d0d39489d9853d032dec8e043
 2021-05-06 21:56:09 +00:00
Cong Lin
1fb5b4d68c [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours 
am skip reason: skipped by user conglin

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: Iab364aea4690819a484a8527e73dcc4e0da358d6
 2021-05-06 21:56:03 +00:00
Cong Lin
b777a01117 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 am: bc7c7a971d -s ours am: cff7fd681e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: I5b6d660d2fb28d475f694d3c1f29c4e133d034a6
 2021-05-06 21:55:56 +00:00
Cong Lin
cff7fd681e [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 am: bc7c7a971d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: I306847744a3a54ed68f63ae07b005302d66196ab
 2021-05-06 21:38:05 +00:00
Cong Lin
9fbcb7f1ba [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: I0ff731accf0aba941a7b0bffd237f21ec2e34891
 2021-05-06 21:37:22 +00:00
Cong Lin
bc7c7a971d [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: Ia2d991d9513e17b98944256297e4caaabc96dd21
 2021-05-06 21:21:40 +00:00