summaryrefslogtreecommitdiffstats
path: root/trusty
Commit message (Collapse)AuthorAgeFilesLines
* Merge "trusty: tipc_test: Read output and test result from ta2ta_ipc_test"Arve Hjønnevåg2018-07-251-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
* | 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
* bpfmt.Elliott Hughes2018-02-165-5/+14
| | | | | | Bug: N/A Test: builds Change-Id: I89ad00e1c4c7e0767bc80a7ac7935a4d55e090ac
* Use correct format specifierYi Kong2017-12-271-1/+1
| | | | | | | Discovered by the upcoming compiler update. Test: m checkbuild Change-Id: I8dd4bb711bfa4f4b71a3345a2ee38f689cee5257
* 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-229-4/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9495196e20 Change-Id: I8e21eb54387caa145eac24de9a4b1ec752e7193e
| | * | | | | Move trusty reference implementations to /vendorHung-ying Tyan2017-08-219-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-151-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-151-18/+18
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a955faab2 am: 4e8bbb968c am: 3a5d47af18 Change-Id: If57d80e166bb9ffd915ffe58ebb371bb3ada91c1
| * | \ \ \ \ \ Merge "Remove nvram trusty implementation." into oc-mr1-devHung-ying Tyan2017-08-157-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-094-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-113-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
| * \ \ \ \ \ \ \ Merge "Stop asking for old versions of C++ in system/core." am: e61e2fcf21 ↵Elliott Hughes2017-08-021-1/+0
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0915192d8b am: 514464f4ca Change-Id: Ibbd6515b4a44105e7b965e7b36bc4c3648c7e713
| * | | | | | | | Merge "system/core: use proper nativehelper headers" am: 4f59afe9fa am: ↵Steven Moreland2017-07-191-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6208cd1322 am: 106c355688 Change-Id: I8ddfceec58ab69b6c0952ea39f3ad78802f5d7bc
| * | | | | | | | | trusty*: Android.mk -> Android.bpSteven Moreland2017-05-087-158/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: links Bug: 37512442 Change-Id: I86bcdcfffbbd81dedb921612bd2d21ea4aabaeb1
| * | | | | | | | | Merge "trusty/storage/* to Android.bp" am: 1dcd257a21 am: 1561e34bf4 am: ↵Steven Moreland2017-05-0410-133/+130
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b7632ef8a am: bc7edfe56f Change-Id: I4b762bf23b062862824a98bb9e7c099388ae3e5c
| * | | | | | | | | | Rename libkeymaster to libkeymaster_stagingJanis Danisevskis2017-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a build breakage by renaming libkeymaster to libkeymaster_staging. fugu's vendor tree already had a libkeymaster.so which masked system/keymaster/libkeymaster. Bug: 37997750 Change-Id: Iead014db3f3d841f08c8072b0493ec9fd7a05055
| * | | | | | | | | | libkeymaster1 splitJanis Danisevskis2017-05-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libkeymaster1 was split into libkeymaster_portable and libkeymaster. Bug: 37467707 Change-Id: I63869316451867d54bf34afb28ea232cc7eddbae
| * | | | | | | | | | Revert "libkeymaster1 split"Janis Danisevskis2017-05-021-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c5bb8c74d1265d4bd8827e66f884c72e7e1d896b. Reason for revert: build breakage Change-Id: I892346eec4a4628da893b0cd4182c8f546beb60a
| * | | | | | | | | | libkeymaster1 splitJanis Danisevskis2017-05-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libkeymaster1 was split into libkeymaster_portable and libkeymaster. Change-Id: Iacdcef8631b4903fef4a79d146a9f59e37f31c3f
* | | | | | | | | | | Use -Werror in system/coreChih-Hung Hsieh2017-11-014-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move -Wall -Werror from cppflags to cflags. * Fix/suppress warning on unused variables. Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: I1e05e96a1d0bcb2ccef1ce456504b3af57167cc5
* | | | | | | | | | | Merge "Add missing includes."Treehugger Robot2017-10-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Add missing includes.Dan Albert2017-10-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exempt-From-Owner-Approval: trivial cleanup Test: mma Bug: None Change-Id: Ieb452cc9ea6ffc600873562aa37a1e3fc031dd98
* | | | | | | | | | | Merge "<stdbool.h> not necessary in C++."Treehugger Robot2017-10-171-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | <stdbool.h> not necessary in C++.Elliott Hughes2017-10-171-1/+0
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: N/A Test: builds Change-Id: I1f32b202e353414e74ace87a7d5b495b5deb5f99 Merged-In: I1f32b202e353414e74ace87a7d5b495b5deb5f99
* | | | | | | | | | libkeymaster1 splitJanis Danisevskis2017-10-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libkeymaster1 was split into libkeymaster_portable and libkeymaster_staging. Bug: 37467707 Test: mma -j Merged-In: Iead014db3f3d841f08c8072b0493ec9fd7a05055 Merged-In: I63869316451867d54bf34afb28ea232cc7eddbae Change-Id: Iacdcef8631b4903fef4a79d146a9f59e37f31c3f
* | | | | | | | | | Add missing includes.Dan Albert2017-10-111-0/+2
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: mma Bug: None Merged-In: I8a3390d186aec73f55ae2be2c7b4b2deffed810f Change-Id: I8a3390d186aec73f55ae2be2c7b4b2deffed810f
* | | | | | | | | Keymaster: Move test to std::unique_ptrAndreas Gampe2017-10-021-15/+15
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for UniquePtr removal. Test: mmma system/core/trusty/keymaster Change-Id: I42ca2b0d30d87e838d35a82e7ccea4e784acb2f6
* | | | | | | / Add missing include for readv.Christopher Ferris2017-08-251-0/+1
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Test: Builds. Change-Id: Ia8511dcec6f49d3f6016a4dac88ccf343495349b
* | | | | | | Merge "Pass in message_version_ received from the secure side."Treehugger Robot2017-08-151-18/+18
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Pass in message_version_ received from the secure side.Jocelyn Bohr2017-08-111-18/+18
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this there is the possibility of message version mismatch between the secure side and the non-secure side. Bug: 63746689 Test: cts passes Change-Id: I242974eb86dd86ba0f657e7ab3af4ac14c08bb5c
* | | | | | Merge "Enable non-secure side to receive messages > 4K"Treehugger Robot2017-08-113-26/+43
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Enable non-secure side to receive messages > 4KJocelyn Bohr2017-08-103-26/+43
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AttestKeyResponse may be larger than 4K (always less than 8K) when attesting an RSA key. This change allows the non-secure side to read a response that may be larger than 4K by adding an additional bit indicating the end of a response. If a message command has the KEYMASTER_STOP_BIT set, then the non-secure side knows that the response has been fully read. Test: android.keystore.cts.KeyAttestationTest#testRsaAttestation passes with production attestation key and chain, when AttestKeyResponse is larger than 4K. Tested with other CTS tests when keymaster messages are smaller than 4K, still passes. Manual test to verify that a tipc error due to large message size is handled correctly. Bug: 63335726 Change-Id: I8776ba7ca70da893648e15cfa770784ab31a2cb0
* | | | | Merge "Return correct error code when finish input length is too long."Treehugger Robot2017-08-031-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Return correct error code when finish input length is too long.Jocelyn Bohr2017-08-031-1/+3
| |/ / / | | | | | | | | | | | | | | | | Bug: 63745895 Change-Id: I465bf9138a0a21363f89f2c6074f7108ee33af70
* / / / Stop asking for old versions of C++ in system/core.Elliott Hughes2017-08-021-1/+0
|/ / / | | | | | | | | | | | | | | | Bug: http://b/32019064 Test: builds Change-Id: I1befc647b581bd293f98010e816b6413caab5e6c