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

4010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Gylys-Colwell
0000eef77d ODK: forward compatibility and nonce-free offline license support am: 8dc1d7a11d am: 5bb396fb72 am: c2920550ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11688972

Change-Id: I9be37c5e5461cf2cd43eaac653d33f12aa895c09
 2020-06-02 22:15:43 +00:00
Fred Gylys-Colwell
c2920550ed ODK: forward compatibility and nonce-free offline license support am: 8dc1d7a11d am: 5bb396fb72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11688972

Change-Id: Ia7a272da6d58ce201348782addb2a7d201b4ebda
 2020-06-02 22:01:26 +00:00
Fred Gylys-Colwell
5bb396fb72 ODK: forward compatibility and nonce-free offline license support am: 8dc1d7a11d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11688972

Change-Id: I61a70e52e875c017a706f1337d75405f19748dfa
 2020-06-02 21:49:17 +00:00
Fred Gylys-Colwell
8dc1d7a11d ODK: forward compatibility and nonce-free offline license support 
Merge of http://go/wvgerrit/101183

This is a combination of multiple commits from google3:
* http://cl/313814938
  ODK Version String
* http://cl/313962712
  ODK: accept messages with future API version numbers
* http://cl/312219187
  Ignore hash if initial load of license, and the nonce not required
  (squashed into http://cl/313962712)

Test: OEMCryptoLicenseTest.LoadKeyWithNoRequest
Bug: 157822248
Bug: 156853321
Change-Id: I735d355241876bddb0c52440b0049efb72a4b26f
 2020-06-01 19:13:32 +00:00
Automerger Merge Worker
c7aee4955e Merge "Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: 4f895ec8ec am: f588353820" into rvc-qpr-dev-plus-aosp 2020-05-30 03:44:19 +00:00
Automerger Merge Worker
9448e93c70 Merge "Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: 4f895ec8ec" into rvc-d1-dev-plus-aosp am: af5d4ff666 
Change-Id: I5e8ec98b16871f6639784d7c8c86e86a427a758d
 2020-05-30 03:44:16 +00:00
Cong Lin
b91fb976b4 Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: 4f895ec8ec am: f588353820 
Change-Id: Id58ee8dd8be65bfa75fc7fe8e73bd71403da9d0d
 2020-05-30 03:44:14 +00:00
Cong Lin
d622cde29c Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: f5e7afe51d am: 5f76c56c05 
Change-Id: I9e7f90abdbf310128623c7309d2aac518daea6dd
 2020-05-30 03:44:04 +00:00
Automerger Merge Worker
af5d4ff666 Merge "Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: 4f895ec8ec" into rvc-d1-dev-plus-aosp 2020-05-30 03:31:16 +00:00
Cong Lin
9b0efc6683 Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: 4f895ec8ec 
Change-Id: Ibbbc2672752ac6b7be5ad51759511b0b38bdeaff
 2020-05-30 03:31:12 +00:00
Cong Lin
5f76c56c05 Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: f5e7afe51d 
Change-Id: I78cc8e8b91563d320e8cbb185c83650dc4caee4f
 2020-05-30 03:31:11 +00:00
Cong Lin
f588353820 Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: 4f895ec8ec 
Change-Id: I5c0a0f13e91c8f0182683a1deacc26ec3c43cb25
 2020-05-30 03:31:05 +00:00
Cong Lin
f5e7afe51d Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 
Change-Id: I3c00810baef5c538b655c8af58243723e228959b
 2020-05-30 03:13:51 +00:00
Cong Lin
4f895ec8ec Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 
Change-Id: Idcdbf54471e640b79a9af2a924b139d1c5def0f5
 2020-05-30 03:13:36 +00:00
Cong Lin
c34e2af181 Merge "Fix implicit type conversion issue in ODK" into rvc-dev 2020-05-30 02:56:31 +00:00
John Bruce
a81e8dd47b Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: ec894e1bce am: 10283634b1 
Change-Id: Ic22ea775291b3194392617b1c970c5da1cf6009d
 2020-05-30 00:19:45 +00:00
John Bruce
836f0eab4a Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f am: 698b36b263 
Change-Id: I84065aa6802f7db2cde7aec844e810180d3dc6e8
 2020-05-30 00:16:34 +00:00
John Bruce
1c7dab441a Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f am: 00792ac231 
Change-Id: I8b60d454a4b3c4aac8670f3bcef95cc249c50f0b
 2020-05-30 00:16:05 +00:00
John Bruce
10283634b1 Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: ec894e1bce 
Change-Id: Ide72822e741b0a6c736ac00d39ebd0e6fd9bcf56
 2020-05-29 23:57:09 +00:00
John Bruce
00792ac231 Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f 
Change-Id: I98a604729446a2e3ade173e4e473331034937dd0
 2020-05-29 23:57:09 +00:00
John Bruce
698b36b263 Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f 
Change-Id: I3b54a66197769dffa7d78030a9c79f673a426f7b
 2020-05-29 23:56:58 +00:00
John Bruce
b349680d3f Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 
Change-Id: I72df59375a2c05e47978abc37418ebc69f308bdc
 2020-05-29 23:40:52 +00:00
John Bruce
ec894e1bce Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 
Change-Id: I1e4a4c7c54e24f4f754cbe1ef6b5ec7c665dd509
 2020-05-29 23:40:49 +00:00
John Bruce
729723b3d2 Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev 2020-05-29 23:26:50 +00:00
Cong Lin
69e7e21882 Fix implicit type conversion issue in ODK 
Merging CL
https://widevine-internal-review.googlesource.com/c/cdm/+/100924 Fix implicit type conversion issue in ODK

1. Implicit cast is reported as error when compiling ODK with Level3
2. Override odk_add_overflow_xxx function with the built in functions can cause
redefinition issue when compiling Level3; Let's use odk customized overflow functions.

Bug: b/157510403
Test: ODK unittests and CDM unittests passed.
Change-Id: Ieef8ccfb41d08007ec72f4a061f92968e55539cb
 2020-05-29 10:07:08 -07:00
Automerger Merge Worker
082ec81465 Merge "Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: de022fbb0a" into rvc-qpr-dev-plus-aosp 2020-05-27 21:59:28 +00:00
Alex Dale
9f936a877d Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: de022fbb0a 
Change-Id: I300d1f145e620a908a7ea0c50c86b34469e775a7
 2020-05-27 21:59:24 +00:00
Alex Dale
063db9cf02 Rolled expected version number for R. am: dd70d63b76 am: 3316ea8c53 am: e8cfec7c67 
Change-Id: I1fee67f9cf299d5c6b482f9aebae04edd481c853
 2020-05-27 21:59:20 +00:00
Alex Dale
32f70b0464 Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: 7eb1c2b619 
Change-Id: I80383dcc06a4ca5a2b7854e3f8075a7f0d97cdea
 2020-05-27 21:59:14 +00:00
Alex Dale
e8cfec7c67 Rolled expected version number for R. am: dd70d63b76 am: 3316ea8c53 
Change-Id: I66a5a56e3c11a86f82e920d20e309c852d3179e8
 2020-05-27 21:44:10 +00:00
Alex Dale
7eb1c2b619 Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c 
Change-Id: Idc9fe4cee6699c6d35c828f4c4fa0075f3ccfaa2
 2020-05-27 21:44:02 +00:00
Alex Dale
de022fbb0a Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c 
Change-Id: Iae1998e8dd00a286c7d44bdb2093be860d97fb0d
 2020-05-27 21:43:58 +00:00
Alex Dale
3316ea8c53 Rolled expected version number for R. am: dd70d63b76 
Change-Id: I0e80a32a474d0e0229ef3b1f73ff06c4f60d785f
 2020-05-27 21:25:03 +00:00
Alex Dale
9329bf331c Rolled expected version number for R. am: dd70d63b76 
Change-Id: Id8ddfa7e676b57eb0ab8261d166dd0cf8901a458
 2020-05-27 21:24:39 +00:00
Alex Dale
dd70d63b76 Rolled expected version number for R. 
[ Merge of http://go/wvgerrit/100403 ]

VersionNumberTest.VersionNumberChangeCanary was expecting a version
string of "R".  However, Android rvc branch is now far enough into
development to use a numbered version: version "11".

Bug: 156853733
Test: Android license request test
Change-Id: I63d33f742c849b672b2d2402ab8423fdf2450f6f
 2020-05-27 17:27:46 +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
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