openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
39,069 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

94 Commits

Author SHA1 Message Date
Elliott Hughes dc699a269f bpfmt. 
Bug: N/A
Test: builds
Change-Id: I89ad00e1c4c7e0767bc80a7ac7935a4d55e090ac
 2018-02-16 17:58:14 -08: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
Shawn Willden 10ed6fcc85 Add swillden and dkrahn to OWNERS 
Test: N/A
Change-Id: I0d3fd54af475ee9184eb44de689b821c450b874f
 2017-12-21 12:45:24 -08: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

Change-Id: I988bd6cf38aae918dd6b8c547b6db92501925685
 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

Change-Id: I4fee960013f5539d85613eb09e365ee580ed1745
 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

Change-Id: Ie48dcc9b3c874697b726d6ab0a333905c455adb8
 2017-10-02 21:37:31 +00:00
Andreas Gampe 346d7e1405 Merge "Keymaster: Move test to std::unique_ptr" 
am: 81348ffa9e

Change-Id: I74b22a692e23589002eca812b88dc458bc67fad4
 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

Change-Id: Ib5f0f4b99a0775329ec12130b84cf68997fe2008
 2017-08-26 15:25:15 +00:00
Christopher Ferris 831140358d Merge "Add missing include for readv." 
am: 1f6a807bac

Change-Id: Ib0530b4e3ea1a9fdc779c87cdd12489859a35bff
 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

Change-Id: I8e21eb54387caa145eac24de9a4b1ec752e7193e
 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

Change-Id: I40d7f76b82cf87b6b156015db141ceb58ff10a38
 2017-08-16 00:25:56 +00:00
Jocelyn Bohr eb7207dbcd Merge "Pass in message_version_ received from the secure side." am: 1a955faab2 am: 4e8bbb968c 
am: 3a5d47af18

Change-Id: If57d80e166bb9ffd915ffe58ebb371bb3ada91c1
 2017-08-16 00:13:37 +00:00
Hung-ying Tyan 52723d68f9 Merge "Remove nvram trusty implementation." into oc-mr1-dev 
am: 46691ee85c

Change-Id: Ia9a30f38a6e2bbad926ea6e336f943f8da9e45b6
 2017-08-16 00:07:04 +00:00
Treehugger Robot 1a955faab2 Merge "Pass in message_version_ received from the secure side." 2017-08-15 23:35:48 +00:00
Hung-ying Tyan 98a48d8e4b Remove nvram trusty implementation. 
Bug: 64705490
Test: build pass
Change-Id: I32a1565ec935fff1c45540442134a37b55702752
 2017-08-15 18:52:42 +08:00
Jocelyn Bohr d74c72db7e Merge "Enable non-secure side to receive messages > 4K" am: 28fa8b0924 am: 9295f6f36d 
am: c323791e73

Change-Id: I142fbd2ce1005489090a0bf287a27bd1946a7ced
 2017-08-12 03:16:34 +00:00
Treehugger Robot 28fa8b0924 Merge "Enable non-secure side to receive messages > 4K" 2017-08-12 03:02:01 +00:00
Jocelyn Bohr 38b9b49941 Pass in message_version_ received from the secure side. 
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
 2017-08-11 18:08:56 -07:00
Hung-ying Tyan 5505eb783b Revert "Move trusty reference implementations to /vendor" 
The CL is not complete and will cause build break when BOARD_VNDK_VERSION is set.

This reverts commit 7d81b4e081.

Change-Id: If9632fb7ee8147c39f1ad0860ddc3bed62ba89db
 2017-08-11 08:02:21 +00:00
Jocelyn Bohr b3ed3772b9 Enable non-secure side to receive messages > 4K 
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
 2017-08-10 16:53:27 -07:00
Hung-ying Tyan 7d81b4e081 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.
Change-Id: I9a5440071386b929058207fdef560ed2d7223ba3
 2017-08-10 10:48:17 +08:00
Jocelyn Bohr 67d5ddde7b Merge "Return correct error code when finish input length is too long." am: 90657bbeab am: efea269a75 
am: 18e3e2a66f

