Commit graph

219 commits

Author SHA1 Message Date
Colin Cross
06b758a918 Merge "Use libcrypto_static instead of libcrypto"
am: c048c187be

Change-Id: I0c5d5843b8003f6be14ba583e7299693b25da7c0
2019-09-26 07:42:20 -07:00
Colin Cross
263d2df2c7 Use libcrypto_static instead of libcrypto
Replace libcrypto with libcrypto_static, which can be protected through
visibility to ensure only modules that don't affect FIPS certification
can use it.

Bug: 141248879
Test: m checkbuild
Change-Id: I8685cb06d15f3425eeb96d998ffda54c82dcd387
2019-09-18 11:07:09 -07:00
TreeHugger Robot
7b2e2fe15c Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master 2019-09-11 20:31:38 +00:00
Colin Cross
5d81a5814b Remove unused libcrypto dependency.
libcrypto is unused, which causes problems when boringssl hash
injection is turned on as the code is all stripped and there is
nothing left to inject the hash into.

Bug: 137267623
Test: Ran the following together with the changes from
      http://r.android.com/q/topic:bug137267623_bsslselftest

      m VtsHalDrmV1_{0,1,2}TargetTest \
        VtsHalWifiHostapdV1_{0,1}TargetTest{,Util} \
        VtsHalWifiSupplicantV1_{0,1,2}TargetTest{,Util} \
        VtsHalWifiSupplicantP2pV1_{0,2}TargetTest

      (croot hardware/interfaces/confirmationui ; mma)
      (croot hardware/interfaces/drm ; mma)
      (croot hardware/interfaces/keymaster ; mma)

Change-Id: Ib0607671ef71d99becb483774f810aad9762f4f1
2019-09-10 00:05:33 +01:00
Xin Li
15be13ea71 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: Ia07db5c8afeed7fe22a2b18d867a38390f910a81
Merged-In: Ibbd540dbb5baee46360d3fe9469212cfd8f550ba
2019-09-08 13:06:54 -07:00
Steven Moreland
b3a4d3832e Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I075670b64eebbbbd6a6ae0e84ad51bf1c6f5ba36
2019-09-06 01:07:02 +00:00
zhangweiwei
424308c5ad Adapt change clearkey to Lazy hal
am: 0a50473369

Change-Id: I78be3e06995b60dbe9cca6fedbc93f4c26d8c770
2019-07-18 00:11:19 -07:00
zhangweiwei
0a50473369 Adapt change clearkey to Lazy hal
Exempt-From-Owner-Approval

Bug:135896867
Test: vts-tradefed run commandAndExit vts-staging-default -m VtsHalDrmV1_1Target

Change-Id: Iadba7a7afdccfe8a6299e3c0e1e03f63a58c5ca8
2019-07-17 23:24:56 +00:00
Jeff Tinker
97bf88fea2 Merge "Add status for license starting in the future" into qt-dev
am: a51399ef5f

Change-Id: I2178215a3cbb44a830690081f008c3053282fe65
2019-05-08 10:49:33 -07:00
Robert Shih
31703179a5 Add status for license starting in the future
Bug:116738851
Test: vts-tradefed run commandAndExit -m VtsHalDrmV1_2Target
Change-Id: Id5017e3ffa1fcf5aaad1815b59a425ac63f2e53e
2019-05-08 00:52:01 +00:00
Steven Moreland
99712c08cc Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I53e5bf67a0d314e1b10c0ba0c7172a7af358ddcc
2019-04-18 18:13:05 -07:00
Steven Moreland
6d494b2346 Merge "Update hidl makefiles for bpfmt" am: ff0bd741ca
am: 96f40f7b02

Change-Id: Idbf030e4993067bdb8181321bca2de00c9b6f7ef
2019-04-18 14:34:45 -07:00
Steven Moreland
1ae4615d9f Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I1f69d292bc23a7cc293a66110cb02d597e1019ad
2019-04-17 09:38:50 -07:00
Robert Shih
c13e0f6db2 Merge "DrmHalTest.OfflineLicenseStateTest: search keySetId" 2019-03-12 20:46:45 +00:00
Robert Shih
90af5f1898 DrmHalTest.OfflineLicenseStateTest: search keySetId
Search for key set id instead of simply checking the number of total
offline licenses.

