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

4563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Gylys-Colwell
36968de671 Do not verify decrypt hash when no key selected 
Merge from Widevine repo of http://go/wvgerrit/101143

This CL removes the check for a decrypt hash error when CopyBuffer is
used instead of DecryptCenc because a key was not selected.

We also remove the attempt to check the decrypt hash when there are
multiple buffers, because that is not well defined behavior.

Bug: 155185867
Bug: 155192141
Test: ran unit tests on taimen and on v16  reference oemcrypto
Change-Id: I640e904e256f0913ca606bb5db891430b23f44a3
 2020-06-02 08:30:34 -07:00
Fred Gylys-Colwell
a615671f48 Unit test for loading nonce-free offline license 
Merge from Widevine repo of http://go/wvgerrit/100964

The previous nonce-free test used the same session to generate the
request as to load the license. However, it is a realistic use case to
have a new session used for loading the license.

The use case relates to a pre-loaded, shared license.

Test: Ran unit tests on taimen and on v16 ref implementation
Bug: 156853321
Change-Id: Ibc07744a16edcd3952d88d73660a75d0c3e8eeb8
 2020-06-02 08:30:34 -07:00
Fred Gylys-Colwell
42eb79a3ff Check for null pointers in oemcrypto adapter 
Merge from Widevine repo of http://go/wvgerrit/100963

Test: unit tests on taimen
Bug: 156967805
Change-Id: Ic8ba7461ffcaa371a5239dca84e8a3007b0df517
 2020-06-02 08:30:34 -07:00
Fred Gylys-Colwell
166b3e8403 Update ODK Library to 16.3 
Merge from Widevine repo of http://go/wvgerrit/101130

https://cr/314253512
ODK Library: roll version number to 16.3

https://cr/314253425
ODK Library: Accept release request as renewal request

To support forward compatibility, the v16 server should parse a
release request as a renewal request.

https://cr/314213725
ODK: Accept larger message sizes

The ODK should accept a message size that is larger than the
current
API requires. This allows for future API versions to append
fields to
a message that current the current license SDK will
ignore.

https://cr/313962712
ODK: accept messages with future API version numbers

This CL updates the ODK parse functions to accept future versions
of
the message. This will allow a v16 server to talk to a v17
device.

https://cr/313814938
ODK Version String

Add an automatically generated version string to odk_structs.h

Bug: 157030231
Bug: 157512150
Bug: 157822248
Bug: 157512322
Test: unit tests on taimen
Change-Id: I346f73c41bc984fe17856d3b61cd08cf92b39919
 2020-06-02 08:30:34 -07: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
2ed46e8e6e Merge "Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: 4f895ec8ec am: f588353820" into rvc-qpr-dev-plus-aosp am: c7aee4955e am: c6ca287334 
Change-Id: I5276653cdcdac199a6c0eea994b2d99f56fb4290
 2020-05-30 04:09:17 +00:00
Automerger Merge Worker
b65f644247 Merge "Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: 4f895ec8ec" into rvc-d1-dev-plus-aosp am: af5d4ff666 am: 9448e93c70 am: c8e1ce8518 
Change-Id: I4f344d85b4cfa1beabb2fee08294d6fa5e1b3318
 2020-05-30 04:09:11 +00:00
Cong Lin
1f2df5789b Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: f5e7afe51d am: 5f76c56c05 am: d622cde29c am: c3be1c3098 
Change-Id: I6d590288c3ec30b14f9c2a2d2e476c8e9980981d
 2020-05-30 04:09:05 +00:00
Automerger Merge Worker
c6ca287334 Merge "Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: 4f895ec8ec am: f588353820" into rvc-qpr-dev-plus-aosp am: c7aee4955e 
Change-Id: Ia1d2be3d9c44d7d2a91f9ddb88b63bc49e359c1c
 2020-05-30 03:56:21 +00:00
