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

4298 Commits

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

Change-Id: I84d49279de440bd6018814e46f14eb6875de705f
 2020-06-02 22:48:31 +00:00
Fred Gylys-Colwell
9a9aae3265 Update OEMCrypto unit tests to require ODK 16.3 am: 45681615b8 am: d599c74011 am: a12d082a11 am: b4f072558e am: 00caf5f7c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677949

Change-Id: I471cf5806ae06cf44aea09d1551936358ac8f6d6
 2020-06-02 22:47:51 +00:00
Fred Gylys-Colwell
56e5414e94 Do not verify decrypt hash when no key selected am: 36968de671 am: 51992ab155 am: 23f9a69a7f am: d4f0d69923 am: 9e4bdda1a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677948

Change-Id: I8bf4c2ddc5e3c15ad00f67fcaa94518ff3117036
 2020-06-02 22:47:50 +00:00
Fred Gylys-Colwell
808b778d10 Unit test for loading nonce-free offline license am: a615671f48 am: ed900f242b am: 32b318e7c4 am: 38d465b042 am: 1106e2e913 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677947

Change-Id: I17597d9949984c0d7b95200a35cdfd6633901106
 2020-06-02 22:47:48 +00:00
Fred Gylys-Colwell
a5440132c5 Check for null pointers in oemcrypto adapter am: 42eb79a3ff am: 7a4313483c am: 2643b76731 am: fcf75fec0d am: 2c8ead459e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677946

Change-Id: Ia5a571eb4565fce60055e3ccb2f4e93d67412f7b
 2020-06-02 22:47:46 +00:00
Fred Gylys-Colwell
ec71959c8e Update ODK Library to 16.3 am: 166b3e8403 am: 62802d8e10 am: 4b9e91eefd am: 084bfcf938 am: 7cb5714fdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11699230

Change-Id: I9ba9ece7dc7d3e2ed04e56b64e72f87e6910abda
 2020-06-02 22:47:44 +00:00
Fred Gylys-Colwell
3a96f2a4cd ODK: forward compatibility and nonce-free offline license support am: 8dc1d7a11d am: 5bb396fb72 am: c2920550ed am: 0000eef77d am: 0360cf948f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11688972

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

Change-Id: I90d52a731d00ca8664dd9688d9a354aea25bd7d3
 2020-06-02 22:28:00 +00:00
Fred Gylys-Colwell
00caf5f7c2 Update OEMCrypto unit tests to require ODK 16.3 am: 45681615b8 am: d599c74011 am: a12d082a11 am: b4f072558e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677949

Change-Id: Ic11c9c038de342c3c6cdc044d8046cd69ea0ee9c
 2020-06-02 22:26:55 +00:00
Fred Gylys-Colwell
9e4bdda1a5 Do not verify decrypt hash when no key selected am: 36968de671 am: 51992ab155 am: 23f9a69a7f am: d4f0d69923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677948

Change-Id: I9ace6783f1bcdde706c83d6768826b0187378a97
 2020-06-02 22:26:54 +00:00
Fred Gylys-Colwell
1106e2e913 Unit test for loading nonce-free offline license am: a615671f48 am: ed900f242b am: 32b318e7c4 am: 38d465b042 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677947

Change-Id: I63c865fd7574289061ffe929f2ed03a30c56eac0
 2020-06-02 22:26:53 +00:00
Fred Gylys-Colwell
2c8ead459e Check for null pointers in oemcrypto adapter am: 42eb79a3ff am: 7a4313483c am: 2643b76731 am: fcf75fec0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677946

Change-Id: I7140851ef02ea0ee3f07ba2825b7330f661a1265
 2020-06-02 22:26:50 +00:00
Fred Gylys-Colwell
7cb5714fdd Update ODK Library to 16.3 am: 166b3e8403 am: 62802d8e10 am: 4b9e91eefd am: 084bfcf938 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11699230

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

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

Change-Id: I3a65e2403d79298205a70b3dd3917ec4c250bbf1
 2020-06-02 22:16:08 +00:00
Fred Gylys-Colwell
b4f072558e Update OEMCrypto unit tests to require ODK 16.3 am: 45681615b8 am: d599c74011 am: a12d082a11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677949

Change-Id: Idaae820ce74e6477db458f610a5cab73559c7913
 2020-06-02 22:15:50 +00:00
