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

3898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Shih
5e84bd348b WVDrmPlugin signRSA: check arguments before caller am: 2278917116 am: 983698e6cb am: 4337951ae6 
Change-Id: I8353f7e20a1fd6f2c9d71e1f88f4e3c1e8c6e6ad
 2020-04-08 20:38:30 +00:00
Robert Shih
bf48be8d9a WVDrmPlugin signRSA: check arguments before caller am: 2278917116 am: 1659f38dd4 
Change-Id: I9f2ec442ca45e27b41caf7f0d560927539e027b2
 2020-04-08 20:26:12 +00:00
Robert Shih
4337951ae6 WVDrmPlugin signRSA: check arguments before caller am: 2278917116 am: 983698e6cb 
Change-Id: I876f45a8f9d101dc2019e73bc9623cab8c6786c2
 2020-04-08 20:25:07 +00:00
Robert Shih
b8f7c9ce95 WVDrmPlugin signRSA: check arguments before caller am: 2278917116 am: 983698e6cb 
Change-Id: Ib6b8e488f99ce244da01aad2fee7325d0db0ac34
 2020-04-08 20:24:56 +00:00
Robert Shih
1659f38dd4 WVDrmPlugin signRSA: check arguments before caller am: 2278917116 
Change-Id: Iaaf830cd60c417bbc595a175d901a6088861eab0
 2020-04-08 20:08:44 +00:00
Robert Shih
983698e6cb WVDrmPlugin signRSA: check arguments before caller am: 2278917116 
Change-Id: Ic5b158f14835176a412b3d350cdd080f674f6b61
 2020-04-08 20:08:33 +00:00
Robert Shih
2278917116 WVDrmPlugin signRSA: check arguments before caller 
Merge of http://go/wvgerrit/97444

Bug: 153356263
Test: VtsHalDrmV1_0Target
Test: VtsHalDrmV1_3Target
Change-Id: Ic27056d86804972859a85c0eb2a0e79a0563d040
 2020-04-06 16:13:40 -07:00
John W. Bruce
eafd11330e Fix Entitlement Licenses am: 4444ba3b47 am: c9caa507b3 am: 1dbfe524cd am: 69b754b3f9 
Change-Id: I11b6cd497c33590745124a2c54057bdd830ee762
 2020-04-04 00:00:01 +00:00
John W. Bruce
69b754b3f9 Fix Entitlement Licenses am: 4444ba3b47 am: c9caa507b3 am: 1dbfe524cd 
Change-Id: If849e86228dae304e4b965f493ec2d7fbf33e463
 2020-04-03 23:39:44 +00:00
John W. Bruce
826ea9b99e Fix Entitlement Licenses am: 4444ba3b47 am: 379127929e am: ea7c1d2a82 
Change-Id: I5263e4a4a0adb33417e92a62b1f46581188267c1
 2020-04-03 23:38:09 +00:00
John W. Bruce
507267f3fe Fix Entitlement Licenses am: 4444ba3b47 am: c9caa507b3 am: f810732cdb 
Change-Id: I75c661365e01cd902124df5281c9af63ac45a54c
 2020-04-03 23:37:35 +00:00
John W. Bruce
ea7c1d2a82 Fix Entitlement Licenses am: 4444ba3b47 am: 379127929e 
Change-Id: I6d2fe6251847ffcbbccbb78380a89584739356db
 2020-04-03 23:17:32 +00:00
John W. Bruce
f810732cdb Fix Entitlement Licenses am: 4444ba3b47 am: c9caa507b3 
Change-Id: I81f5d4f636081bb2682004c18bbd723584f04bd0
 2020-04-03 23:17:21 +00:00
John W. Bruce
1dbfe524cd Fix Entitlement Licenses am: 4444ba3b47 am: c9caa507b3 
Change-Id: I0a82b9409708fb4a32609be4c663954f896b9194
 2020-04-03 23:17:09 +00:00
John W. Bruce
c9caa507b3 Fix Entitlement Licenses am: 4444ba3b47 
Change-Id: I8fc3a51bf829a0036928d2ae7b55d6d69cd7a483
 2020-04-03 22:54:25 +00:00
John W. Bruce
379127929e Fix Entitlement Licenses am: 4444ba3b47 
Change-Id: Ib438a6659f401e59cf58671dbac3f2cc865a5b0e
 2020-04-03 22:54:22 +00:00
John W. Bruce
4444ba3b47 Fix Entitlement Licenses 
(This is a merge of http://go/wvgerrit/97083.)

The switch from LoadKeys to LoadLicense broke entitlement licenses
entirely because the LoadLicense path in CryptoSession didn't include
any affordances for updating the KeySession, unlike the LoadKeys path.
This patch adds code to handle this.

Bug: 152814106
Test: CE CDM Unit Tests
Test: Android Unit Tests
Change-Id: Id0c33a566e17e6be8da04e12be4b0fc87559aa8f
 2020-04-03 22:33:40 +00:00
Fred Gylys-Colwell
323f295b72 Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: b1d7728b29 am: f7da678770 am: 32ac45f9bb 
Change-Id: I8492e0f3a816646949fe0bed5118a43c7e5ff700
 2020-04-03 18:00:31 +00:00