Commit Graph

4276 Commits

Author SHA1 Message Date
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
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
Fred Gylys-Colwell
e9dfca1219 The Entitlement key map was not being cleaned up.
Merge from Widevine repo of http://go/wvgerrit/100385

The map now contains unique_ptr instead of raw pointers
to ensure the memory is released.

Bug: 156780432 OEMCrypto Fuzzing: Fix OEMCrypto Memory Leak.
Test: oemcrypto reference code only
Change-Id: I78054f9207399f052d6e4bfdfa96824f6e050bac
2020-05-19 10:58:05 -07:00
Fred Gylys-Colwell
f6229788b0 Start playback timer in integration tests
Merge from Widevine repo of http://go/wvgerrit/100328

Several integration tests in WvCdmRequestLicenseRollbackTest had been
testing the duration of a license. However, the license they request
sets the playback duration and not the rental duration. That means the
timer we are checking does not start until the first playback. To fix
the tests, we simply add a decrypt operation right after the license
is received.

Test: integration tests w/v16 mod mock.
Bug: 156854660
Change-Id: Ie4f017c82db8aaf084ad050de3fcb7f51987c97e
2020-05-18 20:57:41 +00:00
John W. Bruce
bdd7b9d89f Allow CDM to Build With Recent GCC
(This is a merge of http://go/wvgerrit/100051. However, only one part of
that change affects the Android code, so I have filtered this
description.)

By default, the CDM builds with Clang on Android and on developers' dev
boxes. The buildbot builds most of the code with an old version of GCC.
However, recent versions of GCC were refusing to build our code for a
variety of reasons. This patch fixes the codebase up so that the
version of GCC 9 included on gLinux workstations can compile the CDM.

The only change that affects Android is that a variable was being set
but never read in one place.

Test: Android Unit Tests
Bug: 145245240
Bug: 152449437
Change-Id: Iaeb0531652bb8e7bd69f850fc6b4bba1efa3271b
2020-05-15 12:58:24 -07:00
Fred Gylys-Colwell
4a72eab468 License release does not use core message am: 760bf71908 am: 75cae91c79 am: 7ed988ef1f am: 460d045c59 am: f667ccaaef
Change-Id: I06a2142f708fc014e5e9d049630dbf34d07b59b2
2020-05-15 00:12:29 +00:00
Automerger Merge Worker
45a3932d02 Merge "License release does not use core message am: 760bf71908 am: 98ca694dcd am: 4c61d20ab1" into rvc-qpr-dev-plus-aosp am: c5faf0c749 am: 43e91fcfa1
Change-Id: Id5a85bf7267d6f1771bc4547c91ea589adb381a5
2020-05-15 00:12:25 +00:00
Fred Gylys-Colwell
891788fe3e License release does not use core message am: 760bf71908 am: 98ca694dcd am: fa074ccc04 am: 0d792297b5 am: 80f0967670
Change-Id: Iec33a0ba7b95692a6b2cb4ee7207b8cc58e8b919
2020-05-15 00:12:19 +00:00
Bharath Chandra Elluru
274fef2998 Merging Android odk fuzz changes to improve coverage from http://go/wvgerrit/99911 am: ac942791c9
Change-Id: I16629e376b0e45aefa59bd7273bdfb6552d957cb
2020-05-15 00:12:14 +00:00
Fred Gylys-Colwell
f667ccaaef License release does not use core message am: 760bf71908 am: 75cae91c79 am: 7ed988ef1f am: 460d045c59
Change-Id: I102833685bb7c3b0ec6f9c8d4596e03f9654dd59
2020-05-15 00:05:18 +00:00
Automerger Merge Worker
43e91fcfa1 Merge "License release does not use core message am: 760bf71908 am: 98ca694dcd am: 4c61d20ab1" into rvc-qpr-dev-plus-aosp am: c5faf0c749
Change-Id: Ibe0031b8b34f9b7935a351f9c6e6e4f235cc90ec
2020-05-15 00:04:52 +00:00
Fred Gylys-Colwell
80f0967670 License release does not use core message am: 760bf71908 am: 98ca694dcd am: fa074ccc04 am: 0d792297b5
Change-Id: Id11a9c55a032d71e6a067d8bb1817b9076194d29
2020-05-15 00:03:58 +00:00
Fred Gylys-Colwell
460d045c59 License release does not use core message am: 760bf71908 am: 75cae91c79 am: 7ed988ef1f
Change-Id: Ia60667ed4ee82d3b357b9b276dcc1bef755847df
2020-05-14 22:22:55 +00:00
Automerger Merge Worker
c5faf0c749 Merge "License release does not use core message am: 760bf71908 am: 98ca694dcd am: 4c61d20ab1" into rvc-qpr-dev-plus-aosp 2020-05-14 22:22:38 +00:00
Fred Gylys-Colwell
0d792297b5 License release does not use core message am: 760bf71908 am: 98ca694dcd am: fa074ccc04
Change-Id: I1d0e0ec4fbc9243caeaf4d80cc0804f865961258
2020-05-14 22:22:33 +00:00
Fred Gylys-Colwell
180627a34d License release does not use core message am: 760bf71908 am: 98ca694dcd am: 4c61d20ab1
Change-Id: I5d9a952587e16fe5a6cd12bcce8d20283c1b4e73
2020-05-14 22:22:28 +00:00
Fred Gylys-Colwell
7ed988ef1f License release does not use core message am: 760bf71908 am: 75cae91c79
Change-Id: I1aedd3a72479940d8a35d96f13e3c91031abf712
2020-05-14 22:05:45 +00:00
Fred Gylys-Colwell
fa074ccc04 License release does not use core message am: 760bf71908 am: 98ca694dcd
Change-Id: I303f3b4d8893f9d99f34f7db118588a7c433ed25
2020-05-14 22:05:22 +00:00
Fred Gylys-Colwell
4c61d20ab1 License release does not use core message am: 760bf71908 am: 98ca694dcd
Change-Id: I08a2f7065da8b9f8dada01ff241a3585a91fa889
2020-05-14 22:05:19 +00:00
Fred Gylys-Colwell
75cae91c79 License release does not use core message am: 760bf71908
Change-Id: I5c941e7813b880684b344e56fa84f01c2d0ca97f
2020-05-14 21:45:15 +00:00
Fred Gylys-Colwell
98ca694dcd License release does not use core message am: 760bf71908
Change-Id: Ief5646322d0311f44d9b1040bda5200fdfe76cee
2020-05-14 21:45:15 +00:00
Fred Gylys-Colwell
760bf71908 License release does not use core message
Merge from Widevine repo of http://go/wvgerrit/99843

