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

3897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
f131f8d261 ODK: Address review comments am: 5a6a2075f5 
Change-Id: I8fe39a7de598510871f870b242f4073f3e333c12
 2020-03-13 21:21:03 +00:00
Cong Lin
a9889aafd7 Remove the access to net.hostname 
Merge of http://go/wvgerrit/95723

This is to remove the reference to net.hostname in
get_unique_id_android.cpp for L3. Keep ro.serialno, and just change the
net.hostname call to setting the constant string.

Bug: 130028203
Test: Ran unit tests
Change-Id: I90d955c117924c16c71f145dea53fe32644d2875
 2020-03-13 14:12:09 -07:00
Edwin Wong
a66d2b392e Clear sessionId regardless of what closeSession returns 
After succeeding openSessionCommon(), when the call to
getSecurityLevel() fails, the code calls closeSession()
and only clears the sessionId if closeSession() fails.
We should always clear sessionId in this case.

Also, make it clearer that the status returned by
getSecurityLevel() does not overwrite the value from
openSessionCommon().

Merged from http://go/wvgerrit/95845

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

Bug: 151364587
Change-Id: I3a9106ffa44c654d3e072a0b0597398d410fc84f
 2020-03-13 11:40:20 -07:00
Cong Lin
5a6a2075f5 ODK: Address review comments 
Merge of http://go/wvgerrit/95666

Mostly fixing coding styles and a few vulnerability check.
Updating tests according to the fix.

Bug: 150614088
Bug: 150881959
Test: Ran cdm and odk unit tests
Change-Id: I109a96ee8ded089d59ab49c2f94b6833c932fd1e
 2020-03-12 18:25:46 -07:00
Automerger Merge Worker
34f1aaea80 Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: a352d99c43 am: 34ded343ec am: 6f570f5df6 am: 9a301e07b7 
Change-Id: Ie6bd49dbdea813799eede53fb59d0dc4355abf6a
 2020-03-13 00:31:13 +00:00
Automerger Merge Worker
9a301e07b7 Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: a352d99c43 am: 34ded343ec am: 6f570f5df6 
Change-Id: Ie199b8d5c20c57d53585409c1da8717a20a8ecdc
 2020-03-13 00:11:39 +00:00
Automerger Merge Worker
d2a4bb59b5 Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: 4f0f2a90ec am: 342417860c am: 00dc188136 
Change-Id: I78f0ed8aec7ca111b2e39a67bf9541a460cd9b34
 2020-03-13 00:00:58 +00:00
Automerger Merge Worker
6d3a128df4 Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: a352d99c43 am: 3550602f92 am: 60b927dca0 
Change-Id: I0556034b8c3ed654e0a42d8ec29abbfc0b0fbfd7
 2020-03-12 23:59:32 +00:00
Automerger Merge Worker
00dc188136 Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: 4f0f2a90ec am: 342417860c 
Change-Id: Iceb71fd410a8fe1790512527435f5a1b77cfd274
 2020-03-12 23:59:06 +00:00
Automerger Merge Worker
6f570f5df6 Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: a352d99c43 am: 34ded343ec 
Change-Id: I16a81b714dd9c4552b60a31af8b152859d2b6ecb
 2020-03-12 23:59:05 +00:00
Automerger Merge Worker
60b927dca0 Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: a352d99c43 am: 3550602f92 
Change-Id: I0d6d8c3f65d6fa3143bb28d58c9c170cdedea13d
 2020-03-12 23:58:53 +00:00
Automerger Merge Worker
396e8f488a Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc am: 24e95938dc am: 2052cdf1a9 am: 781c9537b0 
Change-Id: Ib3bb0ce5922894bf003a55063b997cb96ba52028
 2020-03-12 23:40:37 +00:00
Automerger Merge Worker
34ded343ec Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: a352d99c43 
Change-Id: Idd2f7cb1a808bf517ef5e0cadc2107c493450835
 2020-03-12 23:40:05 +00:00
Automerger Merge Worker
342417860c Merge "openSession_1_1 should return error for wrong security level" into rvc-dev am: fae5d3f7a9 am: 4f0f2a90ec 
Change-Id: Ia51ff1e08302c45aa29328029c5d1e5af387760e
 2020-03-12 23:39:58 +00:00
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
781c9537b0 Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc am: 24e95938dc am: 2052cdf1a9 
Change-Id: I8c7bdafee8a89f2771b19be38546aeb85d51698f
 2020-03-12 22:21:32 +00:00
