Commit Graph

137 Commits

Author SHA1 Message Date
lzha101 3535f30bd2 Merge pull request #215 from deeglaze/sgx_is_enclave_crashed
Adds an API function to check if the enclave has crashed.

Signed-off-by: Zhang Lili Z <lili.z.zhang@intel.com>
2018-03-05 15:52:56 +08:00
Dionna Glaze 3d80233b42 Adds an API function to check if the enclave has crashed.
Signed-off-by: Dionna Glaze <dionnaglaze@google.com>
2018-03-02 09:56:44 -08:00
lzha101 7d0a4086ed Merge pull request #219 from lzha101/st_fix
Fix dump command for sgx_sign

Signed-off-by: Zhang Lili Z <lili.z.zhang@intel.com>
2018-02-28 10:53:58 +08:00
Zhang Lili Z 08d15d554e Fix dump command for sgx_sign
Signed-off-by: Zhang Lili Z <lili.z.zhang@intel.com>
2018-02-28 18:46:37 +08:00
Andy Zhao 1bcdf2ed21 Linux 2.1.1 Open Source Gold Release
Signed-off-by: Andy Zhao <yebin.andy.zhao@intel.com>
sgx_2.1.1
2018-02-13 06:29:03 +00:00
lzha101 3ccaec34f4 Merge pull request #203 from lzha101/openssl_compat
Fix OpenSSL 1.1.0 compatibility issue in sign_tool and urts_sim

Signed-off-by: Zhang Lili Z lili.z.zhang@intel.com
2018-01-29 11:19:20 +08:00
Zhang Lili Z a12405a2b3 Fix OpenSSL 1.1.0 compatibility issue in sign_tool and urts_sim
Signed-off-by: Zhang Lili Z <lili.z.zhang@intel.com>
2018-01-27 01:45:19 +08:00
lzha101 3f132c612f Update download_prebuilt.sh
Update download script to use prebuilt AEs with security updates.
2018-01-26 17:02:10 +08:00
lzha101 049541fa6a Merge pull request #197 from dingelish/master
Fix improper Makefile for tprotected_fs and uprotected_fs. And fix a typo in sample project.

Signed-off-by: Zhang Lili lili.z.zhang@intel.com
2018-01-23 09:23:03 +08:00
Yu Ding ec99334de7 Fix a typo
Signed-off-by: Yu Ding <dingelish@gmail.com>
2018-01-19 10:55:22 -08:00
Yu Ding 550724f559 Merge remote-tracking branch 'upstream/master' 2018-01-19 10:53:43 -08:00
Li, Xun 1ccf25b64a Linux 2.1 Open Source Gold release
Signed-off-by: Li, Xun <xun.li@intel.com>
sgx_2.1
2018-01-19 11:02:56 +08:00
Yu Ding 4752534fb2 Fix improper Makefile for tprotected_fs and uprotected_fs, enabling make -j.
Signed-off-by: Yu Ding <dingelish@gmail.com>
2018-01-17 14:50:33 -08:00
yuyuany 3699ffd5eb Merge pull request #188 from yuyuany/heap_init
Clear the heap pages after enclave initialization
2017-12-11 14:06:25 +08:00
Yu Yuan 5fd7026fc3 Clear the heap pages after enclave initialization
Signed-off-by: Yu Yuan <yuan.yu@intel.com>
2017-12-11 21:56:40 +08:00
lzha101 160be9c402 Merge pull request #186 from akryeem-INTC/akryeem-INTC-patch-2
Update script to look into specific SGXSSL tag.

Signed-off-by: Zhang Lili lili.z.zhang@intel.com
2017-11-30 15:57:58 +08:00
akryeem-INTC 9f397bb0f6 Update script to look into specific SGXSSL tag.
Instead of downloading and using master branch, use specific tag that we know will always work for SGX SDK.
When SGXSSL master branch change, SGX SDK shouldn't be affected.
Signed-off-by: Kryeem, Alaa alaa.kryeem@intel.com
2017-11-30 09:27:49 +02:00
Li, Xun cbdce63643 Fix bug in aesm_service and uae_service shared code
Object is not allocated before dereferencing pointer.

Signed-off-by: Li, Xun <xun.li@intel.com>
2017-11-15 10:50:32 +08:00
yuyuany 1cac210251 Merge pull request #179 from rrebane/master
Fix linker error due to undefined reference.
2017-11-15 09:19:18 +08:00
Reimo Rebane d15da77481 Fix linker error due to undefined reference.
* Calling the macro "SGX_ACCESS_VERSION(sgx_capable, 1)" results in a
  reference to "sgx_sgx_capable_version" which is undefined. The correct
  reference is "sgx_capable_version".

Signed-off-by: Reimo Rebane <reimo.rebane@cyber.ee>
2017-11-13 13:05:47 +02:00
Andy Zhao de141c3984 Merge pull request #178 from avchinch/master
Update README with SGX 2.0-capable driver note.
2017-11-10 09:52:31 +08:00
Angie Chinchilla 406038db39 Update README with SGX 2.0-capable driver note.
Signed-off-by: Angie Chinchilla <angie.v.chinchilla@intel.com>
2017-11-09 16:30:15 -05:00
Li, Xun 53c7eae28f Remerge pull request #176
The changes in #176 were reverted in Linux 2.0 Open Source Gold release.

Signed-off-by: Li, Xun <xun.li@intel.com>
2017-11-09 10:02:06 +08:00
Li, Xun 159f60223e Linux 2.0 Open Source Gold release
Signed-off-by: Li, Xun <xun.li@intel.com>
sgx_2.0
2017-11-07 14:41:20 +08:00
yuyuany 2ef16f684e Merge pull request #176 from clenimar/mention-source-env
Mention environment set up to compile samples
2017-10-24 09:00:41 +08:00
Clenimar Filemon cabf1f60b0 Mention environment set up to compile samples
In some cases it may be necessary to source the needed environment
variables before compiling the sample codes. Mention it in the main
README and also in every sample code README.

