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
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
c2d8ada118
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: b1d7728b29 am: f7da678770 am: 32ac45f9bb am: 323f295b72
...
Change-Id: Id4c7c50c812ee37b1784a20cf8b4c3f773760576
2020-04-03 18:15:01 +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
Fred Gylys-Colwell
01c6dcb28c
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: 3c71641040 am: 30aaa6ba10 am: 256df64144
...
Change-Id: I48307fafdf97674d498ee006a0fba0f7642d40f6
2020-04-03 17:58:32 +00:00
Fred Gylys-Colwell
dd9fe42894
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: b1d7728b29 am: dd209b595a am: afb175b368
...
Change-Id: Ib6a3bf8ceeac9207d73c100df7c581f7f60a6439
2020-04-03 17:57:59 +00:00
Fred Gylys-Colwell
256df64144
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: 3c71641040 am: 30aaa6ba10
...
Change-Id: Idd9f1660ab0cc61051cd5216dea3d72ad8d0c787
2020-04-03 17:42:37 +00:00
Fred Gylys-Colwell
32ac45f9bb
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: b1d7728b29 am: f7da678770
...
Change-Id: If50288cf22f06b3c828d2d478563f8099a43a066
2020-04-03 17:41:53 +00:00
Fred Gylys-Colwell
afb175b368
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: b1d7728b29 am: dd209b595a
...
Change-Id: I2b67084dbe917644a7a6152abf832baa03f2effa
2020-04-03 17:39:26 +00:00
Fred Gylys-Colwell
30aaa6ba10
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: 3c71641040
...
Change-Id: I639e1d711cba7aedd1009ac11416a1840a3adc17
2020-04-03 17:17:10 +00:00
Fred Gylys-Colwell
dd209b595a
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: b1d7728b29
...
Change-Id: I54ea0789a803923bf2dab95ed71eda52cdb60d9b
2020-04-03 17:16:19 +00:00
Fred Gylys-Colwell
f7da678770
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4 am: b1d7728b29
...
Change-Id: Ib139a700f2bc6b74999abdfb7618ad9d265cae22
2020-04-03 17:16:11 +00:00
Fred Gylys-Colwell
b1d7728b29
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4
...
Change-Id: Ib75c6d6ba0ede24858827da7c611d1888bf5baf3
2020-04-03 16:54:40 +00:00
Fred Gylys-Colwell
3c71641040
Merge "Adjust time for unit tests" into rvc-dev am: bab44e0ad4
...
Change-Id: I021dcc56aa8619325f9c97b632562cc8e387c2a2
2020-04-03 16:54:29 +00:00
Fred Gylys-Colwell
bab44e0ad4
Merge "Adjust time for unit tests" into rvc-dev
2020-04-03 16:30:53 +00:00
Fred Gylys-Colwell
67aaa1c309
Adjust time for unit tests
...
Merge from Widevine repo of http://go/wvgerrit/96843
This CL modifies the system time used by the reference OEMCrypto so
that it recovers from a clock rollback. When the clock rolls back, it
now adjusts the current time and continues forward. This is needed
when running unit tests on some platforms that reset the clock at
the beginning of a test.
Bug: 152649427
Test: unit tests on buildbot. (No production code on Android)
Change-Id: I7edcdc0cd4e5938c9a54e745d3a0e008f9eb13ed
2020-04-03 16:28:38 +00:00
TreeHugger Robot
906363bf57
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 3fdeb011df am: 52616ab94b am: ba80e974ea am: 5d1b020aeb
...
Change-Id: I612d807b260d06769e29911f189094b28dd572dc
2020-04-02 00:47:33 +00:00
TreeHugger Robot
5d1b020aeb
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 3fdeb011df am: 52616ab94b am: ba80e974ea
...
Change-Id: I3115a9c41e4493f56c6c5f0927f74a4e25f1e570
2020-04-02 00:35:51 +00:00
TreeHugger Robot
84de11f6ec
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 3fdeb011df am: 74372b97bd am: 0d3e42d557
...
Change-Id: If8bed7b53e1a1424928f8d343594c70c957caa03
2020-04-02 00:35:26 +00:00
TreeHugger Robot
09121feb52
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 5775aff942 am: d251cea528 am: b196554f90
...
Change-Id: Ie324f4fc78d93efef42889cffdc98f9dfd34dc27
2020-04-02 00:34:58 +00:00
TreeHugger Robot
0d3e42d557
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 3fdeb011df am: 74372b97bd
...
Change-Id: I51145567274971831422fde8d0b7b31becceda1c
2020-04-02 00:09:32 +00:00
TreeHugger Robot
ba80e974ea
Merge "CryptoSession: Propagate err from GetSystemIdInternal in Open" into rvc-dev am: 4fe638a779 am: 3fdeb011df am: 52616ab94b
...
Change-Id: I68ce3a280d3fd0133c6f58d6be9a21991578c3ed
2020-04-02 00:09:10 +00:00