When processing a license release, the license is not loaded, so
OEMCrypto does not know nonce version information for the core
message. It assumes that all license releases are v15, so it is not an
error for a license release to not have a core message.

This CL also adds some extra logging to tests so that we can track
content id and the pssh. This CL also updates some of the test content
policies when running the local license server. The local license
server is only used for debugging problems.

Bug: 152648172 Integration test WvCdmEngineTest.LicenseRenewal failing
Bug: 156259697 License release does not need core message
Test: Unit tests with v16 mod mock
Change-Id: I04c896adadfb17877ce1115345d2419e0d2489f0
2020-05-13 21:22:43 +00:00
Bharath Chandra Elluru
ac942791c9 Merging Android odk fuzz changes to improve coverage from http://go/wvgerrit/99911
Test: The changs have been made in google3 and fuzzer has been running
successfully with improved coverage
Critique CL: http://cl/310633618
Bug: b/155435131
Change-Id: Ib02601302db238ce8fbeb3963ce8e05e864ba985

Change-Id: I11eba4d1aa1536b44929b742a5e2c2bf89d818fb
2020-05-12 16:18:35 -07:00
TreeHugger Robot
aaf0e9c855 Merge "Merge Android odk fuzz changes(Adding corpus) from http://go/wvgerrit/98692" am: 437e8402ca
Change-Id: I9f33c49fc2cb3f81434e89da07c94ce1e52c7468
2020-05-01 22:17:39 +00:00
TreeHugger Robot
437e8402ca Merge "Merge Android odk fuzz changes(Adding corpus) from http://go/wvgerrit/98692" 2020-05-01 22:01:57 +00:00
Alex Dale
93e0bdc155 Update AddEntry() for usage table changes. am: 66e3d69300 am: 4c97abd57a am: 616b9a8489 am: 1f8f907e23 am: 3fc0009ec4 am: 340b1cb204
Change-Id: If41261e3e5cbd7738986b80b6e7447aebd6aeecf
2020-05-01 02:30:54 +00:00
Alex Dale
8f63ca4eaf Added a few edge case unittests for InvalidateEntry(). am: 1e5e221909 am: 51f5315a62 am: 41ed193982 am: 5f268e3508 am: 4468261953 am: 4a100f74ec
Change-Id: I470f425404fb0f1201c90760ff2b46dd2c2aa610
2020-05-01 02:30:53 +00:00
Alex Dale
756944362a Reworked DeleteEntry() into InvalidateEntry(). am: da48461ba2 am: 44cc2500b3 am: 9e0e33244c am: e89b38d75f am: 0c6ef193dd am: 8ac4eae437
Change-Id: I7c011bed7f162b641b9e2e2326d0b4334fc7e6e6
2020-05-01 02:30:52 +00:00
Alex Dale
763fc74c4b Update AddEntry() for usage table changes. am: 66e3d69300 am: 0a7e070618 am: aebce2017d am: 3804200ddf am: 89434272ef
Change-Id: I96aae69ef5ea1f77b373ac55a98611fb0193b5ea
2020-05-01 02:30:43 +00:00
Alex Dale
6cac7125e5 Added a few edge case unittests for InvalidateEntry(). am: 1e5e221909 am: 4793f1f1b3 am: 6088db2efa am: 58bcf2e370 am: 73edc6be79
Change-Id: I48797bef32442a6fa79e4e82299c213ad3790bc3
2020-05-01 02:30:42 +00:00
Alex Dale
317257b7c7 Reworked DeleteEntry() into InvalidateEntry(). am: da48461ba2 am: 49458c55d1 am: 5f944c1602 am: 9c3d5ff0d6 am: f9ab63f0f3
Change-Id: Ib2a6dea57169d647dd50deee4e33e132fbe67391
2020-05-01 02:30:40 +00:00
Alex Dale
55a21a2951 Update AddEntry() for usage table changes. am: 66e3d69300 am: 4c97abd57a am: c15d453a9d am: 7c56669a4f am: 373103998b
Change-Id: I2665bf7b027aeaf5c9f937032f7425f3c1b052bd
2020-05-01 02:28:48 +00:00
Alex Dale
5cbaeb7f78 Added a few edge case unittests for InvalidateEntry(). am: 1e5e221909 am: 51f5315a62 am: 069de13b94 am: a2dace6651 am: 7f0d79407c
Change-Id: I4a137871799d5e47c9645ed0e378de7a558f452f
2020-05-01 02:28:45 +00:00