Automerger Merge Worker
ac596cd0c2 Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: 77aeff11fc am: f9e7986e2d am: ba0952dfe4 
Change-Id: If74f26f8b7ce90a4fbea4a09c24c8decc7ee0702
 2020-03-12 22:12:22 +00:00
Automerger Merge Worker
1449be9a8d Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc am: 567e26b25c am: d06bb307b5 
Change-Id: Ifb59852b74a416a21a4ddfaa29a1b8d5e740436d
 2020-03-12 22:11:24 +00:00
Automerger Merge Worker
ba0952dfe4 Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: 77aeff11fc am: f9e7986e2d 
Change-Id: I5b59a1587c02c8a46c4c1bb4fd3334735079d53c
 2020-03-12 22:01:44 +00:00
Automerger Merge Worker
2052cdf1a9 Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc am: 24e95938dc 
Change-Id: I298bb7b1c2584090f148a186ca9e57a8c521388b
 2020-03-12 22:00:11 +00:00
Automerger Merge Worker
d06bb307b5 Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc am: 567e26b25c 
Change-Id: I84e132ac0cc2447b895d3db0fbc42c697b169571
 2020-03-12 21:59:02 +00:00
Automerger Merge Worker
24e95938dc Merge "Expect Provisioning ID length of upto 64 bytes" into rvc-dev am: f14dea8b89 am: ea491da7fc 
Change-Id: I671b88ee699b239e84caba8b2410eb8b8fefcf6c
 2020-03-12 21:49:47 +00: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
9c2bc3bea0 Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: c43723bb34 am: c1fb910476 am: 57426a0444 am: cac740cb19 
Change-Id: I86f19b7207c6d3248236ab625c872c1dc2777168
 2020-03-12 19:21:28 +00:00
Automerger Merge Worker
2de1ee7faf Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: b12241151a am: 3f9184f277 am: f5970ce6f3 
Change-Id: I86709f356f47db0c5f833659d7634763055de858
 2020-03-12 19:18:23 +00:00
Automerger Merge Worker
75d98d8db6 Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: c43723bb34 am: 405538b65a am: 5abc607c28 
Change-Id: I5be4519fa9a87c30c9a067dd713c03d2839ae37f
 2020-03-12 19:10:26 +00:00
Automerger Merge Worker
cac740cb19 Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: c43723bb34 am: c1fb910476 am: 57426a0444 
Change-Id: Iff5d0cf985f536940a31d249405c2b8bfdbe1d26
 2020-03-12 18:58:24 +00:00
Automerger Merge Worker
f5970ce6f3 Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: b12241151a am: 3f9184f277 
Change-Id: I40ca6860bfb02c6ac577e08a1979c674cd9fd2bc
 2020-03-12 18:52:16 +00:00
Automerger Merge Worker
5abc607c28 Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: c43723bb34 am: 405538b65a 
Change-Id: I945c359126f979c3bfaa7f889feed91083d3468c
 2020-03-12 18:51:00 +00:00
Automerger Merge Worker
57426a0444 Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: c43723bb34 am: c1fb910476 
Change-Id: I34d32d65686c196405d22c08078dbc486310d289
 2020-03-12 18:47:47 +00: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
c1fb910476 Merge "Match usage entry to header" into rvc-dev am: 042efc971d am: c43723bb34 
Change-Id: I4a986d4c9085c784e2297df70f44e1e4c186a76f
 2020-03-12 18:30:51 +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
e6df50aa5e L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 am: 6d086900d0 am: bd352fb549 am: 8f4420761e 
Change-Id: Iadf830d1b456e4f32dc68d828d16b81a26769cd0
 2020-03-12 00:13:51 +00:00
Automerger Merge Worker
8f4420761e L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 am: 6d086900d0 am: bd352fb549 
Change-Id: Idec6e51026b4396a72e250f16c602b9028a205e6
 2020-03-12 00:04:52 +00:00
Automerger Merge Worker
dbd091b4b6 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: 93e106639c am: ad09f8de21 am: 7b78f69127 
Change-Id: I36b3969d38ccae5e55e37637165d02db1d54f629
 2020-03-12 00:04:43 +00:00
Automerger Merge Worker
3777f1389d L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04 am: 6acc649d33 am: 5fb9c96d35 
Change-Id: I93deefe19d76b7f9b544efd278ed1535adb7fd0b
 2020-03-12 00:04:15 +00:00