Skip to content

MAINT: updated Cargo files: no refs to teaclave #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2020
Merged

MAINT: updated Cargo files: no refs to teaclave #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions enclave/safetrace/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
SGX_SDK ?= $(HOME)/.sgxsdk/sgxsdk

# The path to the incubator-teaclave-sgx-sdk code.
# SGX_SDK_RUST ?= ../incubator-teaclave-sgx-sdk/

SGX_SDK_RUST ?= $(HOME)/sgx


Expand Down
5 changes: 0 additions & 5 deletions enclave/safetrace/app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,3 @@ rmp-serde = "0.14.0"
rustc-hex = "1.0.0"
lazy_static = "1.3.0"
log = "0.4.6"


[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
sgx_types = { path = "../../incubator-teaclave-sgx-sdk/sgx_types" }
sgx_urts = { path = "../../incubator-teaclave-sgx-sdk/sgx_urts" }
3 changes: 0 additions & 3 deletions enclave/safetrace/enclave/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,9 @@ enigma-tools-t = { git = "https://github.com/enigmampc/enigma-core.git", branch=
enigma-tools-m = { git = "https://github.com/enigmampc/enigma-core.git", branch="develop", default-features = false, features = ["sgx"] }
enigma-runtime-t = { git = "https://github.com/enigmampc/enigma-core.git", branch="develop" }

# rustc-hex = { version = "2.0", default-features = false }
serde = { git = "https://github.com/mesalock-linux/serde-sgx.git", rev = "sgx_1.0.9", features=["serde_derive"] }
serde_json = { git = "https://github.com/enigmampc/serde-json-sgx.git", rev = "1.0.39-sgx-1.0.9" }
rmp-serde = {git = "https://github.com/enigmampc/msgpack-rust.git", rev = "0.14.0-sgx-1.0.9" }

# serde_cbor = { git = "https://github.com/mesalock-linux/cbor-sgx.git", rev = "sgx_1.0.9", default-features = false, features=["mesalock_sgx"] }
lazy_static = {version = "1.4.0", features = ["spin_no_std"] }

sgx_types = { git = "https://github.com/baidu/rust-sgx-sdk.git", rev = "v1.0.9" }
Expand Down
2 changes: 1 addition & 1 deletion enclave/safetrace/enclave/src/data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub const DATAFILE: &str = "data.sealed";
pub const TOVERLAP: i32 = 300; // 5min * 60s minimum overlap
pub const DISTANCE: f64 = 10.0; // in meters
pub const EARTH_RADIUS: f64 = 6371000.0; // in meters
pub const SEAL_LOG_SIZE: usize = 4096; // Maximum data can seal in bytes -> match
pub const SEAL_LOG_SIZE: usize = 4096; // Maximum data can seal in bytes -> smaller than "HeapMaxSize" in Enclave.config.xml


pub enum Error {
Expand Down