Change-Id: I40d235ba41cdb8a94d2955ed4dc77d94df72ed7b
 2017-08-03 23:55:11 +00:00
Treehugger Robot 90657bbeab Merge "Return correct error code when finish input length is too long." 2017-08-03 23:35:05 +00:00
Jocelyn Bohr f1e5edf765 Return correct error code when finish input length is too long. 
Bug: 63745895
Change-Id: I465bf9138a0a21363f89f2c6074f7108ee33af70
 2017-08-03 13:59:10 -07:00
Elliott Hughes cb6e5d6ed2 Merge "Stop asking for old versions of C++ in system/core." am: e61e2fcf21 am: 0915192d8b 
am: 514464f4ca

Change-Id: Ibbd6515b4a44105e7b965e7b36bc4c3648c7e713
 2017-08-03 02:33:04 +00:00
Elliott Hughes 972d078b3e Stop asking for old versions of C++ in system/core. 
Bug: http://b/32019064
Test: builds
Change-Id: I1befc647b581bd293f98010e816b6413caab5e6c
 2017-08-02 14:06:28 -07:00
Steven Moreland 57db1511bd Merge "system/core: use proper nativehelper headers" am: 4f59afe9fa am: 6208cd1322 
am: 106c355688

Change-Id: I8ddfceec58ab69b6c0952ea39f3ad78802f5d7bc
 2017-07-19 15:36:37 +00:00
Steven Moreland 00fe3ad728 system/core: use proper nativehelper headers 
libnativeheader exports headers under nativeheader. These were
available before incorrectly as global headers in order to give
access to jni.h.

Test: modules using system/core find headers
Bug: 63762847
Change-Id: I86240f7857dd815100cab32ad261aa9a0a54329c
 2017-07-18 17:03:20 -07:00
Steven Moreland 8bb85bd07c trusty*: Android.mk -> Android.bp 
Test: links
Bug: 37512442
Merged-In: I86bcdcfffbbd81dedb921612bd2d21ea4aabaeb1
Change-Id: I86bcdcfffbbd81dedb921612bd2d21ea4aabaeb1
 2017-05-08 16:54:04 +00:00
Steven Moreland c5c1937b58 trusty*: Android.mk -> Android.bp 
Test: links
Bug: 37512442
Change-Id: I86bcdcfffbbd81dedb921612bd2d21ea4aabaeb1
 2017-05-08 09:47:26 -07:00
Steven Moreland 38207765fb Merge "trusty/storage/* to Android.bp" am: 1dcd257a21 am: 1561e34bf4 am: 9b7632ef8a 
am: bc7edfe56f

Change-Id: I4b762bf23b062862824a98bb9e7c099388ae3e5c
 2017-05-05 03:50:40 +00:00
Janis Danisevskis 8f7d80468e Rename libkeymaster to libkeymaster_staging 
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
 2017-05-04 14:15:30 -07:00
Steven Moreland 7f0a5bd767 trusty/storage/* to Android.bp 
Test: links
Bug: 37512442
Change-Id: I53449f572e41a24a4e49b16ef01bdbb23cc10cb5
 2017-05-04 15:51:50 +00:00
Janis Danisevskis 275b62a9a3 libkeymaster1 split 
libkeymaster1 was split into libkeymaster_portable and libkeymaster.

Bug: 37467707
Change-Id: I63869316451867d54bf34afb28ea232cc7eddbae
 2017-05-03 15:54:44 +00:00
Janis Danisevskis 8a0f637d41 Revert "libkeymaster1 split" 
This reverts commit c5bb8c74d1.

Reason for revert: build breakage

Change-Id: I892346eec4a4628da893b0cd4182c8f546beb60a
 2017-05-03 00:22:39 +00:00
Janis Danisevskis c5bb8c74d1 libkeymaster1 split 
libkeymaster1 was split into libkeymaster_portable and libkeymaster.

Change-Id: Iacdcef8631b4903fef4a79d146a9f59e37f31c3f
 2017-05-01 12:32:37 -07:00