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

3866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
1b76b4f8cf Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: c14031eb7b am: aec7696984 
Change-Id: I67e994ad3b3a49f1b0ae802cf2675141548c50a6
 2020-04-28 18:19:02 +00:00
TreeHugger Robot
42661094b2 Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: 48a1c257fd am: 248ec379d2 
Change-Id: If76150ee449c9841d33238f025ebc44c5b9804ea
 2020-04-28 18:18:54 +00:00
TreeHugger Robot
aadd73c75a Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: 6fd344812d am: 925db173aa 
Change-Id: I9cf18fb0d655ad3db49af1ea861a83706f3fbbf7
 2020-04-28 18:18:49 +00:00
TreeHugger Robot
0aba05ea26 Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: ed4daa7583 am: 8b05bc3ed5 
Change-Id: I3a20478294ae1aca96bcf114e55642e4281175cb
 2020-04-28 18:18:15 +00:00
TreeHugger Robot
aec7696984 Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: c14031eb7b 
Change-Id: I392d826aa2e377612405dcd61261b9d9096520c0
 2020-04-28 17:58:48 +00:00
TreeHugger Robot
248ec379d2 Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: 48a1c257fd 
Change-Id: I993c4401359021539fcd668e978fb3f68d93d340
 2020-04-28 17:58:28 +00:00
TreeHugger Robot
925db173aa Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: 6fd344812d 
Change-Id: I9097d87eae51f821201e2cc6334c79b2f4494110
 2020-04-28 17:57:59 +00:00
TreeHugger Robot
8b05bc3ed5 Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f am: ed4daa7583 
Change-Id: I719260bb570ec546cf31c44146f10997f1755ad3
 2020-04-28 17:57:53 +00:00
TreeHugger Robot
c14031eb7b Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 
Change-Id: I9ee2b3a47a3a61e0596195de39f9e47a4128ec33
 2020-04-28 17:42:16 +00:00
TreeHugger Robot
6fd344812d Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 
Change-Id: I59fa7ba554c560f0c8e68f69747a4eb98f297e51
 2020-04-28 17:42:14 +00:00
TreeHugger Robot
48a1c257fd Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f 
Change-Id: I5d365b629a6c13c36b60d90680c012d81f360baf
 2020-04-28 17:42:06 +00:00
TreeHugger Robot
ed4daa7583 Merge "Fix buffer size on generic decrypt tests" into rvc-dev am: 9448696b9f 
Change-Id: I6d367165623fd96fa21fee3e274b9c9b99b0aba3
 2020-04-28 17:42:03 +00:00
TreeHugger Robot
6bd68c9660 Merge "Verify error code when usage entry in use" into rvc-dev 2020-04-28 17:25:22 +00:00
TreeHugger Robot
9448696b9f Merge "Fix buffer size on generic decrypt tests" into rvc-dev 2020-04-28 17:23:37 +00:00
Rahul Frias
4884e79a42 Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 3601ac7387 am: e8e0dcd887 am: fbc9019888 
Change-Id: I4338722a1555d795d1f29dfdcca00e383f8629d7
 2020-04-24 23:58:49 +00:00
Rahul Frias
dec90462b6 Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 3601ac7387 am: 70e71421eb 
Change-Id: Id83de835a3d0a6dab1fed223080f0ad63149234b
 2020-04-24 23:51:05 +00:00
Rahul Frias
cf8f897be3 Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 086aa7b283 am: 37606c6956 
Change-Id: I78262af3141d303e6923cfa7708bc549b5e5210d
 2020-04-24 23:49:55 +00:00
Rahul Frias
fbc9019888 Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 3601ac7387 am: e8e0dcd887 
Change-Id: I36103187fc1c7a8501a971141b44ba4c3994cda8
 2020-04-24 23:49:20 +00:00
Rahul Frias
70e71421eb Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 3601ac7387 
Change-Id: Iec573e53829047daf055003815841c2cc30641c2
 2020-04-24 23:27:56 +00:00
Rahul Frias
e8e0dcd887 Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 3601ac7387 
Change-Id: I98328c3518339defb48053038aa4c3d82e983e07
 2020-04-24 23:27:30 +00:00
Rahul Frias
37606c6956 Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 086aa7b283 
Change-Id: Icb635a36a2b60b6a9410fc786c57ba3020760ac7
 2020-04-24 23:27:26 +00:00
Rahul Frias
3601ac7387 Correct OpenSessions_1_1 test failure am: 3df8bc5133 
Change-Id: I3a11cc8034711d6e1219d3b248fdcf73d7f155e8
 2020-04-24 23:11:45 +00:00
Rahul Frias
086aa7b283 Correct OpenSessions_1_1 test failure am: 3df8bc5133 
Change-Id: I4c1eb3590a956967e85cb1d63969e002a026e8a0
 2020-04-24 23:11:21 +00:00
