Skip to content

Commit

Permalink
build(web-server): bump Rust SGX SDK revision: 565960c -> e8a9fc2
Browse files Browse the repository at this point in the history
  • Loading branch information
PiDelport committed Feb 28, 2022
1 parent 1e565a6 commit 90fec46
Show file tree
Hide file tree
Showing 16 changed files with 76 additions and 75 deletions.
3 changes: 2 additions & 1 deletion web-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ ARG INTEL_SGX_SDK_INSTALLER_URL="https://download.01.org/intel-sgx/sgx-linux/2.1

# Rust SGX SDK 1.1.4 (merge of v1.1.4-testing branch)
# Upstream issue: https://github.com/apache/incubator-teaclave-sgx-sdk/issues/360
ARG RUST_SGX_SDK_REVISION="565960cd7b4b36d1188459d75652619971c43f7e"
# Latest compatible revision since then: https://github.com/apache/incubator-teaclave-sgx-sdk/commit/e8a9fc22939befa27ff67f5509b2c2dfe8499945
ARG RUST_SGX_SDK_REVISION="e8a9fc22939befa27ff67f5509b2c2dfe8499945"

ARG SGX_MODE="SW"

Expand Down
2 changes: 1 addition & 1 deletion web-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ cargo make --list-all-steps

The codebase is currently pinned to the following revision:

- Commit: [565960cd7b4b36d1188459d75652619971c43f7e](https://github.com/apache/incubator-teaclave-sgx-sdk/commit/565960cd7b4b36d1188459d75652619971c43f7e)
- Commit: [e8a9fc22939befa27ff67f5509b2c2dfe8499945](https://github.com/apache/incubator-teaclave-sgx-sdk/commit/e8a9fc22939befa27ff67f5509b2c2dfe8499945)
- Issue: [upgrade SDK and rust compiler urgently needed #360](https://github.com/apache/incubator-teaclave-sgx-sdk/issues/360)
- Branch: [v1.1.4-testing](https://github.com/apache/incubator-teaclave-sgx-sdk/compare/v1.1.4-testing) (merged)

Expand Down
2 changes: 1 addition & 1 deletion web-server/http-service-impl/Cargo.lock

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

2 changes: 1 addition & 1 deletion web-server/http-service-impl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ serde = "1.0"


# SGX SDK
sgx_types = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "565960cd7b4b36d1188459d75652619971c43f7e" }
sgx_types = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" }
2 changes: 1 addition & 1 deletion web-server/sgx-helpers/Cargo.lock

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

2 changes: 1 addition & 1 deletion web-server/sgx-helpers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
sgx_types = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "565960cd7b4b36d1188459d75652619971c43f7e" }
sgx_types = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" }
26 changes: 13 additions & 13 deletions web-server/sgx-wallet-impl/Cargo.lock

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

14 changes: 7 additions & 7 deletions web-server/sgx-wallet-impl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ sodalite = { version = "0.4.0", default-features = false }
zeroize = { version = "1.4.1", features = ["alloc", "zeroize_derive"] }

# SGX SDK
sgx_tcrypto = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "565960cd7b4b36d1188459d75652619971c43f7e" }
sgx_tse = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "565960cd7b4b36d1188459d75652619971c43f7e" }
sgx_tstd = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "565960cd7b4b36d1188459d75652619971c43f7e" }
sgx_types = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "565960cd7b4b36d1188459d75652619971c43f7e" }
sgx_tcrypto = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" }
sgx_tse = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" }
sgx_tstd = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" }
sgx_types = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" }

# Community SGX forks
rand = { git = "https://github.com/mesalock-linux/rand-sgx" }
Expand All @@ -36,6 +36,6 @@ algonaut = { git = "https://github.com/registreerocks/algonaut-sgx", branch = "m
serde_bytes = { version = "0.11.4", git = "https://github.com/registreerocks/serde-bytes-sgx" } # SGX: registreerocks fork for 0.11.4

[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
sgx_libc = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "565960cd7b4b36d1188459d75652619971c43f7e" }
sgx_trts = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "565960cd7b4b36d1188459d75652619971c43f7e" }
sgx_tstd = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "565960cd7b4b36d1188459d75652619971c43f7e" }
sgx_libc = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" }
sgx_trts = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" }
sgx_tstd = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" }
4 changes: 2 additions & 2 deletions web-server/sgx-wallet-test/app/Cargo.lock

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

4 changes: 2 additions & 2 deletions web-server/sgx-wallet-test/app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2021"
build = "build.rs"

[dependencies]
sgx_types = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "565960cd7b4b36d1188459d75652619971c43f7e" }
sgx_urts = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "565960cd7b4b36d1188459d75652619971c43f7e" }
sgx_types = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" }
sgx_urts = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" }

[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
30 changes: 15 additions & 15 deletions web-server/sgx-wallet-test/enclave/Cargo.lock

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

Loading

0 comments on commit 90fec46

Please sign in to comment.