general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade Rust SGX SDK to v1.0.4

Browse Source
This commit is contained in:
Tate, Hongliang Tian 2018-12-18 01:38:58 +08:00
parent ea00690e68
commit e9064e3914
4 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -12,7 +12,11 @@ Compared to existing library OSes for SGX, Occlum has following unprecedented fe
### Prerequisite ### Prerequisite
Occlum depends on [Rust SGX SDK](https://github.com/baidu/rust-sgx-sdk/) and [Intel SGX SDK](https://github.com/intel/linux-sgx/). So, make sure Rust SGX SDK and Intel SGX SDK can be built properly on your machine. We have tested with Rust SGX SDK 1.1, Rust nightly-2018-08-25 and Intel SGX SDK 2.2 on Ubuntu 16.04. Occlum depends on [Baidu Rust SGX SDK](https://github.com/baidu/rust-sgx-sdk/) and [Intel SGX SDK](https://github.com/intel/linux-sgx/).
Rust SGX SDK is included as a Git submodule of this project, which can be automatically downloaded by using project's Makefile. Currently, we're using version 1.0.4 of Rust SGX SDK, which in turn depends on Rust nightly-2018-10-01. So, make sure you have Rust installed and use this version as the default.
Intel SGX SDK has to be installed separately. We have tested with Intel SGX SDK v2.3.1. Note that it must be modified slightly to work with Rust SGX SDK. The patch can be found [here](https://github.com/baidu/rust-sgx-sdk/blob/af441e3c9143a8c1d04dbbc544142adc8e35f73e/dockerfile/patch).
### Compile ### Compile

2
deps/rust-sgx-sdk vendored

@ -1 +1 @@
Subproject commit f26dcd8f5fce88780c83a7c54b774e6e9d36aa23 Subproject commit 4d999470c8c12a6e6f70d302c09114957114bb05

2
src/Enclave.edl
View File

@ -3,8 +3,6 @@ enclave {
from "sgx_backtrace.edl" import *; from "sgx_backtrace.edl" import *;
from "sgx_tstdc.edl" import *; from "sgx_tstdc.edl" import *;
from "sgx_tstd.edl" import *; from "sgx_tstd.edl" import *;
from "sgx_net.edl" import *;
from "sgx_time.edl" import *;
from "sgx_tprotected_fs.edl" import *; from "sgx_tprotected_fs.edl" import *;
trusted { trusted {

34
src/libos/Cargo.lock generated
View File

@ -3,9 +3,9 @@ name = "Occlum"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sgx_trts 1.0.1", "sgx_trts 1.0.4",
"sgx_tstd 1.0.1", "sgx_tstd 1.0.4",
"sgx_types 1.0.1", "sgx_types 1.0.4",
"xmas-elf 0.6.2", "xmas-elf 0.6.2",
] ]
@ -20,9 +20,9 @@ dependencies = [
[[package]] [[package]]
name = "sgx_alloc" name = "sgx_alloc"
version = "1.0.1" version = "1.0.4"
dependencies = [ dependencies = [
"sgx_trts 1.0.1", "sgx_trts 1.0.4",
] ]
[[package]] [[package]]
@ -31,40 +31,40 @@ version = "0.1.0"
[[package]] [[package]]
name = "sgx_tprotected_fs" name = "sgx_tprotected_fs"
version = "1.0.1" version = "1.0.4"
dependencies = [ dependencies = [
"sgx_trts 1.0.1", "sgx_trts 1.0.4",
"sgx_types 1.0.1", "sgx_types 1.0.4",
] ]
[[package]] [[package]]
name = "sgx_trts" name = "sgx_trts"
version = "1.0.1" version = "1.0.4"
dependencies = [ dependencies = [
"sgx_types 1.0.1", "sgx_types 1.0.4",
] ]
[[package]] [[package]]
name = "sgx_tstd" name = "sgx_tstd"
version = "1.0.1" version = "1.0.4"
dependencies = [ dependencies = [
"sgx_alloc 1.0.1", "sgx_alloc 1.0.4",
"sgx_build_helper 0.1.0", "sgx_build_helper 0.1.0",
"sgx_tprotected_fs 1.0.1", "sgx_tprotected_fs 1.0.4",
"sgx_trts 1.0.1", "sgx_trts 1.0.4",
"sgx_types 1.0.1", "sgx_types 1.0.4",
"sgx_unwind 0.0.1", "sgx_unwind 0.0.1",
] ]
[[package]] [[package]]
name = "sgx_types" name = "sgx_types"
version = "1.0.1" version = "1.0.4"
[[package]] [[package]]
name = "sgx_unwind" name = "sgx_unwind"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"sgx_trts 1.0.1", "sgx_trts 1.0.4",
] ]
[[package]] [[package]]