Fix LOG_TAG & remove clearkey specific comments from generic plugin
tests.

Bug: 118402843
Test: VtsHalDrmV1_2TargetTest
Change-Id: I245007317c813d5a8585d0a4ee29816b8f51ad3c
2019-03-11 18:07:33 -07:00
Robert Shih
4add15d0c9 Amend drm@1.2 vts mock errors
Bug: 118402843
Test: VtsHalDrmV1_2TargetTest
Change-Id: I05cc92d33a50b37ce12d8295cdd129d2653836d1
2019-03-08 15:19:54 -08:00
Robert Shih
295e27ee5a Merge "Add vts tests for new drm@1.2 methods" 2019-03-08 02:39:05 +00:00
Robert Shih
456f3a6447 Add vts tests for new drm@1.2 methods
Bug: 118402843
Test: VtsHalDrmV1_2TargetTest
Change-Id: If0da1538c33e0284fa6fa6dd48d56a0ce1753f02
2019-03-06 15:54:53 -08:00
Steven Moreland
87f43604b9 Merge "Update makefies: no 'types' internal" 2019-03-05 17:40:03 +00:00
Steven Moreland
7f4e21adda Merge "Update makefies: no 'types'" am: 4ee5ec1469 am: bab622f6a6
am: 7224bc9bcf

Change-Id: I434939e0770afa436c532a945542fce30a71ef7d
2019-03-04 16:05:59 -08:00
Steven Moreland
b91ac5c6a0 Update makefies: no 'types' internal
Bug: 123976090
Test: N/A
Change-Id: I84b659b163b63d39535b462a3df8a9c19f680976
2019-03-04 14:09:25 -08:00
Steven Moreland
a878aee9ab Update makefies: no 'types'
Bug: 123976090
Test: N/A
Change-Id: I30fb04c81889b62775e1b764b965fdb0f893de17
2019-03-04 11:27:17 -08:00
Steven Moreland
f8a47b7f01 Update makefiles.
Bug: 123976090
Test: N/A
Change-Id: I5fb6c126a090a3fe0fa4829ea9224564133dc1ae
2019-02-11 21:14:16 -08:00
Jeff Tinker
100a4eddcf Fix comment on removeOfflineLicense
bug:117570956
Change-Id: Iad1a15d81066d01387ec9addd420040155216a75
2019-01-31 09:44:26 -08:00
Jeff Tinker
08ff314594 Add securityLevel to MediaDrm isCryptoSchemeSupported API
bug:110701831
test: cts media test cases, widevine integration tests

Change-Id: I9e4679ee63b3997f7141c9b81fd6f375e862862d
2019-01-22 23:27:26 +00:00
Jeff Tinker
30c31856d5 Add support for HDCP 2.3
bug:120040804
Change-Id: Id4643829bce31131e3bc7b628737579bb597e736
2019-01-14 21:17:13 -08:00
Jeff Tinker
8378c6625e Add additional error conditions to MediaDrm
New codes are being added to handle resource
contention, lost session state, frame size too
large and insufficient security level for
decryption. Also cleans up inconsistent use of
tamper detected error where invalid state error
should have been used.

bug:111504510
bug:111505796
test: cts and gts media test cases

Change-Id: I8581aed1871d728f7af80b246d0dba28b40fa4a3
2019-01-10 17:27:59 -08:00
Peter Kalauskas
724a9fc643 Add lazy service target for drm HAL
Test: Run gts on Pixel 1/2/3, marlin_svelte, and walleye_svelte
Bug: 112386116
Change-Id: I5d86e3158794ebae967efb009a0cef8cd140ccb7
2019-01-08 09:00:23 -08:00
Chih-hung Hsieh
df66e3cb29 Merge "Fix performance-for-range-copy warnings" am: d01f7050ac am: 51e835ce22
am: 86fefab5e9