Fred Gylys-Colwell
d4f0d69923 Do not verify decrypt hash when no key selected am: 36968de671 am: 51992ab155 am: 23f9a69a7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677948

Change-Id: I8a8884b0139ca407050b5d399a069096b1d5b4d1
 2020-06-02 22:15:49 +00:00
Fred Gylys-Colwell
38d465b042 Unit test for loading nonce-free offline license am: a615671f48 am: ed900f242b am: 32b318e7c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677947

Change-Id: Ibc6f16ff98c6b9e4162059093263e5359dac28dc
 2020-06-02 22:15:48 +00:00
Fred Gylys-Colwell
fcf75fec0d Check for null pointers in oemcrypto adapter am: 42eb79a3ff am: 7a4313483c am: 2643b76731 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677946

Change-Id: I624aa93387d3765417494bd2387330e1b354993a
 2020-06-02 22:15:46 +00:00
Fred Gylys-Colwell
084bfcf938 Update ODK Library to 16.3 am: 166b3e8403 am: 62802d8e10 am: 4b9e91eefd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11699230

Change-Id: I8a8e8bd3b2dbb762f19e23cfa48169e37fcc4a81
 2020-06-02 22:15:45 +00:00
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
d2830141cc 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: I92345d75991bfbe9f1214dd61350b0be90eac8fb
 2020-06-02 22:01:46 +00:00
Fred Gylys-Colwell
a12d082a11 Update OEMCrypto unit tests to require ODK 16.3 am: 45681615b8 am: d599c74011 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677949

Change-Id: If664f8732bd8cbef5184aea7d6679481f95e457e
 2020-06-02 22:01:36 +00:00
Fred Gylys-Colwell
23f9a69a7f Do not verify decrypt hash when no key selected am: 36968de671 am: 51992ab155 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677948

Change-Id: I9e90fca0b5539c7a99ea5c840f32a81e1d32fab6
 2020-06-02 22:01:34 +00:00
Fred Gylys-Colwell
32b318e7c4 Unit test for loading nonce-free offline license am: a615671f48 am: ed900f242b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677947

Change-Id: Ie8a0e3ab425a263b07cf3a265f46ffb6aa11fc20
 2020-06-02 22:01:32 +00:00
Fred Gylys-Colwell
2643b76731 Check for null pointers in oemcrypto adapter am: 42eb79a3ff am: 7a4313483c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677946

Change-Id: I17badea700bcf40780baf33787a496da1c5b67c9
 2020-06-02 22:01:30 +00:00
Fred Gylys-Colwell
4b9e91eefd Update ODK Library to 16.3 am: 166b3e8403 am: 62802d8e10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11699230

Change-Id: I736fcfe4c1f3347d7587bd83ba22e0f2ce71a71a
 2020-06-02 22:01:28 +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
d599c74011 Update OEMCrypto unit tests to require ODK 16.3 am: 45681615b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677949

Change-Id: Ic8c45cc7fce842f67777ab0a003a541fbae7f9fb
 2020-06-02 21:49:26 +00:00
Fred Gylys-Colwell
51992ab155 Do not verify decrypt hash when no key selected am: 36968de671 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677948

Change-Id: I7f9acec222c2840720be3b36423b502582c2ee25
 2020-06-02 21:49:24 +00:00
Fred Gylys-Colwell
ed900f242b Unit test for loading nonce-free offline license am: a615671f48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677947

Change-Id: Ia129aba764568a853b6b89a7f35f902ef2068942
 2020-06-02 21:49:22 +00:00
Fred Gylys-Colwell
7a4313483c Check for null pointers in oemcrypto adapter am: 42eb79a3ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11677946

Change-Id: I01d29869ce9f1ce6c252066cbb8f9b4f5286a5ef
 2020-06-02 21:49:21 +00:00
Fred Gylys-Colwell
62802d8e10 Update ODK Library to 16.3 am: 166b3e8403 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11699230

Change-Id: I4d951b808e21128d8dbe4e0fafe4fd24b4753124
 2020-06-02 21:49:19 +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
45681615b8 Update OEMCrypto unit tests to require ODK 16.3 
Merge from Widevine repo of http://go/wvgerrit/101144

This CL updates the version string of the oemcrypto unit tests.

Test: unit tests on taimen and with reference oemcrypto v16.
Bug: 156789529
Change-Id: I504a32f0c3781870052b58d30312c58e090b145c
 2020-06-02 09:36:38 -07:00
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