Skip to content

Commit

Permalink
fix enclave teaclave version
Browse files Browse the repository at this point in the history
  • Loading branch information
OverOrion committed Oct 28, 2022
1 parent 88d45d6 commit 09db4ef
Show file tree
Hide file tree
Showing 4 changed files with 222 additions and 321 deletions.
32 changes: 9 additions & 23 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2492,7 +2492,7 @@ dependencies = [
"sc-keystore",
"serde 1.0.147",
"serde_json 1.0.87",
"sgx_crypto_helper 1.1.6",
"sgx_crypto_helper",
"sp-application-crypto",
"sp-core",
"sp-keyring",
Expand Down Expand Up @@ -2593,7 +2593,7 @@ dependencies = [
"serde 1.0.147",
"serde_derive 1.0.147",
"serde_json 1.0.87",
"sgx_crypto_helper 1.1.6",
"sgx_crypto_helper",
"sgx_types",
"sgx_urts",
"sha2 0.7.1",
Expand Down Expand Up @@ -2956,7 +2956,7 @@ dependencies = [
"rustls 0.19.1",
"serde_derive 1.0.147",
"serde_json 1.0.87",
"sgx_crypto_helper 1.1.6",
"sgx_crypto_helper",
"substrate-api-client",
"thiserror 1.0.37",
"url 2.3.1",
Expand Down Expand Up @@ -2999,7 +2999,7 @@ dependencies = [
"rcgen",
"rustls 0.19.0 (git+https://github.com/mesalock-linux/rustls?branch=mesalock_sgx)",
"rustls 0.19.1",
"sgx_crypto_helper 1.1.5",
"sgx_crypto_helper",
"sgx_tstd",
"sgx_types",
"sp-core",
Expand Down Expand Up @@ -3134,7 +3134,7 @@ dependencies = [
"mockall",
"parity-scale-codec",
"serde_json 1.0.87",
"sgx_crypto_helper 1.1.6",
"sgx_crypto_helper",
"sgx_types",
"sgx_urts",
"sp-core",
Expand Down Expand Up @@ -3298,7 +3298,7 @@ dependencies = [
"serde 1.0.147",
"serde_json 1.0.60 (git+https://github.com/mesalock-linux/serde-json-sgx?tag=sgx_1.1.3)",
"serde_json 1.0.87",
"sgx_crypto_helper 1.1.6",
"sgx_crypto_helper",
"sgx_rand",
"sgx_tstd",
"sgx_types",
Expand Down Expand Up @@ -3357,7 +3357,7 @@ dependencies = [
"itp-types",
"log 0.4.17",
"parity-scale-codec",
"sgx_crypto_helper 1.1.6",
"sgx_crypto_helper",
"sgx_tstd",
"sgx_types",
"sp-core",
Expand Down Expand Up @@ -3460,7 +3460,7 @@ dependencies = [
"jsonrpc-core 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 18.0.0 (git+https://github.com/scs/jsonrpc?branch=no_std_v18)",
"parity-scale-codec",
"sgx_crypto_helper 1.1.6",
"sgx_crypto_helper",
"sgx_tstd",
"sgx_types",
"sp-core",
Expand Down Expand Up @@ -3521,7 +3521,7 @@ dependencies = [
"jsonrpc-core 18.0.0 (git+https://github.com/scs/jsonrpc?branch=no_std_v18)",
"log 0.4.17",
"parity-scale-codec",
"sgx_crypto_helper 1.1.6",
"sgx_crypto_helper",
"sgx_tstd",
"sgx_types",
"sp-core",
Expand Down Expand Up @@ -6630,20 +6630,6 @@ name = "sgx_build_helper"
version = "1.1.6"
source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"

[[package]]
name = "sgx_crypto_helper"
version = "1.1.5"
source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
dependencies = [
"itertools",
"serde 1.0.118 (git+https://github.com/mesalock-linux/serde-sgx)",
"serde-big-array 0.3.0",
"serde_derive 1.0.118",
"sgx_tcrypto",
"sgx_tstd",
"sgx_types",
]

[[package]]
name = "sgx_crypto_helper"
version = "1.1.6"
Expand Down
2 changes: 1 addition & 1 deletion core/tls-websocket-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rcgen = { package = "rcgen", default-features = false, git = "https://github.com
sgx_tstd = { optional = true, features = ["net", "thread"], git = "https://github.com/apache/teaclave-sgx-sdk.git", branch = "master" }
sgx_types = { optional = true, git = "https://github.com/apache/teaclave-sgx-sdk.git", branch = "master" }
# Todo: should not be needed here: #848
sgx_crypto_helper = { default-features = false, optional = true, features = ["mesalock_sgx"], version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
sgx_crypto_helper = { default-features = false, optional = true, features = ["mesalock_sgx"], version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }

# sgx enabled external libraries
mio-extras = { optional = true, default-features = false, git = "https://github.com/OverOrion/mio-extras-sgx", branch = "teaclave-v1.1.6-testing" }
Expand Down
Loading

0 comments on commit 09db4ef

Please sign in to comment.