summaryrefslogtreecommitdiffstats
path: root/trusty
Commit message (Collapse)AuthorAgeFilesLines
* Add support for RPMB over VirtIO SerialMatthew Maurer2019-03-053-40/+117
| | | | | | | | | | | | | In order to test Trusty gatekeeper automatically, the storage proxy needs to be active inside the emulator. This patch allows storageproxyd to speak a length-framed RPMB to an external RPMB daemon. For a concrete example of a daemon speaking this protocol, see rpmb_dev in the Trusty tree. Bug: 124277696 Test: Launch storageproxyd with -t virt, use Trusty test infra Change-Id: I391d4768976f0eb1f3b8df58eefd58fc3a9409cd
* Clang-format before updating storage proxyMatthew Maurer2019-02-213-118/+84
| | | | | | | | | | These files were previously not clang-format clean. I am submitting the clang-format cleanup in its own CL to avoid mixing up the code I'm adding/adjusting with old code which needed to be reformatted. Bug: 124277696 Test: m Change-Id: I8a57ca97925a16bee10b15d2013a5dcf87b0ed15
* Merge "trusty: Avoid unnecessary use of static libtrusty"Treehugger Robot2019-01-181-3/+1
|\
| * trusty: Avoid unnecessary use of static libtrustyMatthew Maurer2019-01-041-3/+1
| | | | | | | | | | Test: manual Change-Id: I9e57118b6cc8c24d9ec7a5c34413c196bbba5b51
* | trusty: Add trusty unittest control utilityMichael Ryleev2019-01-042-0/+189
|/ | | | | | | | | It is designed to connect to user specified port and implements unittest logging protocol supported by typical unittest ap running on Trusty side. Test: manual Change-Id: I6e37ccee9b9e4dde563ef0e4f531b42091cc2bd8
* Add noexcept to move constructors and assignment operators.Chih-Hung Hsieh2018-10-051-1/+2
| | | | | | Bug: 116614593 Test: build with WITH_TIDY=1 Change-Id: I5a7461386946ca623ab509609092aa0ac8418b80
* trusty: keymaster3: Modify TrustyKeymaster3Device::update methodMichael Ryleev2018-09-181-10/+23
| | | | | | | | | | | | | Modify TrustyKeymaster3Device::update method to handle the case when amount of input data received exceeds a maximum amount supported by underlying transport. In such case, only send an portion of data that fits and allow higher levels to take care of the rest. This is not an ideal fix as it is not very efficient for large sets of data but at least it should work in more cases. Test: android.keystore.cts Change-Id: Id7360d0da3b87493193d480fc0c78c65dc1fc51f
* Merge "add the impementation of delete_key, delete_all_key for Legacy HAL"Treehugger Robot2018-09-112-2/+43
|\
| * add the impementation of delete_key, delete_all_key for Legacy HALYan, Shaopu2018-08-242-2/+43
| | | | | | | | | | | | | | | | | | the new layer (Keymaster2PassthroughContext) will call the related function operation, however, currently it’s null so it will have null pointer reference issue and we need to provide them in the keymater legacy HAL. Bug: 113084196 Change-Id: Id1b0df47c03d341aedc7a0634cb101966143641c
* | trusty: keymaster: remove unnecessary group from trusty KM3 HAL serviceRoberto Pereira2018-09-101-1/+1
| | | | | | | | | | Test: VtsHalKeymasterV3_0TargetTest Change-Id: Ib943a9aa5a0cab27913173a68932db651e991907
* | Merge "Fix disagreement of client_id/app_data pointer semantic"Treehugger Robot2018-09-041-2/+2
|\ \
| * | Fix disagreement of client_id/app_data pointer semanticJanis Danisevskis2018-09-041-2/+2
| |/ | | | | | | | | | | | | | | | | | | KM1/KM2 implementations should treat nullptr and KeymasterBlob{nullptr, 0} equally when passed in as client_id or app_data. However, trusty KM1 treats them differently. Bug: 113110105 Bug: 113084196 Change-Id: Ie0e2b5d60d808e4f7a8e48aeb4c694268f9bc0a1
* / trusty_keymaster_ipc: Use ALOGV instead of ALOGE for info/debug messageRoberto Pereira2018-08-231-1/+1
|/ | | | | | | | | This message was originally ALOGV but got accidentally changed during a refactoring in 81ebcb1943850203c8feb261bf5737581f1b3fed Bug:110153632 Test: VtsHalKeymasterV3_0TargetTest Change-Id: Ibdfa0ab50cb8544c6f23c15049904f1741769647
* Switch from old style KM2 HAL to new KM3 HALRoberto Pereira2018-08-141-1/+1
| | | | | | Bug:110153632 Test: VtsHalKeymasterV3_0TargetTest Change-Id: I31b6a66a44eb1a6bf89c6eb6a3c632ace83071a9
* Add Keymaster 3.0 binderized Trusty HALRoberto Pereira2018-08-148-0/+879
| | | | | | | | Based on AndroidKeymaster3Device Test: VtsHalKeymasterV3_0TargetTest Bug:110153632 Change-Id: I682e5c9823ed3d8d8c0cfde0713ee64f96eab78a
* Move IPC functionality from trusty_keymaster_device to trusty_keymaster_ipcRoberto Pereira2018-08-083-88/+95
| | | | | | | | | This allows the IPC functionality to be used by multiple HAL implementations Test: trusty_keymaster_tipc & keystore.trusty compile Bug: 110153632 Change-Id: I78f273db6f59a417319058113e15e422ece73290
* Update the Trusty Keymaster directory structureRoberto Pereira2018-08-0810-153/+170
| | | | | | | | | | | Added three new directories: - include: contains ipc and legacy header files - ipc: contains common keymaster IPC code that can be shared between HALS - legacy: contains the old style HAL implementation Test: trusty_keymaster_tipc & keystore.trusty compile Bug:110153632 Change-Id: I2fdaa9d3d0421a0e359c05807ab5f0a12c5d3996
* Run clang-format on all trusty/keymaster .cpp and .h filesRoberto Pereira2018-08-082-43/+42
| | | | | | Test: Compiles Bug: 110153632 Change-Id: Ib6e1df87d3c3dfd8c507768d9018114a1b962d74
* Merge "trusty: tipc_test: Read output and test result from ta2ta_ipc_test"Arve Hjønnevåg2018-07-251-4/+30
|\ | | | | | | | | | | am: 7b7e416649 Change-Id: I17c82528a7e373dd18137c7c976e868d4718bd5f
| * Merge "trusty: tipc_test: Read output and test result from ta2ta_ipc_test"Arve Hjønnevåg2018-07-261-4/+30
| |\
| | * trusty: tipc_test: Read output and test result from ta2ta_ipc_testArve Hjønnevåg2018-06-291-4/+30
| | | | | | | | | | | | | | | | | | Bug: 79993976 Test: tipc-test -t ta2ta-ipc Change-Id: If30b9acfab035974ddf1bec0e89e530fdeab4b2f
* | | Merge "trusty: add the trusty folks to the system/core/trusty/ OWNERS."Elliott Hughes2018-07-251-2/+6
|\| | | | | | | | | | | | | | | | | am: e663c78d92 Change-Id: I293f21462010e8098b226277636f04b4cd4b02a7
| * | trusty: add the trusty folks to the system/core/trusty/ OWNERS.Elliott Hughes2018-07-251-2/+6
| |/ | | | | | | | | | | Bug: N/A Test: N/A Change-Id: Icd74a1fa322b4f7bd6a6a4d9e1b375b5598f84b6
* | Merge "bpfmt." am: 0609e8d231 am: b57755c429Elliott Hughes2018-02-205-5/+14
|\| | | | | | | | | | | am: a91867a788 Change-Id: Ieb0985434e2464e47b3adb93fb27fe5042e91657
| * bpfmt.Elliott Hughes2018-02-165-5/+14
| | | | | | | | | | | | Bug: N/A Test: builds Change-Id: I89ad00e1c4c7e0767bc80a7ac7935a4d55e090ac
* | Merge "Use correct format specifier" am: 370d2e02e0 am: ef44dd2325Yi Kong2018-01-031-1/+1
|\| | | | | | | | | | | am: 53d69290a7 Change-Id: I158f99bdba598d64bc676be4ea4e1c38e6cbcce4
| * Use correct format specifierYi Kong2017-12-271-1/+1
| | | | | | | | | | | | | | Discovered by the upcoming compiler update. Test: m checkbuild Change-Id: I8dd4bb711bfa4f4b71a3345a2ee38f689cee5257
* | Merge "Remove libkeymaster_staging"TreeHugger Robot2017-12-211-1/+0
|\ \ | |/ |/|
| * Remove libkeymaster_stagingShawn Willden2017-12-211-1/+0
| | | | | | | | | | Test: Builds Change-Id: I62cc11ec4aca5ccbe2d7d56e9ddf0c78591383f7
* | Add swillden and dkrahn to OWNERSShawn Willden2017-12-211-0/+2
|/ | | | | Test: N/A Change-Id: I0d3fd54af475ee9184eb44de689b821c450b874f
* Merge "Add OWNERS."Elliott Hughes2017-12-071-0/+1
|\
| * Add OWNERS.Elliott Hughes2017-12-071-0/+1
| | | | | | | | | | | | Bug: N/A Test: N/A Change-Id: Ie785058c0f5eb9b4086c98ccba6e63e3ed411b65
* | Merge "add null pointer check for msg buffer"Yan, Shaopu2017-11-281-0/+5
|\| | | | | | | | | | | am: f03f2a5cd7 Change-Id: I988bd6cf38aae918dd6b8c547b6db92501925685
| * add null pointer check for msg bufferYan, Shaopu2017-11-281-0/+5
| | | | | | | | | | Test: Build Change-Id: I94e08ccc8372449f11f6e673b6449c50d7eef4f9
* | Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' fromXin Li2017-11-1416-377/+21
|\ \ | |/ |/| | | | | | | | | oc-mr1-dev-plus-aosp into stage-aosp-master Change-Id: Ia33311cd1fd26dfaea59a69317b306fb91203c40 Merged-In: I03d06b10807e8a313c9654c2e1db36bfb59e3f99
| * resolve merge conflicts of 796987482 to stage-aosp-master am: bb5ec4a926Elliott Hughes2017-10-171-1/+0
| |\ | | | | | | | | | | | | | | | am: 314ddcd9a3 Change-Id: I4fee960013f5539d85613eb09e365ee580ed1745
| * \ Merge "Keymaster: Move test to std::unique_ptr" am: 81348ffa9e am: 346d7e1405Andreas Gampe2017-10-021-15/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | am: 0fdb8616b8 Change-Id: Ie48dcc9b3c874697b726d6ab0a333905c455adb8
| | * \ Merge "Keymaster: Move test to std::unique_ptr"Andreas Gampe2017-10-021-15/+15
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 81348ffa9e Change-Id: I74b22a692e23589002eca812b88dc458bc67fad4
| * | | | Merge "Add missing include for readv." am: 1f6a807bac am: 831140358dChristopher Ferris2017-08-261-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4c4b8edb19 Change-Id: Ib5f0f4b99a0775329ec12130b84cf68997fe2008
| | * | | Merge "Add missing include for readv."Christopher Ferris2017-08-261-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1f6a807bac Change-Id: Ib0530b4e3ea1a9fdc779c87cdd12489859a35bff
| * | \ \ \ Merge "Move trusty reference implementations to /vendor" into oc-mr1-devHung-ying Tyan2017-08-239-4/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9495196e20 Change-Id: I8e21eb54387caa145eac24de9a4b1ec752e7193e
| | * | | | | Move trusty reference implementations to /vendorHung-ying Tyan2017-08-229-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trusty implementations are provided by vendors. This patch moves the AOSP reference implementations to the vendor partition. Bug: 63085384 Test: Build gordon_peak which adopts trusty as the TEE and confirm that libtrusty and gateway.trusty are moved to /vendor. Test: Build marlin which does not adopt trusty as the TEE and confirm that this patch has no effect on the build result. Test: mmm BOARD_VNDK_VERSION=current system/core/trusty Change-Id: I7f6d897b86c69d06923a18d28154760e006dd193
| * | | | | | Merge "Pass in message_version_ received from the secure side." am: ↵Jocelyn Bohr2017-08-161-18/+18
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a955faab2 am: 4e8bbb968c am: 3a5d47af18 am: eb7207dbcd Change-Id: I40d7f76b82cf87b6b156015db141ceb58ff10a38
| | * | | | | Merge "Pass in message_version_ received from the secure side." am: ↵Jocelyn Bohr2017-08-161-18/+18
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a955faab2 am: 4e8bbb968c am: 3a5d47af18 Change-Id: If57d80e166bb9ffd915ffe58ebb371bb3ada91c1
| * | \ \ \ \ \ Merge "Remove nvram trusty implementation." into oc-mr1-devHung-ying Tyan2017-08-167-371/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | | | | | | | | | am: 46691ee85c Change-Id: Ia9a30f38a6e2bbad926ea6e336f943f8da9e45b6
| | * | | | | Remove nvram trusty implementation.Hung-ying Tyan2017-08-157-371/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 64705490 Test: build pass Change-Id: I32a1565ec935fff1c45540442134a37b55702752
| | * | | | | Revert "Move trusty reference implementations to /vendor"Hung-ying Tyan2017-08-114-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CL is not complete and will cause build break when BOARD_VNDK_VERSION is set. This reverts commit 7d81b4e08172037674f378ffb6f45ad694c01077. Change-Id: If9632fb7ee8147c39f1ad0860ddc3bed62ba89db
| | * | | | | Move trusty reference implementations to /vendorHung-ying Tyan2017-08-104-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trusty implementations are provided by vendors. This patch moves the AOSP reference implementations to the vendor partition. Bug: 63085384 Test: build gordon_peak which adopts trusty as the TEE and confirm that libtrusty and gateway.trusty are moved to /vendor. Test: build marlin which does not adopt trusty as the TEE and confirm that this patch has no effect on the build result. Change-Id: I9a5440071386b929058207fdef560ed2d7223ba3
| * | | | | | Merge "Enable non-secure side to receive messages > 4K" am: 28fa8b0924 am: ↵Jocelyn Bohr2017-08-123-26/+43
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9295f6f36d am: c323791e73 Change-Id: I142fbd2ce1005489090a0bf287a27bd1946a7ced
| * \ \ \ \ \ \ Merge "Return correct error code when finish input length is too long." am: ↵Jocelyn Bohr2017-08-031-1/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90657bbeab am: efea269a75 am: 18e3e2a66f Change-Id: I40d235ba41cdb8a94d2955ed4dc77d94df72ed7b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 08:28:24 +0000