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

3528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cong Lin
1a48869f53 (WV to Android) Fix un-initialized-value warning as error in odk_test am: 78fddc230a am: 45b6d363c1 
Change-Id: Ibc387425ccffb4f33ae69c2ff66b4f553634573c
 2020-03-18 03:05:39 +00:00
Cong Lin
f0d789eb9a (WV to Android) Fix un-initialized-value warning as error in odk_test am: 78fddc230a am: 4f90f4f023 
Change-Id: Ic3e9f9f01f35e434ebc0aef00220a7e23425b6a6
 2020-03-18 03:04:40 +00:00
Cong Lin
4f90f4f023 (WV to Android) Fix un-initialized-value warning as error in odk_test am: 78fddc230a 
Change-Id: I277324d66ec0f684b4db5545831f89b441e22be3
 2020-03-18 02:51:17 +00:00
Cong Lin
45b6d363c1 (WV to Android) Fix un-initialized-value warning as error in odk_test am: 78fddc230a 
Change-Id: Ia1d6743f0fdd1f7856fe5b645b0ce2f2465d0661
 2020-03-18 02:50:03 +00:00
Cong Lin
78fddc230a (WV to Android) Fix un-initialized-value warning as error in odk_test 
Merge from Widevine repo of http://go/wvgerrit/95968

Un-initialized int array allocated on heap is detected by MemorySanitizer using this command:

rabbit test --config=msan --keep_going --compilation_mode=opt --runs_per_test=1 //video/widevine/export/common/oemcrypto_core_message/odk:odk_test

Bug: 151339875
Test: cdm and odk unit tests
Change-Id: Ic3329b918636a58eccb518ded7b262c4d98c3644
 2020-03-17 21:44:17 +00:00
Automerger Merge Worker
92f6e8593d Merge "Use production provisioning server for unit tests" into rvc-dev am: 7cd0aacedb am: c8ca1caf7d 
Change-Id: I1d6b34367da7b291bcd5244f069fe4f17c654ff1
 2020-03-16 06:57:29 +00:00
Automerger Merge Worker
013ee6259f Merge "Use production provisioning server for unit tests" into rvc-dev am: 7cd0aacedb am: c9d2afd386 
Change-Id: I1056cc89ff0849a1bd5e0781ee584ad1ca765279
 2020-03-16 06:57:02 +00:00
Automerger Merge Worker
c8ca1caf7d Merge "Use production provisioning server for unit tests" into rvc-dev am: 7cd0aacedb 
Change-Id: I6a9d254b9b8984d4b550aac0dc3c23347fe60f87
 2020-03-16 06:38:33 +00:00
Automerger Merge Worker
c9d2afd386 Merge "Use production provisioning server for unit tests" into rvc-dev am: 7cd0aacedb 
Change-Id: I8ae224f1394825bbcddd307669c6fe699bcf980a
 2020-03-16 06:38:31 +00:00
TreeHugger Robot
7cd0aacedb Merge "Use production provisioning server for unit tests" into rvc-dev 2020-03-16 06:19:31 +00:00
Automerger Merge Worker
702b04b7f4 Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 am: 58a6b37d02 
Change-Id: I2998bea5a3abfa5184c5b4aeef74a1bb40158983
 2020-03-14 01:34:37 +00:00
Automerger Merge Worker
23a2560f9e Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 am: 6688149e76 
Change-Id: I43075679256f54c496cd30cddf22acdd96798e14
 2020-03-14 01:34:13 +00:00
Automerger Merge Worker
6688149e76 Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 
Change-Id: I6db35ab5adec9bed3f16424871153ec8265f430d
 2020-03-14 01:13:45 +00:00
Automerger Merge Worker
58a6b37d02 Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 
Change-Id: I34eb3b444b7978696e6650aae4e6270dd4bf9d7c
 2020-03-14 01:13:36 +00:00
Cong Lin
7461d0bc38 Merge "Remove the access to net.hostname" into rvc-dev 2020-03-14 00:55:08 +00:00
Automerger Merge Worker
0e2846d1e9 Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b am: 1324af2899 
Change-Id: I7ad4eb9027b33916f50ab25f4f02ca3ffa8fc126
 2020-03-14 00:36:27 +00:00
Automerger Merge Worker
4c86f2b479 Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b am: f0f5475c88 
Change-Id: I884d7923dbc4a6cc469c1b231957d98f0770a854
 2020-03-14 00:36:11 +00:00
Automerger Merge Worker
1324af2899 Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b 
Change-Id: I1cdb120c57b236ee7c9c18422b5d5803cada4606
 2020-03-14 00:18:45 +00:00
Automerger Merge Worker
f0f5475c88 Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b 
Change-Id: I56fc4535268bd2da1210ac23848c652ac099e97b
 2020-03-14 00:18:37 +00:00
Edwin Wong
53f52cef0b Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev 2020-03-14 00:01:36 +00:00
Automerger Merge Worker
9b6135f2d8 Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 3f479621da 
Change-Id: Ib958081c52a276dd524b1014f60093a77f6f66e5
 2020-03-13 23:56:27 +00:00
Automerger Merge Worker
4d84d367da Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 20274578e5 
Change-Id: Ied36eb673947d3ab35a2abb4eccb4812ef948efe
 2020-03-13 23:56:18 +00:00
Automerger Merge Worker
3f479621da Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 
Change-Id: If416900f9bf30a9c71adb14dd71711805b19dc0e
 2020-03-13 23:42:25 +00:00
Automerger Merge Worker
20274578e5 Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 
Change-Id: I01c572c301744baff41eb3b9b581b1853a8e4736
 2020-03-13 23:42:17 +00:00
Fred Gylys-Colwell
80d93c31f9 Use production provisioning server for unit tests 
Merge from Widevine repo of http://go/wvgerrit/95848

The production provisioning server supports v16 now. Time to go back
home.

Bug: 149720416
Test: unit tests w/v16 mod mock
Change-Id: Ie67165d7e30dd22c54a08626d50346c4aa57cb72
 2020-03-13 16:37:23 -07:00
Rahul Frias
587f488ac1 Merge "Disable delayed termination on unprovisioning" into rvc-dev 2020-03-13 23:26:45 +00:00
Automerger Merge Worker
c89e450f8b ODK: Address review comments am: 5a6a2075f5 am: da9e54342a 
Change-Id: I5c4c6dab960b4f7848890e6dbeaf047cc38b11cf
 2020-03-13 21:43:05 +00:00
Automerger Merge Worker
0b9321b0b1 ODK: Address review comments am: 5a6a2075f5 am: f131f8d261 
Change-Id: I85b1887098cd28857f39d47bfc7a789cbab34ac4
 2020-03-13 21:42:50 +00:00
Automerger Merge Worker
da9e54342a ODK: Address review comments am: 5a6a2075f5 
Change-Id: Iee171a63c04244553f5c9dfb4b0efcc05e660c48
 2020-03-13 21:21:09 +00:00
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
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
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