Automerger Merge Worker
c8e1ce8518 Merge "Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: 4f895ec8ec" into rvc-d1-dev-plus-aosp am: af5d4ff666 am: 9448e93c70 
Change-Id: I61d02ebeee1f16d283e523c4e2bb84f59c7b75e5
 2020-05-30 03:56:14 +00:00
Cong Lin
c3be1c3098 Merge "Fix implicit type conversion issue in ODK" into rvc-dev am: c34e2af181 am: f5e7afe51d am: 5f76c56c05 am: d622cde29c 
Change-Id: I1cd80a70c9b094e245a904e310406f1cbf523fb2
 2020-05-30 03:56:07 +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
62543c2169 Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: ec894e1bce am: 10283634b1 am: a81e8dd47b am: ffa5bcb2c3 
Change-Id: Ic528df7967a5ddf8a6982d59c3c84151b92f44ae
 2020-05-30 00:56:46 +00:00
John Bruce
d01d3e504d Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f am: 698b36b263 am: 836f0eab4a am: 4681b3654e 
Change-Id: I628779c4bf2674b75e3082542d25895d9c915a1a
 2020-05-30 00:56:25 +00:00
John Bruce
87660ab0e3 Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f am: 00792ac231 am: 1c7dab441a am: 265ba61b5c 
Change-Id: I800c026cafb01811337d365d533de494abc16c79
 2020-05-30 00:55:57 +00:00
John Bruce
ffa5bcb2c3 Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: ec894e1bce am: 10283634b1 am: a81e8dd47b 
Change-Id: I183c93d3ea145aaa5a61031caae81a48a4b958a0
 2020-05-30 00:33:17 +00:00
John Bruce
4681b3654e Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f am: 698b36b263 am: 836f0eab4a 
Change-Id: Ieef065860ef2d846f4b8f7dd377f57346e8860fa
 2020-05-30 00:33:04 +00:00
John Bruce
265ba61b5c Merge "OEMCrypto Unit Test Fix: Do Not Derive Keys Immediately" into rvc-dev am: 729723b3d2 am: b349680d3f am: 00792ac231 am: 1c7dab441a 
Change-Id: I1bada2a5657eb38a8271d2da2199b145a8966d6c
 2020-05-30 00:32:39 +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
b8578bfd7a Merge "Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: de022fbb0a" into rvc-qpr-dev-plus-aosp am: 082ec81465 am: 86e773636c 
Change-Id: I8b461866d1dde5d3723038bd5ce520def2559463
 2020-05-27 22:31:03 +00:00
Alex Dale
078b1d4a92 Rolled expected version number for R. am: dd70d63b76 am: 3316ea8c53 am: e8cfec7c67 am: 063db9cf02 am: ee2e37e935 
Change-Id: I7de72fe5c093305b036bc444f92d3482feee7411
 2020-05-27 22:30:58 +00:00
Alex Dale
c84ad0d971 Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: 7eb1c2b619 am: 32f70b0464 am: 94314def43 
Change-Id: Ief698cac71f694a1f2428765bf442c9c1ee1162c
 2020-05-27 22:30:52 +00:00
Automerger Merge Worker
86e773636c Merge "Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: de022fbb0a" into rvc-qpr-dev-plus-aosp am: 082ec81465 
Change-Id: I27f364a6d71f319afb7adcff4affc5d65fe58f56
 2020-05-27 22:11:54 +00:00
Alex Dale
ee2e37e935 Rolled expected version number for R. am: dd70d63b76 am: 3316ea8c53 am: e8cfec7c67 am: 063db9cf02 
Change-Id: Ifd1d680f3621a1e411a55d2838cabec2fafbc159
 2020-05-27 22:11:48 +00:00
Alex Dale
94314def43 Rolled expected version number for R. am: dd70d63b76 am: 9329bf331c am: 7eb1c2b619 am: 32f70b0464 
Change-Id: I4f6d3d744869708d538b5d0881044ab0d605e0a8
 2020-05-27 22:11:40 +00: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