From 90fec46c220eb17f4c9a2830495e1771e09193ad Mon Sep 17 00:00:00 2001 From: Pi Delport Date: Mon, 28 Feb 2022 14:27:12 +0200 Subject: [PATCH] build(web-server): bump Rust SGX SDK revision: 565960c -> e8a9fc2 --- web-server/Dockerfile | 3 +- web-server/README.md | 2 +- web-server/http-service-impl/Cargo.lock | 2 +- web-server/http-service-impl/Cargo.toml | 2 +- web-server/sgx-helpers/Cargo.lock | 2 +- web-server/sgx-helpers/Cargo.toml | 2 +- web-server/sgx-wallet-impl/Cargo.lock | 26 ++++++++-------- web-server/sgx-wallet-impl/Cargo.toml | 14 ++++----- web-server/sgx-wallet-test/app/Cargo.lock | 4 +-- web-server/sgx-wallet-test/app/Cargo.toml | 4 +-- web-server/sgx-wallet-test/enclave/Cargo.lock | 30 +++++++++---------- web-server/sgx-wallet-test/enclave/Cargo.toml | 16 +++++----- web-server/sgx-wallet/app/Cargo.lock | 4 +-- web-server/sgx-wallet/app/Cargo.toml | 4 +-- web-server/sgx-wallet/enclave/Cargo.lock | 26 ++++++++-------- web-server/sgx-wallet/enclave/Cargo.toml | 10 +++---- 16 files changed, 76 insertions(+), 75 deletions(-) diff --git a/web-server/Dockerfile b/web-server/Dockerfile index d0eb2147b..a3a15dd13 100644 --- a/web-server/Dockerfile +++ b/web-server/Dockerfile @@ -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" diff --git a/web-server/README.md b/web-server/README.md index 767a84b2d..963cd3ce8 100644 --- a/web-server/README.md +++ b/web-server/README.md @@ -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) diff --git a/web-server/http-service-impl/Cargo.lock b/web-server/http-service-impl/Cargo.lock index 3a62ff58d..74c999072 100644 --- a/web-server/http-service-impl/Cargo.lock +++ b/web-server/http-service-impl/Cargo.lock @@ -1115,7 +1115,7 @@ dependencies = [ [[package]] name = "sgx_types" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sha-1" diff --git a/web-server/http-service-impl/Cargo.toml b/web-server/http-service-impl/Cargo.toml index e4454a5f0..a7238d721 100644 --- a/web-server/http-service-impl/Cargo.toml +++ b/web-server/http-service-impl/Cargo.toml @@ -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" } diff --git a/web-server/sgx-helpers/Cargo.lock b/web-server/sgx-helpers/Cargo.lock index 031bc1697..3cabe5275 100644 --- a/web-server/sgx-helpers/Cargo.lock +++ b/web-server/sgx-helpers/Cargo.lock @@ -12,4 +12,4 @@ dependencies = [ [[package]] name = "sgx_types" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" diff --git a/web-server/sgx-helpers/Cargo.toml b/web-server/sgx-helpers/Cargo.toml index 42f12e660..1583ded09 100644 --- a/web-server/sgx-helpers/Cargo.toml +++ b/web-server/sgx-helpers/Cargo.toml @@ -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" } diff --git a/web-server/sgx-wallet-impl/Cargo.lock b/web-server/sgx-wallet-impl/Cargo.lock index 4be846866..853dc9300 100644 --- a/web-server/sgx-wallet-impl/Cargo.lock +++ b/web-server/sgx-wallet-impl/Cargo.lock @@ -226,7 +226,7 @@ checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" [[package]] name = "hashbrown_tstd" version = "0.11.2" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "hex" @@ -527,12 +527,12 @@ dependencies = [ [[package]] name = "sgx_alloc" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sgx_backtrace_sys" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "cc", "sgx_build_helper", @@ -542,17 +542,17 @@ dependencies = [ [[package]] name = "sgx_build_helper" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sgx_demangle" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sgx_libc" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_types", ] @@ -560,7 +560,7 @@ dependencies = [ [[package]] name = "sgx_tcrypto" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_types", ] @@ -568,7 +568,7 @@ dependencies = [ [[package]] name = "sgx_tprotected_fs" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_trts", "sgx_types", @@ -577,7 +577,7 @@ dependencies = [ [[package]] name = "sgx_trts" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_libc", "sgx_types", @@ -586,7 +586,7 @@ dependencies = [ [[package]] name = "sgx_tse" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_types", ] @@ -594,7 +594,7 @@ dependencies = [ [[package]] name = "sgx_tstd" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "hashbrown_tstd", "sgx_alloc", @@ -610,12 +610,12 @@ dependencies = [ [[package]] name = "sgx_types" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sgx_unwind" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_build_helper", ] diff --git a/web-server/sgx-wallet-impl/Cargo.toml b/web-server/sgx-wallet-impl/Cargo.toml index cf2968116..672b26d88 100644 --- a/web-server/sgx-wallet-impl/Cargo.toml +++ b/web-server/sgx-wallet-impl/Cargo.toml @@ -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" } @@ -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" } diff --git a/web-server/sgx-wallet-test/app/Cargo.lock b/web-server/sgx-wallet-test/app/Cargo.lock index 964ea6bb5..42f5325e1 100644 --- a/web-server/sgx-wallet-test/app/Cargo.lock +++ b/web-server/sgx-wallet-test/app/Cargo.lock @@ -19,12 +19,12 @@ dependencies = [ [[package]] name = "sgx_types" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sgx_urts" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "libc", "sgx_types", diff --git a/web-server/sgx-wallet-test/app/Cargo.toml b/web-server/sgx-wallet-test/app/Cargo.toml index 91825844a..e9d782615 100644 --- a/web-server/sgx-wallet-test/app/Cargo.toml +++ b/web-server/sgx-wallet-test/app/Cargo.toml @@ -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'] diff --git a/web-server/sgx-wallet-test/enclave/Cargo.lock b/web-server/sgx-wallet-test/enclave/Cargo.lock index dd4551020..1747ef72f 100644 --- a/web-server/sgx-wallet-test/enclave/Cargo.lock +++ b/web-server/sgx-wallet-test/enclave/Cargo.lock @@ -244,7 +244,7 @@ checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" [[package]] name = "hashbrown_tstd" version = "0.11.2" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "hex" @@ -662,12 +662,12 @@ dependencies = [ [[package]] name = "sgx_alloc" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sgx_backtrace_sys" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "cc", "sgx_build_helper", @@ -677,17 +677,17 @@ dependencies = [ [[package]] name = "sgx_build_helper" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sgx_demangle" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sgx_libc" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_types", ] @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "sgx_rand" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_trts", "sgx_tstd", @@ -705,7 +705,7 @@ dependencies = [ [[package]] name = "sgx_tcrypto" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_types", ] @@ -713,7 +713,7 @@ dependencies = [ [[package]] name = "sgx_tprotected_fs" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_trts", "sgx_types", @@ -722,7 +722,7 @@ dependencies = [ [[package]] name = "sgx_trts" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_libc", "sgx_types", @@ -731,7 +731,7 @@ dependencies = [ [[package]] name = "sgx_tse" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_types", ] @@ -739,7 +739,7 @@ dependencies = [ [[package]] name = "sgx_tstd" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "hashbrown_tstd", "sgx_alloc", @@ -755,7 +755,7 @@ dependencies = [ [[package]] name = "sgx_tunittest" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_tstd", ] @@ -763,12 +763,12 @@ dependencies = [ [[package]] name = "sgx_types" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sgx_unwind" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_build_helper", ] diff --git a/web-server/sgx-wallet-test/enclave/Cargo.toml b/web-server/sgx-wallet-test/enclave/Cargo.toml index 74d4bba7f..981e7aed5 100644 --- a/web-server/sgx-wallet-test/enclave/Cargo.toml +++ b/web-server/sgx-wallet-test/enclave/Cargo.toml @@ -21,11 +21,11 @@ secrecy = "0.8.0" sodalite = { version = "0.4.0", default-features = false } # SGX SDK -sgx_rand = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "565960cd7b4b36d1188459d75652619971c43f7e" } -sgx_tcrypto = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "565960cd7b4b36d1188459d75652619971c43f7e" } -sgx_tstd = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", features = ["backtrace"], rev = "565960cd7b4b36d1188459d75652619971c43f7e" } -sgx_tunittest = { 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_rand = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" } +sgx_tcrypto = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" } +sgx_tstd = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", features = ["backtrace"], rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" } +sgx_tunittest = { 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 rmp-serde = { git = "https://github.com/mesalock-linux/msgpack-rust-sgx" } @@ -41,6 +41,6 @@ sgx-wallet-impl = { path = "../../sgx-wallet-impl" } proptest = { version = "1.0.0", default-features = false, features = ["alloc", "hardware-rng"] } [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" } diff --git a/web-server/sgx-wallet/app/Cargo.lock b/web-server/sgx-wallet/app/Cargo.lock index 32a90315b..6ed2ef27b 100644 --- a/web-server/sgx-wallet/app/Cargo.lock +++ b/web-server/sgx-wallet/app/Cargo.lock @@ -1142,12 +1142,12 @@ dependencies = [ [[package]] name = "sgx_types" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sgx_urts" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "libc", "sgx_types", diff --git a/web-server/sgx-wallet/app/Cargo.toml b/web-server/sgx-wallet/app/Cargo.toml index 9c14a0807..b2498501e 100644 --- a/web-server/sgx-wallet/app/Cargo.toml +++ b/web-server/sgx-wallet/app/Cargo.toml @@ -14,8 +14,8 @@ actix-web = "4.0.0-beta.8" env-var-helpers = { git = "https://github.com/PiDelport/rust-env-var-helpers", default-features = false } # SGX SDK -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" } http-service-impl = { path = "../../http-service-impl" } sgx-helpers = { path = "../../sgx-helpers" } diff --git a/web-server/sgx-wallet/enclave/Cargo.lock b/web-server/sgx-wallet/enclave/Cargo.lock index 48e69d2af..4c0bdb6a3 100644 --- a/web-server/sgx-wallet/enclave/Cargo.lock +++ b/web-server/sgx-wallet/enclave/Cargo.lock @@ -226,7 +226,7 @@ checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" [[package]] name = "hashbrown_tstd" version = "0.11.2" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "hex" @@ -536,12 +536,12 @@ dependencies = [ [[package]] name = "sgx_alloc" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sgx_backtrace_sys" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "cc", "sgx_build_helper", @@ -551,17 +551,17 @@ dependencies = [ [[package]] name = "sgx_build_helper" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sgx_demangle" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sgx_libc" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_types", ] @@ -569,7 +569,7 @@ dependencies = [ [[package]] name = "sgx_tcrypto" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_types", ] @@ -577,7 +577,7 @@ dependencies = [ [[package]] name = "sgx_tprotected_fs" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_trts", "sgx_types", @@ -586,7 +586,7 @@ dependencies = [ [[package]] name = "sgx_trts" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_libc", "sgx_types", @@ -595,7 +595,7 @@ dependencies = [ [[package]] name = "sgx_tse" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_types", ] @@ -603,7 +603,7 @@ dependencies = [ [[package]] name = "sgx_tstd" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "hashbrown_tstd", "sgx_alloc", @@ -619,12 +619,12 @@ dependencies = [ [[package]] name = "sgx_types" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" [[package]] name = "sgx_unwind" version = "1.1.4" -source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=565960cd7b4b36d1188459d75652619971c43f7e#565960cd7b4b36d1188459d75652619971c43f7e" +source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?rev=e8a9fc22939befa27ff67f5509b2c2dfe8499945#e8a9fc22939befa27ff67f5509b2c2dfe8499945" dependencies = [ "sgx_build_helper", ] diff --git a/web-server/sgx-wallet/enclave/Cargo.toml b/web-server/sgx-wallet/enclave/Cargo.toml index 3619d5f0b..092614e6c 100644 --- a/web-server/sgx-wallet/enclave/Cargo.toml +++ b/web-server/sgx-wallet/enclave/Cargo.toml @@ -17,12 +17,12 @@ default = [] [dependencies] # SGX SDK -sgx_types = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "565960cd7b4b36d1188459d75652619971c43f7e" } -sgx_tstd = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", features = ["backtrace"], rev = "565960cd7b4b36d1188459d75652619971c43f7e" } +sgx_types = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" } +sgx_tstd = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk", features = ["backtrace"], rev = "e8a9fc22939befa27ff67f5509b2c2dfe8499945" } sgx-wallet-impl = { path = "../../sgx-wallet-impl" } [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" }