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

3728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
TreeHugger Robot
9f3480875d Merge "Address review comments" into rvc-dev am: d035d76ed6 am: b82da207fd am: 6f1601d18e 
Change-Id: I0499933adbcc61fbdd6d352611faef1b3b9ec3ca
 2020-03-25 20:02:06 +00:00
TreeHugger Robot
8dec93cb18 Merge "Address review comments" into rvc-dev am: d035d76ed6 am: 7f56b4cc50 
Change-Id: I23ca755ece35fc92398f8ddc8dd5a94f1fb085c0
 2020-03-25 19:49:23 +00:00
TreeHugger Robot
9a3e97dcf5 Merge "Address review comments" into rvc-dev am: d035d76ed6 am: 7f56b4cc50 
Change-Id: I0237b16779c5d5519a83e44b15d16dd3fe2f0ee3
 2020-03-25 19:49:19 +00:00
TreeHugger Robot
6f1601d18e Merge "Address review comments" into rvc-dev am: d035d76ed6 am: b82da207fd 
Change-Id: I6a6132c41c713a896bb0ff9090b6b6425899b17f
 2020-03-25 19:49:06 +00:00
TreeHugger Robot
b82da207fd Merge "Address review comments" into rvc-dev am: d035d76ed6 
Change-Id: I66931f849edf67e9d1bde00a5d948969615a16b9
 2020-03-25 19:31:01 +00:00
TreeHugger Robot
7f56b4cc50 Merge "Address review comments" into rvc-dev am: d035d76ed6 
Change-Id: Ib6c7e07e64126ab954eee0b4bbde8c632f3558f3
 2020-03-25 19:30:23 +00:00
TreeHugger Robot
d035d76ed6 Merge "Address review comments" into rvc-dev 2020-03-25 19:14:55 +00:00
Fred Gylys-Colwell
80b0005d44 Address review comments 
Merge from Widevine repo of http://go/wvgerrit/96163

This CL just addresses some review comments from the big merge to
master. The header OEMCryptoCENC.h is now synced with the
document http://go/oemcrypto.

Test: unit tests
Bug: 148907684
Change-Id: Ic825126e0dd3d7e86eefab2c51b4abb5d57fb568
 2020-03-25 16:16:58 +00:00
Alex Dale
193d5c384d Usage table header operations no longer need an open session. 
[ Merge of http://go/wvgerrit/95405 ]

There are several OEMCrypto functions that do not require an open
session to be called.  This change updates the OEMCrypto functions
related to the Usage Table Header.

Bug: 150888316
Test: Linux unit tests and Android build
Change-Id: Ic879876dd190fb3e058bbe8e0cce37273030b105
 2020-03-23 12:56:41 -07:00
Alex Dale
c9e4dd2495 New CDM error codes for usage table errors. 
[ Merge of http://go/wvgerrit/95404 ]

There are three situtations where error codes from a usage table
operations were not being mapped to unique CDM response types.  These
particular errors provide useful information for the CDM during table
defragging.

Also fixed misspelled error code.

Bug: 150890014
Bug: 150891685
Test: Linux unit tests and Android build
Change-Id: I683abdd5fc0871317eede960ea36cfafac7e7f49
 2020-03-23 12:54:27 -07:00
Rahul Frias
e6b910061c Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469 am: d107dd8f04 am: 798be44069 am: 2390975848 
Change-Id: Ic8aac65cc5ed3f450742bda631ca227ca046f1e3
 2020-03-20 03:20:09 +00:00