Treehugger Robot
52ca777e57
Merge "trusty: Avoid unnecessary use of static libtrusty"
2019-01-18 21:54:39 +00:00
Matthew Maurer
178c56a1ba
trusty: Avoid unnecessary use of static libtrusty
...
Test: manual
Change-Id: I9e57118b6cc8c24d9ec7a5c34413c196bbba5b51
2019-01-04 12:04:47 -08:00
Michael Ryleev
129fadf051
trusty: Add trusty unittest control utility
...
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
2019-01-04 11:54:26 -08:00
Chih-Hung Hsieh
747eb149d0
Add noexcept to move constructors and assignment operators.
...
Bug: 116614593
Test: build with WITH_TIDY=1
Change-Id: I5a7461386946ca623ab509609092aa0ac8418b80
2018-10-05 16:43:47 +00:00
Michael Ryleev
bfccad2474
trusty: keymaster3: Modify TrustyKeymaster3Device::update method
...
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
2018-09-18 16:12:24 -07:00
Treehugger Robot
d361839b30
Merge "add the impementation of delete_key, delete_all_key for Legacy HAL"
2018-09-11 22:40:31 +00:00
Roberto Pereira
1b4ab72459
trusty: keymaster: remove unnecessary group from trusty KM3 HAL service
...
Test: VtsHalKeymasterV3_0TargetTest
Change-Id: Ib943a9aa5a0cab27913173a68932db651e991907
2018-09-10 19:19:44 +00:00
Treehugger Robot
d230bcf4b0
Merge "Fix disagreement of client_id/app_data pointer semantic"
2018-09-04 19:43:03 +00:00
Janis Danisevskis
56c533dfd9
Fix disagreement of client_id/app_data pointer semantic
...
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
2018-09-04 19:42:10 +00:00
Yan, Shaopu
764d62e204
add the impementation of delete_key, delete_all_key for Legacy HAL
...
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
2018-08-24 21:10:50 +00:00
Roberto Pereira
37996b6c67
trusty_keymaster_ipc: Use ALOGV instead of ALOGE for info/debug message
...
This message was originally ALOGV but got accidentally changed during a
refactoring in 81ebcb1943
2018-08-23 15:56:09 -07:00
Roberto Pereira
b5dfc75a32
Switch from old style KM2 HAL to new KM3 HAL
...
Bug:110153632
Test: VtsHalKeymasterV3_0TargetTest
Change-Id: I31b6a66a44eb1a6bf89c6eb6a3c632ace83071a9
2018-08-14 10:49:38 -07:00
Roberto Pereira
2426197400
Add Keymaster 3.0 binderized Trusty HAL
...
Based on AndroidKeymaster3Device
Test: VtsHalKeymasterV3_0TargetTest
Bug:110153632
Change-Id: I682e5c9823ed3d8d8c0cfde0713ee64f96eab78a
2018-08-14 10:49:38 -07:00
Roberto Pereira
81ebcb1943
Move IPC functionality from trusty_keymaster_device to trusty_keymaster_ipc
...
This allows the IPC functionality to be used by multiple HAL
implementations
Test: trusty_keymaster_tipc & keystore.trusty compile
Bug: 110153632
Change-Id: I78f273db6f59a417319058113e15e422ece73290
2018-08-08 17:31:18 -07:00
Roberto Pereira
22a3b1f733
Update the Trusty Keymaster directory structure
...
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
2018-08-08 17:22:24 -07:00
Roberto Pereira
4f9599e4fe
Run clang-format on all trusty/keymaster .cpp and .h files
...
Test: Compiles
Bug: 110153632
Change-Id: Ib6e1df87d3c3dfd8c507768d9018114a1b962d74
2018-08-08 17:22:24 -07:00
Arve Hjønnevåg
c97372e73b
Merge "trusty: tipc_test: Read output and test result from ta2ta_ipc_test"
...
am: 7b7e416649
2018-07-25 17:24:18 -07:00
Arve Hjønnevåg
7b7e416649
Merge "trusty: tipc_test: Read output and test result from ta2ta_ipc_test"
2018-07-26 00:17:54 +00:00
Elliott Hughes
5ae98112eb
Merge "trusty: add the trusty folks to the system/core/trusty/ OWNERS."
...
am: e663c78d92
2018-07-25 16:59:03 -07:00
Elliott Hughes
e87aaf9831
trusty: add the trusty folks to the system/core/trusty/ OWNERS.
...
Bug: N/A
Test: N/A
Change-Id: Icd74a1fa322b4f7bd6a6a4d9e1b375b5598f84b6
2018-07-25 15:01:15 -07:00
Arve Hjønnevåg
b6d6075983
trusty: tipc_test: Read output and test result from ta2ta_ipc_test
...
Bug: 79993976
Test: tipc-test -t ta2ta-ipc
Change-Id: If30b9acfab035974ddf1bec0e89e530fdeab4b2f
2018-06-29 15:03:25 -07:00
Elliott Hughes
4c33b88c4b
Merge "bpfmt." am: 0609e8d231 am: b57755c429
...
am: a91867a788
2018-02-20 02:24:45 +00:00
Elliott Hughes
dc699a269f
bpfmt.
...
Bug: N/A
Test: builds
Change-Id: I89ad00e1c4c7e0767bc80a7ac7935a4d55e090ac
2018-02-16 17:58:14 -08:00
Yi Kong
04e5fde33d
Merge "Use correct format specifier" am: 370d2e02e0 am: ef44dd2325
...
am: 53d69290a7
2018-01-03 20:45:03 +00:00
Yi Kong
21c515ad1c
Use correct format specifier
...
Discovered by the upcoming compiler update.
Test: m checkbuild
Change-Id: I8dd4bb711bfa4f4b71a3345a2ee38f689cee5257
2017-12-27 13:42:49 -08:00
TreeHugger Robot
40b150f9d5
Merge "Remove libkeymaster_staging"
2017-12-21 22:10:29 +00:00
Shawn Willden
10ed6fcc85
Add swillden and dkrahn to OWNERS
...
Test: N/A
Change-Id: I0d3fd54af475ee9184eb44de689b821c450b874f
2017-12-21 12:45:24 -08:00
Shawn Willden
625140d6e7
Remove libkeymaster_staging
...
Test: Builds
Change-Id: I62cc11ec4aca5ccbe2d7d56e9ddf0c78591383f7
2017-12-21 12:50:10 -07:00
Elliott Hughes
3289b9c928
Merge "Add OWNERS."
2017-12-07 23:21:26 +00:00
Elliott Hughes
693d63f9cf
Add OWNERS.
...
Bug: N/A
Test: N/A
Change-Id: Ie785058c0f5eb9b4086c98ccba6e63e3ed411b65
2017-12-07 13:30:03 -08:00
Yan, Shaopu
a3e4876715
Merge "add null pointer check for msg buffer"
...
am: f03f2a5cd7
2017-11-28 19:58:40 +00:00
Yan, Shaopu
53eb0cb5a3
add null pointer check for msg buffer
...
Test: Build
Change-Id: I94e08ccc8372449f11f6e673b6449c50d7eef4f9
2017-11-28 15:17:27 +08:00
Xin Li
23e27db576
Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' from
...
oc-mr1-dev-plus-aosp into stage-aosp-master
Change-Id: Ia33311cd1fd26dfaea59a69317b306fb91203c40
Merged-In: I03d06b10807e8a313c9654c2e1db36bfb59e3f99
2017-11-14 13:19:45 -08:00
Chih-Hung Hsieh
122352d983
Use -Werror in system/core
...
* Move -Wall -Werror from cppflags to cflags.
* Fix/suppress warning on unused variables.
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I1e05e96a1d0bcb2ccef1ce456504b3af57167cc5
2017-11-01 11:32:55 -07:00
Treehugger Robot
74e7c2f4bd
Merge "Add missing includes."
2017-10-23 20:49:56 +00:00
Dan Albert
ee33873a5a
Add missing includes.
...
Exempt-From-Owner-Approval: trivial cleanup
Test: mma
Bug: None
Change-Id: Ieb452cc9ea6ffc600873562aa37a1e3fc031dd98
2017-10-17 16:26:38 -07:00
Elliott Hughes
a3524a255f
resolve merge conflicts of 796987482 to stage-aosp-master am: bb5ec4a926
...
am: 314ddcd9a3
2017-10-17 21:57:49 +00:00
Treehugger Robot
796987482f
Merge "<stdbool.h> not necessary in C++."
2017-10-17 19:26:53 +00:00
Elliott Hughes
a0f73f9bff
<stdbool.h> not necessary in C++.
...
Bug: N/A
Test: builds
Change-Id: I1f32b202e353414e74ace87a7d5b495b5deb5f99
Merged-In: I1f32b202e353414e74ace87a7d5b495b5deb5f99
2017-10-17 16:21:33 +00:00
Janis Danisevskis
5c148f3f26
libkeymaster1 split
...
libkeymaster1 was split into libkeymaster_portable and
libkeymaster_staging.
Bug: 37467707
Test: mma -j
Merged-In: Iead014db3f3d841f08c8072b0493ec9fd7a05055
Merged-In: I63869316451867d54bf34afb28ea232cc7eddbae
Change-Id: Iacdcef8631b4903fef4a79d146a9f59e37f31c3f
2017-10-14 01:18:32 +00:00
Dan Albert
f0d3f6716a
Add missing includes.
...
Test: mma
Bug: None
Merged-In: I8a3390d186aec73f55ae2be2c7b4b2deffed810f
Change-Id: I8a3390d186aec73f55ae2be2c7b4b2deffed810f
2017-10-11 13:31:43 -07:00
Andreas Gampe
a0e683c6a7
Merge "Keymaster: Move test to std::unique_ptr" am: 81348ffa9e am: 346d7e1405
...
am: 0fdb8616b8
2017-10-02 21:37:31 +00:00
Andreas Gampe
346d7e1405
Merge "Keymaster: Move test to std::unique_ptr"
...
am: 81348ffa9e
2017-10-02 21:22:16 +00:00
Andreas Gampe
b9d9da25ca
Keymaster: Move test to std::unique_ptr
...
In preparation for UniquePtr removal.
Test: mmma system/core/trusty/keymaster
Change-Id: I42ca2b0d30d87e838d35a82e7ccea4e784acb2f6
2017-10-02 11:53:22 -07:00
Christopher Ferris
fcede542f2
Merge "Add missing include for readv." am: 1f6a807bac am: 831140358d
...
am: 4c4b8edb19
2017-08-26 15:25:15 +00:00
Christopher Ferris
831140358d
Merge "Add missing include for readv."
...
am: 1f6a807bac
2017-08-26 15:19:14 +00:00
Christopher Ferris
5d6a0325ef
Add missing include for readv.
...
Test: Builds.
Change-Id: Ia8511dcec6f49d3f6016a4dac88ccf343495349b
2017-08-25 17:33:38 -07:00
Hung-ying Tyan
f151c8efd2
Merge "Move trusty reference implementations to /vendor" into oc-mr1-dev
...
am: 9495196e20
2017-08-23 02:42:18 +00:00
Hung-ying Tyan
063a3fa4d2
Move trusty reference implementations to /vendor
...
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
2017-08-22 11:23:45 +08:00
Jocelyn Bohr
4a6626980c
Merge "Pass in message_version_ received from the secure side." am: 1a955faab2 am: 4e8bbb968c am: 3a5d47af18
...
am: eb7207dbcd
2017-08-16 00:25:56 +00:00
