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

3694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
3550602f92 Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: a352d99c43 
Change-Id: Icdb8c31d2fc29d59c16abf6973bf46feb9a62914
 2020-03-12 23:39:48 +00:00
Automerger Merge Worker
4f0f2a90ec Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 
Change-Id: Idb2ae8f90efd0639ac4e6e5f36e5e976e8a6033e
 2020-03-12 23:20:22 +00:00
Automerger Merge Worker
a352d99c43 Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 
Change-Id: I8930bafb6c2e3b64508098a60f26f70ab181720e
 2020-03-12 23:20:14 +00:00
Edwin Wong
fae5d3f7a9 Merge "openSession_1_1 should return error for wrong security level" into rvc-dev 2020-03-12 23:06:33 +00:00
Rahul Frias
89d19be766 Disable delayed termination on unprovisioning 
[ Merge of http://go/wvgerrit/95784 ]

On unprovisioning, all persistent state/files are deleted. If a
provisioning session is opened soon after, |OEMCrypto_Terminate|
and |OEMCrypto_Initialize| will not be called. The (deleted) device
key will remain resident in memory and will not be regenerated until
|OEMCrypto_Initialize| is called. Any L3 licenses created will be
associated with a device key that does not exist, at least after
OEMCrypto is terminated.

By disabling delayed termination of OEMCrypto, OEMCrypto will be
terminated and initialized immediately on unprovisioning.

Bug: 149808504
Test: WV unit/integration tests on L3
Change-Id: Id3fbce621b47a723ff624cf45f1ac203421a8dba
 2020-03-12 15:58:33 -07:00
Automerger Merge Worker
f9e7986e2d Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: 77aeff11fc 
Change-Id: Ic63d9bdbe0455dc48b256e10b60e5a4c2cecec48
 2020-03-12 21:49:47 +00:00
Automerger Merge Worker
567e26b25c Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc 
Change-Id: Ia613b64fbf4afa639282f56dc72b38e576a4484b
 2020-03-12 21:49:22 +00:00
Automerger Merge Worker
77aeff11fc Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 
Change-Id: I5b33480bfd1a7f1c03166bc3d7001e1e8460851b
 2020-03-12 21:39:07 +00:00
Automerger Merge Worker
ea491da7fc Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 
Change-Id: Ia2e3f84ff661869eae138057447d2ac35251eb64
 2020-03-12 21:39:00 +00:00
Rahul Frias
f14dea8b89 Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev 2020-03-12 21:22:35 +00:00
Rahul Frias
a42273e67f Expect Provisioning ID length of upto 64 bytes 
[ Merge of http://go/wvgerrit/95508 ]

The provisioning ID length will be 32 bytes when the device supports a
keybox or OEM certificates and does not implement |OEMCrypto_GetDeviceId|.
If a device supports OEM Certificates and implements |OEMCrypto_GetDeviceId|
it may be an arbitrary length upto 64 bytes.

Bug: 150393659
Test: WV unit/integration tests
Change-Id: I5e4dbc8f2f9ca326425d0313f4823b72bd6ac7c0
 2020-03-12 12:30:37 -07:00
Automerger Merge Worker
3f9184f277 Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: b12241151a 
Change-Id: Ibc0b5cbafed6c23cfb96e79fe64b553215f0a28d
 2020-03-12 18:33:09 +00:00
Automerger Merge Worker
405538b65a Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: c43723bb34 
Change-Id: Ie511482529f2e73b24f9f74d16f796dd3f633bb0
 2020-03-12 18:30:28 +00:00
Automerger Merge Worker
c43723bb34 Merge "Match usage entry to header" into rvc-dev am: 042efc971d 
Change-Id: Idcd0ba1346a045ef0cdb549bad3c5089bcf27173
 2020-03-12 18:13:49 +00:00
Automerger Merge Worker
b12241151a Merge "Match usage entry to header" into rvc-dev am: 042efc971d 
Change-Id: Ibaa51743d7e2dd60e62ceb2dc976f53bda40d14b
 2020-03-12 18:13:43 +00:00
TreeHugger Robot
042efc971d Merge "Match usage entry to header" into rvc-dev 2020-03-12 18:00:06 +00:00
Edwin Wong
bdb69f73e8 openSession_1_1 should return error for wrong security level 
Currently, if requestedLevel is not the same as the
current security level, openSession_1_1 still returns
Status::OK, we should return an error status.

Merged from http://go/wvgerrit/95507

Test: unit test
  adb shell LD_LIBRARY_PATH="/vendor/lib64" /data/nativetest/libwvdrmdrmplugin_hidl_test

Bug: 150407669

Change-Id: I5673ac7bbe7a234ddd07bb9c145135486fb9e583
 2020-03-11 17:39:44 -07:00
Automerger Merge Worker
ad09f8de21 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: 93e106639c 
Change-Id: I1e2c56a682d88c3acbd61e58ad87faa77c00e3a3
 2020-03-11 23:35:42 +00:00
Automerger Merge Worker
6acc649d33 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 
Change-Id: I068b8ab7e8fc33dfcbf3c40111dfb0d4d446bb58
 2020-03-11 23:35:32 +00:00
Automerger Merge Worker
93e106639c L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 
Change-Id: If73c5faa27ee6da1c237c3045291a57638e23453
 2020-03-11 23:23:22 +00:00
Automerger Merge Worker
ace03ffb04 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 
Change-Id: I71c41ba43edb99f167435c72d02ec97de4948b34
 2020-03-11 23:22:56 +00:00
Cong Lin
5cd0fd7992 L3 oemcrypto: Replace NULL with nullptr 
Merge from Widevine repo of https://widevine-internal-review.git.corp.google.com/c/cdm/+/95206

Only one file is affected in Android repo.

Bug: 149050172
Test: Unit tests
Change-Id: I3251b9997733e59b18c0b5727205067dcc3a963c
 2020-03-10 19:47:36 -07:00
Automerger Merge Worker
20f35baf2e Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: ea944065a1 
Change-Id: Ia2d7da3accd5db42206801a27d490d7e7fa2a337
 2020-03-10 09:18:59 +00:00
Automerger Merge Worker
3e1ededa8b Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: e77b1913c9 
Change-Id: Ie350a8e49993d37cc8d263633469eb97ec89257a
 2020-03-10 09:18:45 +00:00
Automerger Merge Worker
ea944065a1 Merge "Update tests for license release" into rvc-dev am: b8570949e4 
Change-Id: I625fb36cfe62ff600c9428f10061d397ffb6c68c
 2020-03-10 09:02:22 +00:00
Automerger Merge Worker
e77b1913c9 Merge "Update tests for license release" into rvc-dev am: b8570949e4 
Change-Id: I78abac92ac31ba82904058c3c80ccacf3edbbada
 2020-03-10 09:01:45 +00:00
TreeHugger Robot
b8570949e4 Merge "Update tests for license release" into rvc-dev 2020-03-10 08:49:47 +00:00
Fred Gylys-Colwell
469c17777e Match usage entry to header 
Merge from Widevine repo of http://go/wvgerrit/95463

In the unit tests ReloadUsageTableWithSkew, we load a header that has
a generation number off by 1. This is allowed. However, we then try to
load the current entry, which is newer than the header. Instead, we
should try to load the entry that went with the header.

Bug: 139828114
Test: Ran unit tests
Change-Id: I87261501d8ee2b91a07c2b5dff17fc0ea950244d
 2020-03-09 20:40:15 -07:00
Fred Gylys-Colwell
037918aa49 Update tests for license release 
Merge from Widevine repo of http://go/wvgerrit/95403

This updates the test code CreateDefaultResponse to make sure that
license releases do not have a core message, and that the key control
block is correctly set for renewals.

Also, the unit test OEMCryptoUsageTableTest.TimingTest is changed to
only a license release when the license is inactive. If the license is
still active, then the license is loaded before generating a usage
report.

Test: Ran full unit tests
Bug: 151092673
Change-Id: I7c01fd17f9b66e88ab3c57aa0f3d40740f13507c
 2020-03-09 20:11:23 -07:00
Automerger Merge Worker
211efe559d Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: 2aeaa05b60 
Change-Id: Ibd94ac68e77e1082ddd37b6b4021cce4be168c2c
 2020-03-09 21:43:26 +00:00
Automerger Merge Worker
f14c6f1ea5 Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: 35ee931874 
Change-Id: I0b6c5753c558021adb56061bca1823aa165ee508
 2020-03-09 21:43:12 +00:00
Automerger Merge Worker
3342d9b32a Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 am: d8c7168f43 
Change-Id: Id62d6000461556b958bc4b921b755cac3eaf5f20
 2020-03-09 21:43:00 +00:00
Automerger Merge Worker
35fd7cd921 Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 am: cbfb68abdc 
Change-Id: I69e7e60f87061974a9bb499364c15a306c3e098a
 2020-03-09 21:42:54 +00:00
Automerger Merge Worker
433c61bf5d Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 am: 1729fb68e4 
Change-Id: I852a973ba31d6baf9e93454af42e7306fd8e6a3f
 2020-03-09 21:42:49 +00:00
Automerger Merge Worker
e8e7c142e0 Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 am: e61f87a18a 
Change-Id: I1304dd3824ca258bbcd8978b963ad530c558945e
 2020-03-09 21:42:35 +00:00
Automerger Merge Worker
2aeaa05b60 Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 
Change-Id: I70e27dcc685105105185fb8c23edfc05f88aee8e
 2020-03-09 21:34:00 +00:00
Automerger Merge Worker
d8c7168f43 Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev am: 2356842fd2 
Change-Id: I18327a1679ecba78d2ecf465e589713a8b8113cb
 2020-03-09 21:32:15 +00:00
TreeHugger Robot
2356842fd2 Merge "Treat the (0,0) Pattern as 'cbcs'" into rvc-dev 2020-03-09 21:22:37 +00:00
Automerger Merge Worker
35ee931874 Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 
Change-Id: Id56f1650eaf2f612aa1e7f732406a710fab38495
 2020-03-09 21:18:15 +00:00
Automerger Merge Worker
cbfb68abdc Merge "Remove ODK from unused makefiles" into rvc-dev am: 7da5b8be92 
Change-Id: I35e3f958081d8431bacf2d94f2acb0bceb5ec34a
 2020-03-09 21:18:06 +00:00
Automerger Merge Worker
1729fb68e4 Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 
Change-Id: I1193ffd0df03038f1937f48a1f3118445035c9ac
 2020-03-09 21:17:54 +00:00
Automerger Merge Worker
e61f87a18a Merge "Cache Max Subsample Size" into rvc-dev am: 0bd6a38096 
Change-Id: If860c7bbcc027a1492d7d5f502ee2bca95393eb7
 2020-03-09 21:17:54 +00:00
TreeHugger Robot
7da5b8be92 Merge "Remove ODK from unused makefiles" into rvc-dev 2020-03-09 21:05:22 +00:00
TreeHugger Robot
0bd6a38096 Merge "Cache Max Subsample Size" into rvc-dev 2020-03-09 21:03:52 +00:00
Automerger Merge Worker
08ff07ca68 Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046 am: f3eb69d209 
Change-Id: Ie448b1c9a8883aa985e4d5a5c313bea4efcf9a57
 2020-03-09 20:32:25 +00:00
Automerger Merge Worker
3eee42087a Filter out nonrequired tests for v15 devices am: a11d764d8d am: fd0b6b72ee 
Change-Id: Ifd890bc9770ac6f100776051ad2dfaa090ab1394
 2020-03-09 20:28:25 +00:00
Automerger Merge Worker
d5eac2c5fb Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046 am: 8791b6ff22 
Change-Id: I335fef53b1055c567aafeba20f74365cbbad1a1a
 2020-03-09 20:15:39 +00:00
Automerger Merge Worker
f3eb69d209 Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046 
Change-Id: I058ca965bbd6243243d7670b145ab5b628fefdae
 2020-03-09 20:11:04 +00:00
Automerger Merge Worker
8791b6ff22 Merge "Unit test for OEMCrypto_LoadUsageEntry in multiple sessions" into rvc-dev am: bf5c819046 
Change-Id: I875f2df0bed5a97192ce702a4be456a573bedb95
 2020-03-09 20:10:04 +00:00
Automerger Merge Worker
b8893bc73f Filter out nonrequired tests for v15 devices am: a11d764d8d am: 6934d3242f 
Change-Id: Icb23ef76f858863e3e9c0fdf5e9bcaf93efda86d
 2020-03-09 20:08:19 +00:00