Commit Graph

4958 Commits

Author SHA1 Message Date
TreeHugger Robot
816f989bea Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 3889252bfc am: 2379c7664a am: a34288e1fe
Change-Id: I369e3216fc45cd66539e265df59e625409526ecd
2020-05-27 05:16:13 +00:00
TreeHugger Robot
0acdd25a3f Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: a22fc9fa8e am: 549a259ef9 am: 97ce58fdb6
Change-Id: I3ad608bffc37610c97ea3680ab371414b3b877b2
2020-05-27 05:01:14 +00:00
Automerger Merge Worker
921d55b551 Merge "Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 089fe5d90b" into rvc-d1-dev-plus-aosp am: a0eb7bfe04 am: f426b9a654
Change-Id: I7db894251c7eb3aaabc0c216fe6f4bda3e122679
2020-05-27 05:01:08 +00:00
TreeHugger Robot
3c7845e738 Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: fbd9ca7eca am: abb27ddfcd
Change-Id: Ibeb210572beb10d23bc3d71abc31d2514c526891
2020-05-27 05:01:01 +00:00
TreeHugger Robot
579cbdee6a Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: 2308e673b2 am: 743f9971b8
Change-Id: I982fd0461d3efbcb24de944ab220d93596153b49
2020-05-27 05:00:46 +00:00
TreeHugger Robot
34ce2e765a Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 55a8c8742a am: 5c24259ece
Change-Id: I216b0887cc7294d2db65159107d760c9967c9f56
2020-05-27 05:00:02 +00:00
TreeHugger Robot
a34288e1fe Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 3889252bfc am: 2379c7664a
Change-Id: I47ac491d8c5097d7372bcab1ca6667a48a8f01d8
2020-05-27 04:58:58 +00:00
TreeHugger Robot
97ce58fdb6 Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: a22fc9fa8e am: 549a259ef9
Change-Id: I70bba32884ed67ad8a798e7d50b5deddc6541966
2020-05-27 04:36:25 +00:00
Automerger Merge Worker
f426b9a654 Merge "Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 089fe5d90b" into rvc-d1-dev-plus-aosp am: a0eb7bfe04
Change-Id: Ifb4bb6af113f2adf2e0e8069652979b9c0e6eb40
2020-05-27 04:36:20 +00:00
TreeHugger Robot
abb27ddfcd Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: fbd9ca7eca
Change-Id: Ie1beabec62bfadfdce6b823c457f98494fcb13fa
2020-05-27 04:36:01 +00:00
TreeHugger Robot
743f9971b8 Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: 2308e673b2
Change-Id: Ie35b9c9c53204a75be5603a3e4f09d3f972415f1
2020-05-27 04:35:53 +00:00
TreeHugger Robot
5c24259ece Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 55a8c8742a
Change-Id: I00d6da020ac8817145e70961098f12cde0856c20
2020-05-27 04:35:37 +00:00
TreeHugger Robot
2379c7664a Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e am: 3889252bfc
Change-Id: I0fbddc068937bece40ab08ee99c73133b3ccb81d
2020-05-27 04:35:28 +00:00
TreeHugger Robot
549a259ef9 Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: a22fc9fa8e
Change-Id: I3a1441864c20a2aa34363ad29604b9af94e4dce1
2020-05-27 04:17:38 +00:00
Automerger Merge Worker
a0eb7bfe04 Merge "Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 089fe5d90b" into rvc-d1-dev-plus-aosp 2020-05-27 04:17:36 +00:00
TreeHugger Robot
2308e673b2 Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad
Change-Id: I2750207868d9444d83a627882d2c80d70767935a
2020-05-27 04:17:35 +00:00
TreeHugger Robot
e3a6cee1ed Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 089fe5d90b
Change-Id: I1eddafa565b76b571a54dfacb96e02b8049cdc33
2020-05-27 04:17:33 +00:00
TreeHugger Robot
fbd9ca7eca Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad
Change-Id: I0114b7dd12054575199c5eeb021617842f1d5b4a
2020-05-27 04:17:32 +00:00
TreeHugger Robot
55a8c8742a Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e
Change-Id: I78b3ed5fd43578fe750630d37ae774a871846d00
2020-05-27 04:17:20 +00:00
TreeHugger Robot
3889252bfc Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b am: 208a088e8e
Change-Id: I174696645e9885044023ad9177fcc6780d928178
2020-05-27 04:17:20 +00:00
TreeHugger Robot
5d92fea3cd Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c
Change-Id: I42333e7874df36f88c57cc40155719ef47f4f7df
2020-05-27 04:01:06 +00:00
TreeHugger Robot
63a473d645 Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b
Change-Id: I5b66b8d705d0f42b70b6ff3a2a7e0cdcae8ff97e
2020-05-27 04:01:00 +00:00
TreeHugger Robot
a22fc9fa8e Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c
Change-Id: Ifdefc4babbdef591b73c0afb7a76035148657523
2020-05-27 04:00:57 +00:00
TreeHugger Robot
5bedd9c4ad Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c
Change-Id: I992d0c2d9da83a6d192a019b1fca2c1b774bad92
2020-05-27 04:00:54 +00:00
TreeHugger Robot
089fe5d90b Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b
Change-Id: If61e903fb3b32cb9cf610511c07585eeb942f157
2020-05-27 04:00:28 +00:00
TreeHugger Robot
208a088e8e Merge "Start playback timer in integration tests" into rvc-dev am: 7534d9795b
Change-Id: I9e2aadbdbfa628e5987df9ea780c85f8a64e7b86
2020-05-27 04:00:22 +00:00
TreeHugger Robot
bd8e573e0c Merge "The Entitlement key map was not being cleaned up." into rvc-dev 2020-05-27 03:43:48 +00:00
TreeHugger Robot
7534d9795b Merge "Start playback timer in integration tests" into rvc-dev 2020-05-27 03:43:30 +00:00
John W. Bruce
b8e13cec2d OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately
(This is a merge of http://go/wvgerrit/100053.)

The OEMCrypto Unit Tests were previously deriving keys from the session
key as part of loading the test RSA key. This creates an invalid
function call order, since the OEMCrypto session will likely next be
used for actions that need to be done *before* deriving these keys. With
ODKiTEE, which is more strict about this order, all OEMCrypto tests were
failing.

Bug: 156655072
Test: OEMCrypto Unit Tests
Change-Id: Ibfede587da30cfff4a44a5e0687e4199b1430372
2020-05-27 01:19:48 +00:00
John Bruce
281209477d Merge "Allow CDM to Build With Recent GCC" am: 93217d4228
Change-Id: I1c257e6773c199ed70931e0d4996c2628be7ed04
2020-05-26 20:38:33 +00:00
John Bruce
93217d4228 Merge "Allow CDM to Build With Recent GCC" 2020-05-26 20:12:10 +00:00
TreeHugger Robot
1788897779 Merge "Merging changes from http://cl/312740650 to change buganizer component id to which odk fuzz scripts log any bugs." am: 7b477062af
Change-Id: Ifeb2a54868ee2c4893370f04651c38a6404f79c3
2020-05-21 23:48:15 +00:00
TreeHugger Robot
7b477062af Merge "Merging changes from http://cl/312740650 to change buganizer component id to which odk fuzz scripts log any bugs." 2020-05-21 23:35:54 +00:00
Fred Gylys-Colwell
b0480cfc11 Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d am: 88ef970b90 am: 56995ca921 am: 62a58acfb1
Change-Id: Ia21ce51ca66b7cae479304ec9e672fe3e863954d
2020-05-21 23:23:44 +00:00
Fred Gylys-Colwell
3064ad2f39 Update TimeRollbackPrevention unit test am: 75575418d0 am: d22ef11122 am: 0a165bbf44 am: 7e11f1c992 am: 1b95e27fa9
Change-Id: I1b857c52cb80bf40c6980723ce40a373a9140841
2020-05-21 23:23:34 +00:00
Fred Gylys-Colwell
1c635d28e3 Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d am: 51cf7e4668 am: 40e2e7fa08 am: cd4d4f564a
Change-Id: Ibca9b86e45a199ecf9b7f533004774059b2135be
2020-05-21 23:23:23 +00:00
Fred Gylys-Colwell
62a58acfb1 Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d am: 88ef970b90 am: 56995ca921
Change-Id: I10f9fbca4e43396910c705baf931a450a98eb952
2020-05-21 23:05:44 +00:00
Fred Gylys-Colwell
1b95e27fa9 Update TimeRollbackPrevention unit test am: 75575418d0 am: d22ef11122 am: 0a165bbf44 am: 7e11f1c992
Change-Id: Ie8e52278f3acb4efd0e69b52476bfa82cb080341
2020-05-21 23:05:38 +00:00
Fred Gylys-Colwell
cd4d4f564a Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d am: 51cf7e4668 am: 40e2e7fa08
Change-Id: I21b29668ed8a9b39e8a7679ed65281d14587bba3
2020-05-21 23:05:32 +00:00
Fred Gylys-Colwell
56995ca921 Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d am: 88ef970b90
Change-Id: Ied69efdc62e1b7cb07e41ca8d587f106191023b5
2020-05-21 22:54:57 +00:00
Fred Gylys-Colwell
7e11f1c992 Update TimeRollbackPrevention unit test am: 75575418d0 am: d22ef11122 am: 0a165bbf44
Change-Id: I273a55182d02bf1e3ce922dc481f5b84cee96324
2020-05-21 22:54:25 +00:00
Fred Gylys-Colwell
40e2e7fa08 Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d am: 51cf7e4668
Change-Id: I5e835996ad9f0290572d3da4c2106a4e5739c790
2020-05-21 22:54:18 +00:00
Fred Gylys-Colwell
0a165bbf44 Update TimeRollbackPrevention unit test am: 75575418d0 am: d22ef11122
Change-Id: Ia251d06305a373715303be4c315401552e8d44f9
2020-05-21 22:41:23 +00:00
Fred Gylys-Colwell
88ef970b90 Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d
Change-Id: I3cb29d5429ba53accf3709303df2f59cd2ef86f7
2020-05-21 22:41:21 +00:00
Fred Gylys-Colwell
51cf7e4668 Update TimeRollbackPrevention unit test am: 75575418d0 am: 7cd14be01d
Change-Id: Ifc0acc1b95a25f071bafdaf6474bdadfe594a483
2020-05-21 22:41:00 +00:00
Fred Gylys-Colwell
d22ef11122 Update TimeRollbackPrevention unit test am: 75575418d0
Change-Id: I1a0345208fcbce3a03798d9641725a67f218ea6f
2020-05-21 22:29:15 +00:00
Fred Gylys-Colwell
7cd14be01d Update TimeRollbackPrevention unit test am: 75575418d0
Change-Id: I3c6e54676e35581d0dfa255e230b7b4094f783bb
2020-05-21 22:29:14 +00:00
Fred Gylys-Colwell
86c4cc8dcd Update TimeRollbackPrevention unit test am: 75575418d0
Change-Id: I73ab91c2e7dc723d161468eb4149cd78d2edc723
2020-05-21 22:28:43 +00:00
Bharath Chandra Elluru
7664781685 Merging changes from http://cl/312740650 to change buganizer component
id to which odk fuzz scripts log any bugs.

Bug: b/157252243
Cricticque cl: http://cl/312740650

Test: This is a configuration change to change buganizer component Id.
No functionality testing involved.
Change-Id: I17e76c015b7fc264281aa32eae975165ec8e6bed

Change-Id: If0b8954c606f9359b45bccd5276703138d4e02f5
2020-05-21 14:36:50 -07:00
Fred Gylys-Colwell
75575418d0 Update TimeRollbackPrevention unit test
Merge from Widevine repo of http://go/wvgerrit/100110

The unit test TimeRollbackPrevention was broken for several
reasons. This CL reduces the test to its most basic functionality and
updates it to be compatible with a v16 oemcrypto.

This CL also adjusts the fake clock used by the buildbot to fake
sleeping backwards, so that the TimeRollbackPrevention test can also
be run on the buildbot.

Bug: 155773482
Bug: 79422351
Test: unit tests on buildbot, and on flame w/v16 modmock
Change-Id: I3027018b17b738281989e63ae6b0729757217d05
2020-05-20 13:47:28 -07:00