Skip to content
This repository has been archived by the owner on May 9, 2022. It is now read-only.

Commit

Permalink
deps: standardise SGX repos, and clean up patches
Browse files Browse the repository at this point in the history
This standardises all the Rust SGX SDK repository references to:

* git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git"
* rev = "b9d1bda"

which is v1.1.3 plus "feat(sgx_types): add traits using derive #325":

* apache/incubator-teaclave-sgx-sdk#325
  • Loading branch information
PiDelport committed May 25, 2021
1 parent c665e62 commit 862d919
Show file tree
Hide file tree
Showing 15 changed files with 137 additions and 174 deletions.
24 changes: 12 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ exclude = [
]

[patch."https://github.com/apache/teaclave-sgx-sdk.git"]
sgx_types = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git" }
sgx_urts = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git" }
sgx_tstd = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git", rev = "b9d1bda" }
57 changes: 20 additions & 37 deletions rtc_auth_enclave/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 9 additions & 7 deletions rtc_auth_enclave/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,17 @@ cc = "1.0.67"
cbindgen = "0.19.0"

[target.'cfg(not(target_env = "sgx"))'.dependencies]
sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git", features = ["extra_traits"]}
sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git", features = ["backtrace"] , rev = "v1.1.3" }
rtc_types = { path = "../rtc_types", features = ["teaclave_sgx"]}
sgx_types = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git", rev = "b9d1bda", features = ["extra_traits"] }
sgx_tstd = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git", rev = "b9d1bda", features = ["backtrace"] }

rtc_types = { path = "../rtc_types", features = ["teaclave_sgx"] }

[dependencies]
rtc_tenclave = { path = "../rtc_tenclave" }

[patch."https://github.com/apache/teaclave-sgx-sdk.git"]
sgx_types = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git" }
sgx_tcrypto = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git" }
sgx_alloc = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git" }
sgx_tstd = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git" }
sgx_tstd = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git", rev = "b9d1bda" }

# getrandom-sgx: https://github.com/mesalock-linux/getrandom-sgx/blob/sgx_1.1.3/Cargo.toml#L21-L24
sgx_libc = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git", rev = "b9d1bda" }
sgx_trts = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git", rev = "b9d1bda" }
Loading

0 comments on commit 862d919

Please sign in to comment.