Change-Id: Ib139d710d47a7a51e24ba8ba582b252f5ff6e244
2018-12-17 14:09:52 -08:00
Chih-Hung Hsieh
65ab67312b Fix performance-for-range-copy warnings
Bug: 30413223
Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,performance*
Change-Id: I1b76a22eab100a31e77048626e48169fe7eeaf92
2018-12-17 19:57:21 +00:00
Keun Soo YIM
68ae05dd2d pack VTS cc_test binaries as general-tests
Test: make general-tests
Bug: 120093339
Merged-In: I363450d205868f900e4925ccff1430e2a569f2a4
Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
2018-12-07 10:49:56 -08:00
Keun Soo YIM
ff84c37bc1 pack VTS cc_test binaries as general-tests
Test: make general-tests
Bug: 120093339
Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
2018-11-27 16:11:41 -08:00
Jeff Tinker
287ef4c733 Define offline methods in DRM HAL version 1.2
bug:117570956
bug:110838441
bug:116252891
Change-Id: Ie94d5c2174d851eb2b40dcc7bf4596af71e14176
2018-11-08 15:50:38 -08:00
Yifan Hong
438cc30a06 Merge "DRM 1.1: Add VINTF doc" am: 8ad3e78d27 am: 2524404aae
am: adf2018492

Change-Id: Iff1292a68022495c06438ba479dffc41520e2ace
2018-10-26 14:30:49 -07:00
Yifan Hong
3baef77daa DRM 1.1: Add VINTF doc
Test: none
Bug: 73556059
Bug: 111192666
Bug: 111096955
Bug: 117636317
Bug: 112150995
Fixes: 112282263

Change-Id: I361f50b5af19094c36f928939ca6d764ce59a205
2018-10-25 16:50:06 -07:00
Jeff Tinker
5c2e29de11 Fix failing drm 1.0 vts tests
The shared library path was incorrectly set based on
the drm.64bit.enabled flag. It should be set based
on whether the drm service is running as 32-bit or
64-bit.

Test: vts-tradefed run commandAndExit vts -m VtsHalDrmV1_0Target

bug:111289939
Change-Id: I388dc87bd4566211dc2901feccf1e6e1c90bfe67
Merged-In: I388dc87bd4566211dc2901feccf1e6e1c90bfe67
2018-09-13 00:39:42 +00:00
Jeff Tinker
3418cd6077 Remove spurious error log message
In change id Ie2f306bce6aec697ae584da3f55b3cf72edaa07b, a
shared memory leak was fixed using a workaround that
maintained compatibility with the frozen DRM HAL API
1.1. Unfortunately it triggered an error log message that
was no longer an error condition.  This change just removes
the log line to avoid raising undue concerns.

Change-Id: I9abe08ef5ab86b2f8589a5c1e5c5175e19ab09d2
Test: Compiles
Bug:111131173
2018-07-31 18:34:12 +00:00
Jeff Tinker
b065c9d8b7 Fix failing drm 1.0 vts tests
The shared library path was incorrectly set based on
the drm.64bit.enabled flag. It should be set based
on whether the drm service is running as 32-bit or
64-bit.

Test: vts-tradefed run commandAndExit vts -m VtsHalDrmV1_0Target

bug:111289939
Change-Id: I388dc87bd4566211dc2901feccf1e6e1c90bfe67
2018-07-20 16:36:05 -07:00
Jeff Tinker
2b46111ec8 Add more drm@1.1 VTS structure tests
Adding tests for:
 getKeyRequest_1_1
 getSecureStopIds
 releaseSecureStops
 removeSecureStop
 removeAllSecureStops

test:vts-tradefed run commandAndExit vts-staging-default -m VtsHalDrmV1_1Target
bug:73330999

Change-Id: Icd6c3e679ea674f899563a8d8e428321a7783633
2018-03-27 16:30:34 -07:00
Nathan Harold
c893754c0d Update Makefiles Missed In Previous Commits
When calling update-makefiles.sh there are
some unrelated changes that were missed in
previous commits.

Bug: 8675309
Test: compilation
Change-Id: I5bf67fbcc809de36bde1869ada7b835566a5198b
2018-03-19 16:37:46 -07:00
Zhuoyao Zhang
b83c4f2e12 Merge "Convert drm hal test to use VtsHalHidlTargetTestEnvBase" 2018-02-20 01:45:42 +00:00
Zhuoyao Zhang
cf50a32e57 Convert drm hal test to use VtsHalHidlTargetTestEnvBase
* The testEnvBase template is only used to register the testing hal.
* The service name is specifically determined by the test logic, so
  disable the feature for vts to run the test against all service
  instance (by setting HalServiceCombMode::NO_COMBINATION)

