Skip to content

Commit 383a51d

Browse files
dingelishdingelish
committed
Upgrade to sgx 1.1.1
1 parent 0177b8d commit 383a51d

File tree

3 files changed

+43
-42
lines changed

3 files changed

+43
-42
lines changed

‎sgx/gbdt-sgx-test/enclave/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ default = []
1414
gbdt_sgx = { path = "../../gbdt-sgx", default-features = false, features = ["mesalock_sgx", "input", "enable_training"] }
1515

1616
[target.'cfg(not(target_env = "sgx"))'.dependencies]
17-
sgx_types = { rev = "v1.1.0", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
18-
sgx_tstd = { rev = "v1.1.0", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
19-
sgx_tunittest = { rev = "v1.1.0", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
17+
sgx_types = { rev = "v1.1.1", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
18+
sgx_tstd = { rev = "v1.1.1", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
19+
sgx_tunittest = { rev = "v1.1.1", git = "https://github.com/apache/teaclave-sgx-sdk.git" }

‎sgx/gbdt-sgx-test/enclave/Xargo.toml

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,89 +2,90 @@
22
alloc = {}
33

44
[dependencies.sgx_types]
5-
git = "https://github.com/baidu/rust-sgx-sdk.git"
5+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
6+
stage = 1
7+
8+
[dependencies.sgx_alloc]
9+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
10+
stage = 1
11+
12+
[dependencies.sgx_unwind]
13+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
614
stage = 1
715

816
[dependencies.sgx_demangle]
9-
git = "https://github.com/baidu/rust-sgx-sdk.git"
17+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
1018
stage = 1
1119

1220
[dependencies.panic_abort]
13-
git = "https://github.com/baidu/rust-sgx-sdk.git"
21+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
1422
stage = 1
1523

1624
[dependencies.sgx_libc]
17-
git = "https://github.com/baidu/rust-sgx-sdk.git"
25+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
1826
stage = 2
1927

2028
[dependencies.sgx_tkey_exchange]
21-
git = "https://github.com/baidu/rust-sgx-sdk.git"
22-
stage = 2
23-
24-
[dependencies.sgx_tservice]
25-
git = "https://github.com/baidu/rust-sgx-sdk.git"
29+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
2630
stage = 2
2731

2832
[dependencies.sgx_tse]
29-
git = "https://github.com/baidu/rust-sgx-sdk.git"
33+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
3034
stage = 2
3135

3236
[dependencies.sgx_tcrypto]
33-
git = "https://github.com/baidu/rust-sgx-sdk.git"
37+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
3438
stage = 2
3539

3640
[dependencies.sgx_trts]
37-
git = "https://github.com/baidu/rust-sgx-sdk.git"
41+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
3842
stage = 3
3943

4044
[dependencies.sgx_backtrace_sys]
41-
git = "https://github.com/baidu/rust-sgx-sdk.git"
45+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
4246
stage = 3
4347

44-
[dependencies.sgx_unwind]
45-
git = "https://github.com/baidu/rust-sgx-sdk.git"
46-
stage = 4
48+
[dependencies.panic_unwind]
49+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
50+
stage = 3
4751

4852
[dependencies.sgx_tdh]
49-
git = "https://github.com/baidu/rust-sgx-sdk.git"
53+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
5054
stage = 4
5155

5256
[dependencies.sgx_tseal]
53-
git = "https://github.com/baidu/rust-sgx-sdk.git"
57+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
5458
stage = 4
5559

5660
[dependencies.sgx_tprotected_fs]
57-
git = "https://github.com/baidu/rust-sgx-sdk.git"
58-
stage = 4
59-
60-
[dependencies.sgx_alloc]
61-
git = "https://github.com/baidu/rust-sgx-sdk.git"
61+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
6262
stage = 4
6363

64-
[dependencies.panic_unwind]
65-
git = "https://github.com/baidu/rust-sgx-sdk.git"
64+
[dependencies.std]
65+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
6666
stage = 5
67+
features = ["backtrace"]
6768

68-
[dependencies.std]
69-
git = "https://github.com/baidu/rust-sgx-sdk.git"
70-
stage = 6
69+
[dependencies.sgx_no_tstd]
70+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
71+
stage = 5
7172

7273
[dependencies.sgx_rand]
73-
git = "https://github.com/baidu/rust-sgx-sdk.git"
74-
stage = 7
74+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
75+
stage = 6
7576

7677
[dependencies.sgx_serialize]
77-
git = "https://github.com/baidu/rust-sgx-sdk.git"
78-
stage = 7
78+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
79+
stage = 6
7980

8081
[dependencies.sgx_tunittest]
81-
git = "https://github.com/baidu/rust-sgx-sdk.git"
82-
stage = 7
82+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
83+
stage = 6
8384

8485
[dependencies.sgx_backtrace]
85-
git = "https://github.com/baidu/rust-sgx-sdk.git"
86-
stage = 8
86+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
87+
stage = 7
8788

8889
[dependencies.sgx_cov]
89-
git = "https://github.com/baidu/rust-sgx-sdk.git"
90-
stage = 8
90+
git = "https://github.com/apache/teaclave-sgx-sdk.git"
91+
stage = 7

‎sgx/gbdt-sgx/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ serde_json = { git = "https://github.com/mesalock-linux/serde-json-sgx" }
2929
rand = { version = "0.7", optional = true, git = "https://github.com/mesalock-linux/rand-sgx", tag = "v0.6.5_sgx1.1.0" }
3030
regex = { version = "1", git = "https://github.com/mesalock-linux/regex-sgx", optional = true }
3131
time = { version = "0.1", optional = true }
32-
sgx_tstd = { rev = "v1.1.0", git = "https://github.com/apache/teaclave-sgx-sdk", optional = true }
32+
sgx_tstd = { rev = "v1.1.1", git = "https://github.com/apache/teaclave-sgx-sdk", optional = true }
3333
cfg-if = "0.1"
3434

3535
[dev-dependencies]

0 commit comments

Comments
 (0)