Fred Gylys-Colwell
a3a61a68c4 Verify error code when usage entry in use 
Merge from Widevine repo of http://go/wvgerrit/98265

Previously, if we tried to shrink the usage table over an entry in
use, we expected an error. Now, we expect the specific error,
OEMCrypto_ERROR_ENTRY_IN_USE.

Test: unit tests on taimen
Bug: 124776024
Change-Id: I2b4b872943bf65401c0a6b5dc1237d77341b1f5b
 2020-04-24 14:13:15 -07:00
Rahul Frias
3df8bc5133 Correct OpenSessions_1_1 test failure 
[ Merge of http://go/wvgerrit/98025 ]

This adds mocking for WvContentDecryptionModule::QuerySessionStatus
to WvDrmPluginTest which was missing. This corrects the failure in
WVDrmPluginTest.OpensSessions_1_1 from libwvdrmdrmplugin_hidl_test

Bug: 154011452
Test: wv unit/integration tests
Change-Id: I9904595a62a71541ab534aca7d7dfbf95f3225c9
 2020-04-20 15:48:20 -07:00
Rahul Frias
dacaaa15c6 Merge "Correct reporting of KeyStatus usable in future" into rvc-dev am: d260c2cf2d am: dec9af442b am: 7ef5203a00 am: 3614e47762 
Change-Id: I252ca71488e44cafe7a02938859b5864ead15958
 2020-04-20 20:21:37 +00:00
Rahul Frias
3614e47762 Merge "Correct reporting of KeyStatus usable in future" into rvc-dev am: d260c2cf2d am: dec9af442b am: 7ef5203a00 
Change-Id: I2c39d917e6608b39a3328a18e6af5731b04f6546
 2020-04-20 19:59:22 +00:00
Rahul Frias
7f8f6dc0bf Merge "Correct reporting of KeyStatus usable in future" into rvc-dev am: d260c2cf2d am: 0b0d3500ec am: d56a6bffd2 
Change-Id: Ieb2e732fc8ab00dfbb0779740462da3301ddd9a4
 2020-04-20 19:57:33 +00:00
Rahul Frias
3bf1e1b1b5 Merge "Correct reporting of KeyStatus usable in future" into rvc-dev am: d260c2cf2d am: dec9af442b am: c00f9a3ce1 
Change-Id: Icdecbab3401c32f7c122f56693cdf6d4f5aea048
 2020-04-20 19:57:21 +00:00
Rahul Frias
d56a6bffd2 Merge "Correct reporting of KeyStatus usable in future" into rvc-dev am: d260c2cf2d am: 0b0d3500ec 
Change-Id: I03c8b87873e5bb5bf806d7890629a5082caeb409
 2020-04-20 19:38:38 +00:00
Rahul Frias
7ef5203a00 Merge "Correct reporting of KeyStatus usable in future" into rvc-dev am: d260c2cf2d am: dec9af442b 
Change-Id: Idd0c126798678cd92b3c61f8c2f217914e8155f5
 2020-04-20 19:38:37 +00:00
Rahul Frias
c00f9a3ce1 Merge "Correct reporting of KeyStatus usable in future" into rvc-dev am: d260c2cf2d am: dec9af442b 
Change-Id: Ie281c339b05d7691b6e36b3abec67ee2db27aa7a
 2020-04-20 19:37:20 +00:00
Rahul Frias
0b0d3500ec Merge "Correct reporting of KeyStatus usable in future" into rvc-dev am: d260c2cf2d 
Change-Id: I44b9672e6d1ef99ef2ef95bdb8eb04edc811b27a
 2020-04-20 19:20:22 +00:00
Rahul Frias
dec9af442b Merge "Correct reporting of KeyStatus usable in future" into rvc-dev am: d260c2cf2d 
Change-Id: I8f6bd2763d68abbba6e7728ea58cc80a8f6516be
 2020-04-20 19:19:37 +00:00
Rahul Frias
d260c2cf2d Merge "Correct reporting of KeyStatus usable in future" into rvc-dev 2020-04-20 19:06:18 +00:00
Rahul Frias
6404b42fb2 Correct reporting of KeyStatus usable in future 
[ Merge of http://go/wvgerrit/98004 ]

This corrects mapping for KeyStatus event kKeyStatusUsableInFuture in
the legacy WVDrmPlugin. It earlier reported DrmPlugin KeyStatusType
kKeyStatusType_StatusPending and now reports kKeyStatusType_UsableInFuture.

This fixes the test failure WVDrmPluginTest.MarshalsEvents

Bug: 153509007
Bug: 116738851
Test: WV unit/integration tests
Change-Id: I4b2c74f5a0757975861ef41fa575a749ff9da391
 2020-04-20 10:23:27 -07:00
Fred Gylys-Colwell
eb227bdc61 Fix buffer size on generic decrypt tests 
Merge from Widevine repo of http://go/wvgerrit/98264

The generic decrypt tests changed the variable controlling buffer size
after it initialized the buffer -- so the buffer was not changed. This
CL fixes that.

Also, RefreshLargeBuffer changed the size of the license message
buffer, not the renewal message buffer.

Bug: 153590142
Test: ran unit tests on taimen
Change-Id: Ib01b411478a181ba956ac2e23c03634a2d971cc0
 2020-04-18 09:07:07 -07:00
Fred Gylys-Colwell
8fbdddfd3e Update OEMCrypto documents am: 15b1cd9cc9 am: 02443e2142 am: 0214b1eb5e am: fa4d43d550 
Change-Id: Ie68d96e15ce61aa8d6fde89a6685f81051950957
 2020-04-13 19:48:24 +00:00
Fred Gylys-Colwell
29778ba638 Update OEMCrypto documents am: 15b1cd9cc9 am: b38e279ed6 am: d89f49b089 
Change-Id: I0eb9257814b534dde9aa9ab54c12f42f99047720
 2020-04-13 19:21:29 +00:00
Fred Gylys-Colwell
12d6316b6f Update OEMCrypto documents am: 15b1cd9cc9 am: 02443e2142 am: 045e637317 
Change-Id: Ie27a2c10ea5ce37ed2ce16199488b67082ab04aa
 2020-04-13 19:20:45 +00:00
Fred Gylys-Colwell
fa4d43d550 Update OEMCrypto documents am: 15b1cd9cc9 am: 02443e2142 am: 0214b1eb5e 
Change-Id: Ie87e22ded86e810c6fa71e2dff095edc05b7a676
 2020-04-13 19:20:32 +00:00
Fred Gylys-Colwell
d89f49b089 Update OEMCrypto documents am: 15b1cd9cc9 am: b38e279ed6 
Change-Id: Ife6573b0ab697e9f4de9a1f9f1f24b5936464e42
 2020-04-13 18:53:23 +00:00
Fred Gylys-Colwell
045e637317 Update OEMCrypto documents am: 15b1cd9cc9 am: 02443e2142 
Change-Id: I5e67c8eb7a93e8d8adb9cec006a1c3b38d869b85
 2020-04-13 18:53:13 +00:00
Fred Gylys-Colwell
0214b1eb5e Update OEMCrypto documents am: 15b1cd9cc9 am: 02443e2142 
Change-Id: Icffccaa3f44c618d615e352cbfa93c3138c9f9a9
 2020-04-13 18:52:56 +00:00
Fred Gylys-Colwell
b38e279ed6 Update OEMCrypto documents am: 15b1cd9cc9 
Change-Id: I2c5f7fc814a621642a2376f98ef25eb4d10c392f
 2020-04-13 18:24:57 +00:00
Fred Gylys-Colwell
02443e2142 Update OEMCrypto documents am: 15b1cd9cc9 
Change-Id: I3036f1fb8c73fa3c8ede0c3686e466f24a90c000
 2020-04-13 18:23:24 +00:00
Fred Gylys-Colwell
15b1cd9cc9 Update OEMCrypto documents 
Merge from Widevine repo of http://go/wvgerrit/97763

There were no function signature changes, so the API version number
did not change from 16.2. There were several grammar and spelling
errors. There were also the following corrections:

1. The description of OEMCrypto_LoadProvisioning now says that devices
with a keybox use keys derived from the keybox device key, and devices
using Provisioning 3.0 use keys derived from the session key. The
description was previously reversed.

2. The function OEMCrypto_SupportedPatterns is no longer
discussed. This function was never fully defined.

3. The function OEMCrypto_LoadRenewal no longer says that keys and key
control blocks should be verified. This is because the function
OEMCrypto_LoadRenewal processes a message with no key control
block. It should update timers for the entire license.

Test: doc and comment change only
Bug: 153731804
Change-Id: I11a3069fcdbf67b369e2e2bc3fea8c08842eeb7b
 2020-04-10 10:12:10 -07:00
Robert Shih
61c4b32ad4 WVDrmPlugin signRSA: check arguments before caller am: 2278917116 am: 983698e6cb am: 4337951ae6 am: 5e84bd348b 
Change-Id: I793e4f2012bc088229d78bcf6afa5dd8e1f9e4e8
 2020-04-08 20:54:05 +00:00
Robert Shih
1de4645aa4 WVDrmPlugin signRSA: check arguments before caller am: 2278917116 am: 1659f38dd4 am: bf48be8d9a 
Change-Id: I0179d5d2db667a55fda2d2b68f6f0f086cfbd868
 2020-04-08 20:39:36 +00:00
Robert Shih
8d21bd759b WVDrmPlugin signRSA: check arguments before caller am: 2278917116 am: 983698e6cb am: b8f7c9ce95 
Change-Id: Ibf164e114c6b7fde04834ff8d4372ea499549c84
 2020-04-08 20:39:06 +00:00