Signed-off-by: Clenimar Filemon <clenimar.filemon@gmail.com>
2017-10-23 10:42:44 -03:00
lzha101 cc7b61d123 Merge pull request #173 from dingelish/master
Fix to a static library linking problem.

Signed-off-by: Zhang Lili lili.z.zhang@intel.com
2017-10-16 15:18:00 +08:00
lzha101 f807025460 Merge pull request #174 from mkow/patch-1
Fix a typo in a sample code

Signed-off-by: Zhang Lili lili.z.zhang@intel.com
2017-10-16 13:23:27 +08:00
Michał Kowalczyk b1bc6fcad9 Fix a typo in a sample code
Signed-off-by: Michał Kowalczyk <mkow@invisiblethingslab.com>
2017-10-13 11:36:33 +02:00
Yu Ding 4b78988578 Fix to a static library linking problem.
The new `protected_fs` library is shipped within two static libraries (libsgx_tprotected_fs.a and libsgx_uprotected_fs.a). Both of them include a header file. These two header files would cause linking problem because in many circumstances, these two header files appear in source code directories and source codes include them. This patch is intended to resolve this conflict.

Signed-off-by: Yu Ding <dingyu02@baidu.com>
2017-09-28 20:45:08 -07:00
Haitao Huang 9d8046e310 Check and handle signal interrupts in sockets
Signed-off-by: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>
2017-09-22 16:57:45 +08:00
Haitao Huang 960ad91a4a Add error code in oal for invalid inputs
Signed-off-by: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>
2017-09-22 16:57:45 +08:00
Li, Xun e22c569335 Update libunwind for glibc 2.26 compatibility
libunwind should include <signal.h> explicitly.
glibc change sys/ucontext.h as a bug fix(https://sourceware.org/git/?p=glibc.git;a=commit;h=cfed8ece799b6e6540193a14b41d9de52dc3b08f)

Signed-off-by: Li, Xun <xun.li@intel.com>
2017-09-20 11:12:20 +08:00
lzha101 9cda5c4774 Merge pull request #165 from corda/chrisr3-stack-protector-fix
Ensure trts_nsp.cpp is compiled without stack protection.

Signed-off-by: Zhang Lili lili.z.zhang@intel.com
2017-09-20 09:58:29 +08:00
Chris Rankin 36918f071f Ensure trts_nsp.cpp is compiled without stack protection.
Signed-off-by: Chris Rankin <chris.rankin@r3.com>
2017-09-19 08:07:59 +00:00
Kai Mast 94c162c98b g++7 fixes (#148)
Signed-off-by: Li, Xun<xun.li@intel.com>
2017-09-18 16:07:19 +08:00
Li Xun 8a72fed873 Merge pull request #159 from corda/chrisr3-gcc7-fix
Resolve GCC 7.1 warnings about deprecated throw(std::bad_alloc) in C++11.

Signed-off-by: Li, Xun <xun.li@intel.com>
2017-09-18 15:58:10 +08:00
Chris Rankin 635e3a3708 Resolve warnings about deprecated throw(std::bad_alloc) in C++11. 2017-09-13 10:31:11 +01:00
yuyuany 2133df2d4a Merge pull request #155 from 01org/revert-151-ocall_exit_enclave
Revert "Check for crash in sgx_ocall and exit enclave if enclave is crashed"
2017-09-13 10:06:33 +08:00
yuyuany f2cf6d18aa Revert "Check for crash in sgx_ocall and exit enclave if enclave is crashed" 2017-09-07 15:21:45 +08:00
lzha101 0356eb6249 Merge pull request #153 from greglaun/greglaun-typos
Correct typos in some of the sample apps.

Signed-off-by: Zhang Lili lili.z.zhang@intel.com
2017-09-06 15:58:16 +08:00
Li Xun 2fe2471459 Merge pull request #154 from llly/pull
Fix build issues with latest OpenSSL and Gcc
2017-09-06 14:10:42 +08:00
Vytautas Mickus 2e00f11ed5 Make code compatible with OpenSSL 1.0 and 1.1 2017-09-06 10:22:07 +08:00
Vytautas Mickus 95ea2c21a9 Tell gcc about the fallthroughs (needed because of -Werror in makefiles) 2017-09-06 10:21:58 +08:00
Vytautas Mickus 6e0580d110 Use uname -m instead of arch in installer. 2017-09-06 10:21:41 +08:00
Greg Laun 38023b61aa Correct typos in some of the sample apps.
Signed-off-by: Greg Laun <greg.laun@gmail.com>
2017-09-05 12:33:37 -07:00
lzha101 df9b032898 Merge pull request #151 from yuyuany/ocall_exit_enclave
Check for crash in sgx_ocall and exit enclave if enclave is crashed.

Signed-off-by: Zhang Lili lili.z.zhang@intel.com
2017-09-05 10:41:22 +08:00
Yu Yuan a20449f5f8 tRTS check the enclave crash state when doing an OCALL. If the enclave is crashed, tRTS unwind the stack to ECALL, and exit the enclave with SGX_ERROR_ENCLAVE_CRASHED.
Signed-off-by: Yu Yuan <yuan.yu@intel.com>
2017-09-01 22:46:27 +08:00
Andy Zhao a2f33d828b Merge pull request #149 from lzha101/add_missing_delete
Add two missing delete functions
2017-08-28 16:30:00 +08:00
Zhang Lili 6979d81807 Add two missing delete functions.
Signed-off-by: Zhang Lili <lili.z.zhang@intel.com>
2017-08-28 23:17:47 +08:00