Rahul Frias
ada42ea839
Merge "Key Status should reflect key container security level" into qt-dev am: 80f5e283ad
...
am: ba774bcc0b
2019-05-14 16:50:40 -07:00
Fred Gylys-Colwell
2381f9b187
Report OEMCrypto Build Information in License Request am: 5ee5d00514
...
am: 1b766afb51
2019-05-14 16:47:05 -07:00
Adam Stone
b10fa7c209
Merge "Correctly sets provisioning state for test." into qt-dev am: c71fb10b95
...
am: 0b47db66a2
2019-05-14 16:44:56 -07:00
John Bruce
b342ad389b
Merge "Disallow Blank App Package Name on Q and Later" into qt-dev am: 8a0ba4d0fa
...
am: 0fa4cc664d
2019-05-14 16:41:20 -07:00
Fred Gylys-Colwell
6a4a3d9929
Merge "Update unit tests for v15.2" into qt-dev am: 2f79fe2773
...
am: 99a6c8a10d
2019-05-14 16:37:44 -07:00
Jeff Tinker
0d0ccae089
Merge "hidl plugin: add sendKeysChange_1_2" into qt-dev am: 83068b97c8
...
am: 85590f243e
2019-05-14 16:33:43 -07:00
Fred Gylys-Colwell
44962e3684
Test MAC signature after license reload am: 407d39699b
...
am: e36786cca8
2019-05-14 16:29:51 -07:00
Fred Gylys-Colwell
ebf930796b
Merge "Test loading second call to LoadKeys fails" into qt-dev am: a1e94e2eb1
...
am: 666ba585c4
2019-05-14 16:20:15 -07:00
Fred Gylys-Colwell
f9c3c2022e
Merge "Update docs for OEMCrypto v15.2" into qt-dev am: 3b9b77c7c7
...
am: c876186cf8
2019-05-14 16:12:40 -07:00
Rahul Frias
fcf39dfe7c
Merge "Handle key rotation" into qt-dev am: 862cb96e77
...
am: 544a04b334
2019-05-14 16:05:46 -07:00
Rahul Frias
090d9d409b
Merge "Ref count Timer implementation" into qt-dev am: ed833222a6
...
am: 389d917e88
2019-05-13 14:23:19 -07:00
Rahul Frias
389d917e88
Merge "Ref count Timer implementation" into qt-dev
...
am: ed833222a6
2019-05-13 13:57:13 -07:00
Rahul Frias
ed833222a6
Merge "Ref count Timer implementation" into qt-dev
2019-05-13 20:24:45 +00:00
Rahul Frias
c9c3e6ab6f
Merge "Single PSSH entitlement handling" into qt-dev am: 19c6e57269
...
am: f13e62fbe3
2019-05-13 09:49:41 -07:00
Rahul Frias
f1bb063682
Merge "Key Status should reflect key container security level" into qt-dev am: 80f5e283ad
...
am: 555d7cdc83
2019-05-13 09:49:24 -07:00
Rahul Frias
f13e62fbe3
Merge "Single PSSH entitlement handling" into qt-dev
...
am: 19c6e57269
2019-05-13 09:45:01 -07:00
Rahul Frias
ba774bcc0b
Merge "Key Status should reflect key container security level" into qt-dev
...
am: 80f5e283ad
2019-05-13 09:44:44 -07:00
Rahul Frias
555d7cdc83
Merge "Key Status should reflect key container security level" into qt-dev
...
am: 80f5e283ad
2019-05-13 09:44:39 -07:00
Rahul Frias
19c6e57269
Merge "Single PSSH entitlement handling" into qt-dev
2019-05-13 16:26:16 +00:00
Rahul Frias
80f5e283ad
Merge "Key Status should reflect key container security level" into qt-dev
2019-05-13 16:25:24 +00:00
Rahul Frias
4d917e3ee8
Ref count Timer implementation
...
[ Merge of http://go/wvgerrit/78763 ]
The android timer instance is held by a regular pointer rather
than reference counted as all classes that derive from RefBase
should be. This could result in a double deallocation, if the
timer is ever passed to a strong pointer.
Bug: 79364026
Test: WV unit/integration tests. GtsMediaTestCases. Play movies
playback tests.
Change-Id: I01f622bc045e1012f2240b3775a6d121f9415463
2019-05-12 02:15:12 -07:00
Fred Gylys-Colwell
878e39c740
Report OEMCrypto Build Information in License Request am: 5ee5d00514
...
am: 23c3bc8ebc
2019-05-10 06:30:12 -07:00
Fred Gylys-Colwell
23c3bc8ebc
Report OEMCrypto Build Information in License Request
...
am: 5ee5d00514
2019-05-10 01:49:56 -07:00
Fred Gylys-Colwell
1b766afb51
Report OEMCrypto Build Information in License Request
...
am: 5ee5d00514
2019-05-10 01:27:07 -07:00
Rahul Frias
7d78609548
Key Status should reflect key container security level
...
[ Merge of http://go/wvgerrit/77506 ]
Callers of MediaDrm can register to be notified when key status
changes and if they are usable for decryption. A number of factors
are evaluated when making this determination. Key container security
level will now be included in the evaluation.
Bug: 78652608
Test: WV unit/integration test, GtsMediaDrmTest, Play movies playback
testing.
Change-Id: I20243e5cb160f7957e3239e8d05f715ff0ee6dd6
2019-05-09 22:16:23 -07:00
Fred Gylys-Colwell
5ee5d00514
Report OEMCrypto Build Information in License Request
...
Merge from Widevine repo of http://go/wvgerrit/78623
This updates the license request client identification to include
OEMCrypto build information.
Bug: 129070445
Test: ExoPlayer on crosshatch with mod mock
Change-Id: I0dbce0cca4e9810e14f60561e4e434f1dbcadfb6
2019-05-09 13:24:04 -07:00
Adam Stone
c653a9dadc
Merge "Correctly sets provisioning state for test." into qt-dev am: c71fb10b95
...
am: c47c1d7575
2019-05-08 18:32:29 -07:00
Adam Stone
0b47db66a2
Merge "Correctly sets provisioning state for test." into qt-dev
...
am: c71fb10b95
2019-05-08 17:37:19 -07:00
Adam Stone
c47c1d7575
Merge "Correctly sets provisioning state for test." into qt-dev
...
am: c71fb10b95
2019-05-08 17:32:51 -07:00
Adam Stone
c71fb10b95
Merge "Correctly sets provisioning state for test." into qt-dev
2019-05-08 23:29:17 +00:00
Adam Stone
3a27d2d649
Correctly sets provisioning state for test.
...
[ Merge from http://go/wvgerrit/78383 ]
Bug: http://b/121049662
Test: Re-ran the unit test.
Change-Id: I62c00f425c93b588e123ddd8b1093177f2e9b241
2019-05-08 14:13:28 -07:00
John Bruce
f4f03565e1
Merge "Disallow Blank App Package Name on Q and Later" into qt-dev am: 8a0ba4d0fa
...
am: a10f45c497
2019-05-08 13:10:24 -07:00
John Bruce
a10f45c497
Merge "Disallow Blank App Package Name on Q and Later" into qt-dev
...
am: 8a0ba4d0fa
2019-05-08 12:33:36 -07:00
John Bruce
0fa4cc664d
Merge "Disallow Blank App Package Name on Q and Later" into qt-dev
...
am: 8a0ba4d0fa
2019-05-08 12:32:41 -07:00
John Bruce
8a0ba4d0fa
Merge "Disallow Blank App Package Name on Q and Later" into qt-dev
2019-05-08 18:58:40 +00:00
Fred Gylys-Colwell
cb12eacfc4
Merge "Update unit tests for v15.2" into qt-dev am: 2f79fe2773
...
am: d0b62c1b8d
2019-05-08 11:38:46 -07:00
Jeff Tinker
fabf6f5311
Merge "hidl plugin: add sendKeysChange_1_2" into qt-dev am: 83068b97c8
...
am: 3caf992795
2019-05-08 11:20:47 -07:00
Fred Gylys-Colwell
99a6c8a10d
Merge "Update unit tests for v15.2" into qt-dev
...
am: 2f79fe2773
2019-05-08 11:07:50 -07:00
Fred Gylys-Colwell
d0b62c1b8d
Merge "Update unit tests for v15.2" into qt-dev
...
am: 2f79fe2773
2019-05-08 11:07:48 -07:00
Jeff Tinker
85590f243e
Merge "hidl plugin: add sendKeysChange_1_2" into qt-dev
...
am: 83068b97c8
2019-05-08 10:49:52 -07:00
Jeff Tinker
3caf992795
Merge "hidl plugin: add sendKeysChange_1_2" into qt-dev
...
am: 83068b97c8
2019-05-08 10:49:43 -07:00
Fred Gylys-Colwell
2f79fe2773
Merge "Update unit tests for v15.2" into qt-dev
2019-05-08 17:36:36 +00:00
Jeff Tinker
83068b97c8
Merge "hidl plugin: add sendKeysChange_1_2" into qt-dev
2019-05-08 17:17:43 +00:00
Fred Gylys-Colwell
a35722f358
Test MAC signature after license reload am: 407d39699b
...
am: a3d5e7be6a
2019-05-08 00:53:00 -07:00
Fred Gylys-Colwell
a3d5e7be6a
Test MAC signature after license reload
...
am: 407d39699b
2019-05-08 00:09:35 -07:00
Fred Gylys-Colwell
e36786cca8
Test MAC signature after license reload
...
am: 407d39699b
2019-05-08 00:05:05 -07:00
Rahul Frias
da25bce428
Single PSSH entitlement handling
...
[ Merge of http://go/wvgerrit/78425 ]
This CL refactors code, corrects comments and adds additional
integration tests.
Bug: 128462397
Test: WV unit/integration tests, GPlay playback tests and GtsMediaDrmTests
Change-Id: I679960d44c45cf4ff13c27eb960e66ec63f491b5
2019-05-07 23:07:05 -07:00
Fred Gylys-Colwell
96431e9c2d
Update unit tests for v15.2
...
Merge from Widevine repo of http://go/wvgerrit/77609
For v15.2 we require that nonces not collide across sessions and there are
restrictions placed on the mac key's IV in LoadKeys.
Test: ran unit tests on reference code
Bug: 131325434
Bug: 131326334
Change-Id: I1bb01c30d8c15d66d762c28b57d7700c44daa835
2019-05-07 22:50:06 -07:00
John W. Bruce
edccc13510
Disallow Blank App Package Name on Q and Later
...
(This is a merge of http://go/wvgerrit/78105 )
The Widevine Android CDM should not allow itself to be instantiated
without an app package name, as this breaks SPOID protection.
Unfortunately, pathways exist prior to Android Q that allow this to
happen, and we cannot break these devices by changing the behavior now.
As such, we will only refuse to allow instantiation without an app
package name on devices first launched with Q and later.
This change also migrates the WVDrmFactory and its tests away from
explicitly naming friend classes for individual test, in favor of the
now-recommended "test peer" pattern.
Bug: 65680731
Test: libwvdrmengine_hidl_test
Test: CTS NativeMediaDrmClearkeyTest
Change-Id: Icccd1d8b9972ef6ad7e5b0dbf2d37ec987656385
2019-05-08 01:08:11 +00:00
Fred Gylys-Colwell
407d39699b
Test MAC signature after license reload
...
Merge from Widevine repo of http://go/wvgerrit/78143
This verifies that the correct mac keys are used to sign a message when
generating a usage report or secure stop.
Test: unit tests on ref code and taimen
Bug: 111261264
Change-Id: I7d56a6ff0aae68a5554f7ce84d467697d1f9997b
2019-05-07 19:09:53 +00:00
