Commit Graph

3488 Commits

Author SHA1 Message Date
Rahul Frias
798be44069 Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469 am: d107dd8f04
Change-Id: I283489c958173cd2a7aac7b55e12429974a6781e
2020-03-20 02:39:05 +00:00
Rahul Frias
d107dd8f04 Merge "Move the CDM version string to a header file" into rvc-dev am: 8c1f8f1469
Change-Id: I6b0ff1b8de6f7f15880216278fb3f83e0740d650
2020-03-20 02:22:55 +00:00
Rahul Frias
8c1f8f1469 Merge "Move the CDM version string to a header file" into rvc-dev 2020-03-20 01:59:36 +00:00
Fred Gylys-Colwell
9030a671c8 Log oemcrypto unit test version number am: 88934aa322 am: dd7947af7c
Change-Id: I935d51f4e1077e1e53cd61e8c6d8cdd9bc170cd3
2020-03-19 19:24:57 +00:00
Fred Gylys-Colwell
dd7947af7c Log oemcrypto unit test version number am: 88934aa322
Change-Id: I438cf0cc2b888724f6bb0853ae6884dfd8f0ba29
2020-03-19 19:09:07 +00:00
Fred Gylys-Colwell
88934aa322 Log oemcrypto unit test version number
Merge from Widevine repo of http://go/wvgerrit/95483

This adds a log message to the oemcrypto unit tests so that if
somebody sends us a log, we can tell which version they are
running.

With this CL, the version string is
OEMCrypto unit tests for API 16.2. Tests last updated 2020-03-18

This can be found in the logs and in stdout when running the unit test
OEMCryptoClientTest.VersionNumber. One can verify the executable on
android using
strings $OUT/data/nativetest/oemcrypto_test | grep -i "oemcrypto unit tests"

Test: ran oemcrypto_test and verified version string
Bug: 144713981
Change-Id: Ie10b2f270b783ed10a3ff9855b7ca32a5327ea1c
2020-03-18 15:13:57 -07:00
Robert Shih
8bc3a16378 Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev am: e77874f376 am: 344ff21fbe
Change-Id: I3bd4e4186aea75635af1b40a8a5ad2d9584f5caf
2020-03-18 19:55:09 +00:00
Robert Shih
344ff21fbe Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev am: e77874f376
Change-Id: I2411a28a382d508cd1d89d55f4f55f5adb09c6ac
2020-03-18 19:42:34 +00:00
Robert Shih
e77874f376 Merge "hidl WVDrmPlugin: check for listener transport errors" into rvc-dev 2020-03-18 19:27:39 +00:00
Robert Shih
18fec07897 hidl WVDrmPlugin: check for listener transport errors
Transport errors usually happen when hidl client crashes in DRM event
handler.

Merged from http://go/wvgerrit/95963

Bug: 150204874
Test: artificial crashes in client DRM event listener
Change-Id: I8037374550357d003e302f2a25fbb2305ae5a5e7
2020-03-18 00:56:55 -07:00
Cong Lin
1186a8b804 (WV to Android) Fix un-initialized-value warning as error in odk_test am: 78fddc230a am: 45b6d363c1
Change-Id: I966e6fb87777f0d202ca754fafdb074bbecc9339
2020-03-18 03:04:28 +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
Rahul Frias
ca39586f8d Move the CDM version string to a header file
[ Merge of http://go/wvgerrit/95943 ]

The CDM version for android is now defined in a platform specific
header file. A check for version number match has been removed
from integration tests as it will always be true. We will still
get a notification to change the CDM version when the Android OS
version gets updated.

Bug: 151663718
Test: WV unit/integration tests
Change-Id: I96bac87186e30a709585514be7f338ad2209cdf6
2020-03-16 14:55:37 -07:00
Automerger Merge Worker
52462fc83b Merge "Use production provisioning server for unit tests" into rvc-dev am: 7cd0aacedb am: c9d2afd386
Change-Id: Id806ff907916fe389ba575aa979f5042e0d629d0
2020-03-16 06:57:23 +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
1914295162 Merge "Remove the access to net.hostname" into rvc-dev am: 7461d0bc38 am: 6688149e76
Change-Id: Icfb68f3c6c918d823b66609f0c4bc2f3c12a1b23
2020-03-14 01:34:38 +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
Cong Lin
7461d0bc38 Merge "Remove the access to net.hostname" into rvc-dev 2020-03-14 00:55:08 +00:00
Automerger Merge Worker
e5549a8fe4 Merge "Clear sessionId regardless of what closeSession returns" into rvc-dev am: 53f52cef0b am: f0f5475c88
Change-Id: Ib14fbac2d7f89189fc37a9778143f9a3a81cf998
2020-03-14 00:36:09 +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
761ec158ba Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 20274578e5
Change-Id: Id0caee95588eaf89b221b2c04a427f3d7207ed39
2020-03-13 23:56:18 +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
408307d51a ODK: Address review comments am: 5a6a2075f5 am: f131f8d261
Change-Id: I58a53762206fb70212a3b06f04b405bf18a57f18
2020-03-13 21:43:08 +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
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
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
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
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
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
c43723bb34 Merge "Match usage entry to header" into rvc-dev am: 042efc971d
Change-Id: Idcd0ba1346a045ef0cdb549bad3c5089bcf27173
2020-03-12 18:13:49 +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
6d086900d0 L3 oemcrypto: Replace NULL with nullptr am: 5cd0fd7992 am: ace03ffb04
Change-Id: I9d1c26d7275dc03d8f157a76286ae655c3602a88
2020-03-11 23:35:21 +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
fe39864311 Merge "Update tests for license release" into rvc-dev am: b8570949e4 am: e77b1913c9
Change-Id: Id0f3d0844b25bf282df29637e831f76b58bbfb33
2020-03-10 09:19:09 +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