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

4127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dale
bebedce81f Removed provisioning loop in unittests. 
[ Merge of http://go/wvgerrit/98467 ]

The issue with intermediate provisioning request failures with the
development provisioning server has been resolved in b/139206968.

This change removes the provisioning retry loop which was a workaround
for the CDM unit tests.  Should the issue re-arise, it would be useful
to detect it in our unit tests.

Bug: 139361531
Test: Linux unit tests
Change-Id: Ib44c56c740efea562803d3f8f93ffd62bd95e485
 2020-04-22 15:23:35 -07:00
Bharath Chandra Elluru
b0dcd88ec4 Merge "Copy submitted odk fuzzing changes from cdm repository to android" 2020-04-21 18:48:17 +00:00
Bharath Chandra Elluru
d524d840e3 Copy submitted odk fuzzing changes from cdm repository to android 
Merging odk changes from http://go/wvgerrit/98084

Copy submitted changes for oemcrypto/odk/test/fuzzing from cdm
repository to android so that fuzzer scripts in odk can be run
using go/android-fuzzing

Google3 CLs:
http://cl/301943247
http://cl/304011238
http://cl/307142293
http://cl/307087692

Bug: 150900870
Test: The fuzzer scripts can be built once the code is moved to android
tree. Odk fuzzer scripts have been verified and successfully running in
google3

Change-Id: I92b8a357c32b145c7f80bdc93d05214862368957
 2020-04-21 18:42:43 +00: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
27793ede9e Merge "Correct reporting of KeyStatus usable in future" into rvc-dev am: d260c2cf2d am: dec9af442b am: 7ef5203a00 am: 3614e47762 am: dacaaa15c6 
Change-Id: Ic1d0bd03ead7478ebf64e521fabd01ef61044216
 2020-04-20 20:22:16 +00:00
Rahul Frias
c3c0062ec8 Merge "Correct reporting of KeyStatus usable in future" into rvc-dev am: d260c2cf2d am: 0b0d3500ec am: d56a6bffd2 am: 7f8f6dc0bf 
Change-Id: I98dbe434965488778b504e756b4feca49f2eb9ef
 2020-04-20 20:22:03 +00:00
Rahul Frias
ec919ed72a Merge "Correct reporting of KeyStatus usable in future" into rvc-dev am: d260c2cf2d am: dec9af442b am: c00f9a3ce1 am: 3bf1e1b1b5 
Change-Id: If0c534f9724a1507bee01cfc09d7084f20202907
 2020-04-20 20:21:55 +00: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
2e5e7cafa4 Update OEMCrypto documents am: 15b1cd9cc9 am: 02443e2142 am: 0214b1eb5e am: fa4d43d550 am: 8fbdddfd3e 
Change-Id: Ica2e992931c50d66b02644c1de04b80f7d4654b2
 2020-04-13 19:50:31 +00:00
Fred Gylys-Colwell
63c7f1276c Update OEMCrypto documents am: 15b1cd9cc9 am: b38e279ed6 am: d89f49b089 am: 29778ba638 
Change-Id: I73cee05a0e4ef7f6ef875b02ffa59d55fd8a6bf1
 2020-04-13 19:49:28 +00: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
3924a00573 Update OEMCrypto documents am: 15b1cd9cc9 am: 02443e2142 am: 045e637317 am: 12d6316b6f 
Change-Id: I23804e7f976038607b90ee49348a6c66fb0cda69
 2020-04-13 19:48:21 +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
8a0ba9f9f0 WVDrmPlugin signRSA: check arguments before caller am: 2278917116 am: 983698e6cb am: 4337951ae6 am: 5e84bd348b am: 61c4b32ad4 
Change-Id: Ifaf28e503dadb7cefa6afbeb885a92b034f277f6
 2020-04-08 20:55:33 +00:00
Robert Shih
1eb2f523c8 WVDrmPlugin signRSA: check arguments before caller am: 2278917116 am: 1659f38dd4 am: bf48be8d9a am: 1de4645aa4 
Change-Id: Id05bd56caa270e4e8447c48418e98de7b18244b1
 2020-04-08 20:54:58 +00:00
Robert Shih
f688f0616c WVDrmPlugin signRSA: check arguments before caller am: 2278917116 am: 983698e6cb am: b8f7c9ce95 am: 8d21bd759b 
Change-Id: I99050b7dbc1ed1180ff7ca845e15fabc12a934f8
 2020-04-08 20:54:23 +00: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
1854e89cb0 Fix Entitlement Licenses am: 4444ba3b47 am: c9caa507b3 am: 1dbfe524cd am: 69b754b3f9 am: eafd11330e 
Change-Id: I045ddb15d1fe9be87406a8d1063317c367605493
 2020-04-04 00:01:48 +00:00
John W. Bruce
03a5f84557 Fix Entitlement Licenses am: 4444ba3b47 am: 379127929e am: ea7c1d2a82 am: 826ea9b99e 
Change-Id: I36d226d41453d0f5e0e875da839429b713bf8831
 2020-04-04 00:01:16 +00:00
John W. Bruce
04d362df9e Fix Entitlement Licenses am: 4444ba3b47 am: c9caa507b3 am: f810732cdb am: 507267f3fe 
Change-Id: Iaf651f37d1c858db5fbe73c8bf700eb7b1414bb3
 2020-04-04 00:00:28 +00: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