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

3739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rahul Frias
ce55664f89 Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 am: c79babac4c am: 93bb315c8e 
Change-Id: I514b0ec18e4b124dc8979826ed25730821e391d8
 2020-03-28 19:31:08 +00:00
Rahul Frias
93bb315c8e Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 am: c79babac4c 
Change-Id: Icfa7b9cf7c3714f86e3de812f386512f2be9a312
 2020-03-28 19:09:14 +00:00
Rahul Frias
c79babac4c Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev am: 3560247878 
Change-Id: I1a0ebfba3f4648e44dc3f28870076c6a6e0f1cc2
 2020-03-28 18:42:55 +00:00
Rahul Frias
3560247878 Merge "Reject partial clear subsamples when keys are not loaded" into rvc-dev 2020-03-28 18:24:15 +00:00
Rahul Frias
734aea940b Reject partial clear subsamples when keys are not loaded 
[ Merge of http://go/wvgerrit/96514 ]

The combined decryption call feature was introduced in android R.
In earlier releases, subsamples were passed one at a time for
decryption within the plugin. A decryption request that consists
entirely of clear data should be passed on to OEMCrypto even if
no keys are loaded.

A sample might consist of subsamples of clear and protected data.
In legacy mode, this proved to be an issue for OEMCrypto if the clear
subsamples were passed on but the protected ones were rejected (b/110251447).

For legacy mode and in the absence of keys being loaded, the subsample will
be passed to OEMCrypto only if the clear lead/frame is in a single subsample
and not broken up across multiple subsamples.

Bug: 150316417
Test: WV android unit/integration tests
Change-Id: Iff8ae8f58530cb9c5d31ce388742443ae807c16f
 2020-03-27 15:07:29 -07:00
Fred Gylys-Colwell
c5dcb0dbca Add unit test for preloaded license am: ca404aae6f am: ab82b4b78f am: f2c24373a6 am: e3f5c1ae3f 
Change-Id: Ibf9ab418251b97b2bb15d69d7fc7c37949d14804
 2020-03-27 19:47:01 +00:00
Fred Gylys-Colwell
6e12c64da2 Add unit test for preloaded license am: ca404aae6f am: 6bd4b47612 am: 64e528dc99 
Change-Id: I080c5f4fab3947d4e910e9e2472dac389c9a54fb
 2020-03-27 19:36:08 +00:00
Fred Gylys-Colwell
3cdcf12c20 Add unit test for preloaded license am: ca404aae6f am: ab82b4b78f am: d8ea3672c4 
Change-Id: Icf7f0036654ae5609bbe3c653fc8447c265567b0
 2020-03-27 19:34:53 +00:00
Fred Gylys-Colwell
e3f5c1ae3f Add unit test for preloaded license am: ca404aae6f am: ab82b4b78f am: f2c24373a6 
Change-Id: I092fdbd44330551134a6bb98511858cc9cbef0dc
 2020-03-27 19:31:36 +00:00
Fred Gylys-Colwell
64e528dc99 Add unit test for preloaded license am: ca404aae6f am: 6bd4b47612 
Change-Id: I0ce97c01bceaa48a5ea8fce2870f8c072eca3fbe
 2020-03-27 19:21:28 +00:00
Fred Gylys-Colwell
f2c24373a6 Add unit test for preloaded license am: ca404aae6f am: ab82b4b78f 
Change-Id: Icfcfda4c1410426ba3364907594a513052b04455
 2020-03-27 19:21:27 +00:00
Fred Gylys-Colwell
d8ea3672c4 Add unit test for preloaded license am: ca404aae6f am: ab82b4b78f 
Change-Id: I650eec69db450862ca645b1cab0f55c20926a635
 2020-03-27 19:21:04 +00:00
Fred Gylys-Colwell
ab82b4b78f Add unit test for preloaded license am: ca404aae6f 
Change-Id: I68c4098513de8313f7ecd9b30958c5b05a620703
 2020-03-27 19:05:44 +00:00
Fred Gylys-Colwell
6bd4b47612 Add unit test for preloaded license am: ca404aae6f 
Change-Id: Ieeff31dfb52a182da5217ab26ddd168d39e44381
 2020-03-27 19:05:43 +00:00
Fred Gylys-Colwell
ca404aae6f Add unit test for preloaded license 
Merge from Widevine repo of http://go/wvgerrit/96508

This adds a unit test for to verify that a preloaded license may be
loaded into OEMCrypto. A preloaded license is a license that does not
have a nonce, and for which there is no license request. This is used
in CAS and ATSC.

I also updated the test version string to
OEMCrypto unit tests for API 16.2. Tests last updated 2020-03-27

Bug: 144105097
Test: ran oemcrypto unit tests on taimen and with v16 modmock.
Change-Id: I6a4926917f36a084d15defa7b908d067612c4dcf
 2020-03-26 15:38:38 -07:00
Cong Lin
0b792d2ebd Merge "Use unique_ptr in oemcrypto ref" into rvc-dev am: a55244025b am: 0abb41845e am: b9ef42f7a6 am: f42fbe6394 
Change-Id: I15603c179e59e65d60e8060ef037ef3a2b3f0d2a
 2020-03-26 19:02:47 +00:00
Cong Lin
7ede55d7c1 Merge "Use unique_ptr in oemcrypto ref" into rvc-dev am: a55244025b am: 275b896d9c am: a87dafc5ba 
Change-Id: Ib185969162dc4ff2ba950995094b440f2f0bb60d
 2020-03-26 18:54:04 +00:00
Cong Lin
63ad1466ee Merge "Use unique_ptr in oemcrypto ref" into rvc-dev am: a55244025b am: 0abb41845e am: b651eb3278 
Change-Id: I15b7d558abe8ee52f9894fd0c7beab1df00639ee
 2020-03-26 18:53:50 +00:00
Cong Lin
f42fbe6394 Merge "Use unique_ptr in oemcrypto ref" into rvc-dev am: a55244025b am: 0abb41845e am: b9ef42f7a6 
Change-Id: I18dbb965ac53cff45ed75d4f0040c3db83cfa68d
 2020-03-26 18:53:20 +00:00
Cong Lin
a87dafc5ba Merge "Use unique_ptr in oemcrypto ref" into rvc-dev am: a55244025b am: 275b896d9c 
Change-Id: I871b21d3aabccbb70c271748332b145f56ebdca9
 2020-03-26 18:42:56 +00:00
Cong Lin
b9ef42f7a6 Merge "Use unique_ptr in oemcrypto ref" into rvc-dev am: a55244025b am: 0abb41845e 
Change-Id: I1b05161d7fe15f573a70a58768b186ef87c7188f
 2020-03-26 18:42:34 +00:00
Cong Lin
b651eb3278 Merge "Use unique_ptr in oemcrypto ref" into rvc-dev am: a55244025b am: 0abb41845e 
Change-Id: I1fef37738bf914471a412e199643874983ee9b1e
 2020-03-26 18:42:25 +00:00
Cong Lin
275b896d9c Merge "Use unique_ptr in oemcrypto ref" into rvc-dev am: a55244025b 
Change-Id: I266de93e39d6754539b562da6b24ce42892b294d
 2020-03-26 18:28:22 +00:00
Cong Lin
0abb41845e Merge "Use unique_ptr in oemcrypto ref" into rvc-dev am: a55244025b 
Change-Id: If9fd5ca1143cf3372cf70a7d3627c8e98514a3a8
 2020-03-26 18:28:10 +00:00
Cong Lin
a55244025b Merge "Use unique_ptr in oemcrypto ref" into rvc-dev 2020-03-26 18:15:33 +00:00
Cong Lin
a53a6bf355 Use unique_ptr in oemcrypto ref 
Merge from Widevine repo of http://go/wvgerrit/95945

The reference oemcrypto and testbed still use old style pointers, even
though we now require a more modern C++ compiler. Updated a few places
where smart pointer would be appropriate.

Bug: 141393616
Test: Ran unit tests
Change-Id: I8b1e155bce241075928e373478d6f8e1001233f9
 2020-03-26 16:15:24 +00:00
Alex Dale
547ef61575 Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: ef31c865f2 am: a983f577b1 am: 228075d3f5 
Change-Id: I6ce1d33eba4b2d754ead1da916d7c245be459add
 2020-03-26 04:25:47 +00:00
Alex Dale
9ae6ffd1db Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: b587f64cac am: c75f01f7c9 am: 819f20e6aa 
Change-Id: Ic55ed4932c977caa23a6f6ac90453ddf0c0d013b
 2020-03-26 04:25:26 +00:00
Alex Dale
21561e45dc Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: d650718c27 am: 970ceb343a 
Change-Id: I13bf21d6405c9f8205bd82dbaf2f8a274040543c
 2020-03-26 04:14:19 +00:00
Automerger Merge Worker
b5996adea3 Merge "Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: 4188d4478b" into rvc-d1-dev-plus-aosp am: 72eebd9d75 
Change-Id: I1e488e37b7bf9829e7e9a0219ba80dc069cbb661
 2020-03-26 04:14:14 +00:00
Alex Dale
7402eb8f0f Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: ef31c865f2 am: 8aff059243 
Change-Id: I97780666cdeb31aa93b4c219a1d65023acc3bb87
 2020-03-26 04:14:07 +00:00
Alex Dale
228075d3f5 Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: ef31c865f2 am: a983f577b1 
Change-Id: Idb46a4220146d271be1c25974445a17cfcb8c37c
 2020-03-26 04:13:36 +00:00
Alex Dale
efc12c3cef Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: b587f64cac am: 4e22b2253c 
Change-Id: Id31e8bd535de82aad9434382c912298bff9222e7
 2020-03-26 04:13:35 +00:00
Alex Dale
819f20e6aa Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: b587f64cac am: c75f01f7c9 
Change-Id: I32bcb618b47891f83fb49dd87ddb2938341c5a3c
 2020-03-26 04:13:30 +00:00
Alex Dale
a983f577b1 Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: ef31c865f2 
Change-Id: Ifa3470a582eb45437e98e25c49043cc08b6ffce7
 2020-03-26 03:57:31 +00:00
Alex Dale
970ceb343a Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: d650718c27 
Change-Id: I5b122e382a37fa977ae6f5e661fc64beff34eaa5
 2020-03-26 03:57:26 +00:00
Alex Dale
c75f01f7c9 Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: b587f64cac 
Change-Id: Ic3bbf3ed9662db105921e68a2edaf54e035d1fc5
 2020-03-26 03:57:26 +00:00
Automerger Merge Worker
72eebd9d75 Merge "Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: 4188d4478b" into rvc-d1-dev-plus-aosp 2020-03-26 03:57:15 +00:00
Alex Dale
84e758c3e4 Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: 4188d4478b 
Change-Id: I329bd2e415818e7b8d410de424a0df769f3eb2e1
 2020-03-26 03:57:11 +00:00
Alex Dale
8aff059243 Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c am: ef31c865f2 
Change-Id: Ib3008c8544f885190ab5645fd64181abd9aee971
 2020-03-26 03:57:10 +00:00
Alex Dale
4e22b2253c Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e am: b587f64cac 
Change-Id: I8652c63f22c9f71bc548c0af07cc4071ac48904b
 2020-03-26 03:56:56 +00:00
Alex Dale
d650718c27 Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c 
Change-Id: I2853ab3f534c8f1c3d7a5597bfc69a4685574d19
 2020-03-26 03:45:43 +00:00
Alex Dale
ef31c865f2 Merge "Usage table header operations no longer need an open session." into rvc-dev am: 73f301a66c 
Change-Id: Ifa6a1bc17ceb2dded06cb4f6547c6bc7d4478983
 2020-03-26 03:45:34 +00:00
Alex Dale
4188d4478b Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e 
Change-Id: Iab515ba54795d43abd7eefd02d41461aabd777bb
 2020-03-26 03:45:24 +00:00
Alex Dale
b587f64cac Merge "New CDM error codes for usage table errors." into rvc-dev am: 8d45d93d0e 
Change-Id: I84ec88383d316d56cfba3fce6f8cd3ab7e315bec
 2020-03-26 03:45:09 +00:00
Alex Dale
73f301a66c Merge "Usage table header operations no longer need an open session." into rvc-dev 2020-03-26 03:27:31 +00:00
Alex Dale
8d45d93d0e Merge "New CDM error codes for usage table errors." into rvc-dev 2020-03-26 03:26:30 +00:00
TreeHugger Robot
60097abd8d Merge "Address review comments" into rvc-dev am: d035d76ed6 am: 7f56b4cc50 am: 8dec93cb18 am: 8c51fafe8c 
Change-Id: Iba577a4056709e20d1a74f9197e99095925e11f0
 2020-03-25 20:27:15 +00:00
TreeHugger Robot
8c51fafe8c Merge "Address review comments" into rvc-dev am: d035d76ed6 am: 7f56b4cc50 am: 8dec93cb18 
Change-Id: I0893bb11d9fac82fa821d7e0c078cd558ad681b7
 2020-03-25 20:02:36 +00:00
TreeHugger Robot
e0416f73a2 Merge "Address review comments" into rvc-dev am: d035d76ed6 am: 7f56b4cc50 am: 9a3e97dcf5 
Change-Id: I91636f2e1b09de7a11a9489c663a24947c216191
 2020-03-25 20:02:34 +00:00