Bug: 64203181
Test: make vts
      vts-tradefed run vts -m VtsHalDrmV1_0Target
      vts-tradefed run vts -m VtsHalDrmV1_1Target

Change-Id: Ib2e005e8ccbc815067f0e9455fcd3e6c5ec151fb
2018-02-13 15:25:59 -08:00
TreeHugger Robot
1233c1046d Merge "Revert "Revert "VTS tests for fixed MediaDrm security level APIs""" 2018-02-12 17:55:50 +00:00
Jeff Tinker
6c2589f524 Revert "Revert "VTS tests for fixed MediaDrm security level APIs""
This reverts commit 6ec159b780.

Change-Id: I7e54e28c5e4b4c9f70d53d045bbfec57f7ef58c3
2018-02-11 18:58:55 +00:00
Jeff Tinker
199d60da8c Revert "Revert "Fix MediaDrm security level APIs""
This reverts commit a824afa9c4.

Change-Id: Ia8f3090454f010a507ac386767b2c2a11dce1ac4
2018-02-11 18:58:21 +00:00
Tobias Thierer
6ec159b780 Revert "VTS tests for fixed MediaDrm security level APIs"
This reverts commit 45c3855f4f.

Reason for revert: Build cop here. The CL topic that I'm reverting broke several builds: Drm.h's openSession(Vector<uint8_t> &sessionId) hides overloaded virtual function openSession(DrmPlugin::SecurityLevel securityLevel, ..) from IDrm.h.

https://android-build.googleplex.com/builds/submitted/4598692/full-eng/latest/view/logs/build_error.log

Change-Id: Ie61888464a2ac17b1ee6f47b23f5bb84fdbfa095
2018-02-11 15:01:58 +00:00
Tobias Thierer
a824afa9c4 Revert "Fix MediaDrm security level APIs"
This reverts commit 6a5934aee3.


Reason for revert: Build cop here. The CL topic that I'm reverting broke several builds: Drm.h's openSession(Vector<uint8_t> &sessionId) hides overloaded virtual function openSession(DrmPlugin::SecurityLevel securityLevel, ..) from IDrm.h.

https://android-build.googleplex.com/builds/submitted/4598692/full-eng/latest/view/logs/build_error.log

Change-Id: I8a1ce95ca6f48bec6c46f84a0fef7a48f975c406
2018-02-11 15:01:51 +00:00
Jeff Tinker
45c3855f4f VTS tests for fixed MediaDrm security level APIs
Vendors implementing the newly added MediaDrm.setSecurityLevel
HAL found that it was difficult to implement properly. Also the
semantics are somewhat ambiguous from the Java platform API
level. The APIs have changed to bind the security level
assignment to openSession which clarifies the API for apps as
well as making it more natural to implement in HAL modules. This
CL updates the VTS tests to account for those changes.

bug:72831697
bug:64001680

test: VtsHalDrmV1_1TargetTest, GTS media tests
Change-Id: I2adf13f9da7726b206df6fcc82b1e2e11fc94674
2018-02-08 01:48:03 +00:00
Jeff Tinker
6a5934aee3 Fix MediaDrm security level APIs
During development of the vendor/widevine HAL module, the newly added
MediaDrm.setSecurityLevel method was found to be difficult to
implement efficiently since the security level is needed at the time
a session is opened. This CL moves the security level parameter to
openSession to resolve this problem.

bug:72831697
bug:64001680

test: VtsHalDrmV1_1TargetTest, GTS media tests
Change-Id: Id9c765131d0ee6fa85f83d098955acf603229b46
2018-02-08 01:47:45 +00:00
Adam Stone
9d127768d1 Add getMetrics test to drm vts test.
Adds test cases for the getMetrics call in the DRM 1.1 HAL clear key
implementation.

Bug: 64001680
Test: VtsHalDrmV1_1TargetTest

Change-Id: I7c292f79f7477a6a88296aa62eae02cc70e35102
2018-02-02 17:44:53 -08:00