Skip to content

Commit 0177b8d

Browse files
dingelishdingelish
committed
Upgrade SGX SDK to v1.1.0
1 parent 344903a commit 0177b8d

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed

‎.drone.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ name: gbdt-sgx-xargo-1604-sw
383383

384384
steps:
385385
- name: sim-compile
386-
image: baiduxlab/sgx-rust:1604-1.0.9
386+
image: baiduxlab/sgx-rust:1604-1.1.0
387387
pull: always
388388
environment:
389389
SGX_MODE: SW
@@ -394,7 +394,7 @@ steps:
394394
- cd sgx && make -C gbdt-sgx-test
395395

396396
- name: sim-test
397-
image: baiduxlab/sgx-rust:1604-1.0.9
397+
image: baiduxlab/sgx-rust:1604-1.1.0
398398
pull: always
399399
commands:
400400
- . /opt/sgxsdk/environment
@@ -410,7 +410,7 @@ name: gbdt-sgx-xargo-1604-hw
410410

411411
steps:
412412
- name: hw-compile
413-
image: baiduxlab/sgx-rust:1604-1.0.9
413+
image: baiduxlab/sgx-rust:1604-1.1.0
414414
pull: always
415415
environment:
416416
SGX_MODE: HW
@@ -421,7 +421,7 @@ steps:
421421
- cd sgx && make -C gbdt-sgx-test
422422

423423
- name: hw-test
424-
image: baiduxlab/sgx-rust:1604-1.0.9
424+
image: baiduxlab/sgx-rust:1604-1.1.0
425425
pull: always
426426
privileged: true
427427
volumes:
@@ -453,7 +453,7 @@ name: gbdt-sgx-xargo-1804-sw
453453

454454
steps:
455455
- name: sim-compile
456-
image: baiduxlab/sgx-rust:1804-1.0.9
456+
image: baiduxlab/sgx-rust:1804-1.1.0
457457
pull: always
458458
environment:
459459
SGX_MODE: SW
@@ -464,7 +464,7 @@ steps:
464464
- cd sgx && make -C gbdt-sgx-test
465465

466466
- name: sim-test
467-
image: baiduxlab/sgx-rust:1804-1.0.9
467+
image: baiduxlab/sgx-rust:1804-1.1.0
468468
pull: always
469469
commands:
470470
- . /opt/sgxsdk/environment
@@ -480,7 +480,7 @@ name: gbdt-sgx-xargo-1804-hw
480480

481481
steps:
482482
- name: hw-compile
483-
image: baiduxlab/sgx-rust:1804-1.0.9
483+
image: baiduxlab/sgx-rust:1804-1.1.0
484484
pull: always
485485
environment:
486486
SGX_MODE: HW
@@ -491,7 +491,7 @@ steps:
491491
- cd sgx && make -C gbdt-sgx-test
492492

493493
- name: hw-test
494-
image: baiduxlab/sgx-rust:1804-1.0.9
494+
image: baiduxlab/sgx-rust:1804-1.1.0
495495
pull: always
496496
privileged: true
497497
volumes:
@@ -523,7 +523,7 @@ name: gbdt-sgx-1604-sw
523523

524524
steps:
525525
- name: sim-compile
526-
image: baiduxlab/sgx-rust:1604-1.0.9
526+
image: baiduxlab/sgx-rust:1604-1.1.0
527527
pull: always
528528
environment:
529529
SGX_MODE: SW
@@ -534,7 +534,7 @@ steps:
534534
- make -C sgx/gbdt-sgx-test
535535

536536
- name: sim-test
537-
image: baiduxlab/sgx-rust:1604-1.0.9
537+
image: baiduxlab/sgx-rust:1604-1.1.0
538538
pull: always
539539
commands:
540540
- . /opt/sgxsdk/environment
@@ -550,7 +550,7 @@ name: gbdt-sgx-1604-hw
550550

551551
steps:
552552
- name: hw-compile
553-
image: baiduxlab/sgx-rust:1604-1.0.9
553+
image: baiduxlab/sgx-rust:1604-1.1.0
554554
pull: always
555555
environment:
556556
SGX_MODE: HW
@@ -561,7 +561,7 @@ steps:
561561
- make -C sgx/gbdt-sgx-test
562562

563563
- name: hw-test
564-
image: baiduxlab/sgx-rust:1604-1.0.9
564+
image: baiduxlab/sgx-rust:1604-1.1.0
565565
pull: always
566566
privileged: true
567567
volumes:
@@ -593,7 +593,7 @@ name: gbdt-sgx-1804-sw
593593

594594
steps:
595595
- name: sim-compile
596-
image: baiduxlab/sgx-rust:1804-1.0.9
596+
image: baiduxlab/sgx-rust:1804-1.1.0
597597
pull: always
598598
environment:
599599
SGX_MODE: SW
@@ -604,7 +604,7 @@ steps:
604604
- make -C sgx/gbdt-sgx-test
605605

606606
- name: sim-test
607-
image: baiduxlab/sgx-rust:1804-1.0.9
607+
image: baiduxlab/sgx-rust:1804-1.1.0
608608
pull: always
609609
commands:
610610
- . /opt/sgxsdk/environment
@@ -620,7 +620,7 @@ name: gbdt-sgx-1804-hw
620620

621621
steps:
622622
- name: hw-compile
623-
image: baiduxlab/sgx-rust:1804-1.0.9
623+
image: baiduxlab/sgx-rust:1804-1.1.0
624624
pull: always
625625
environment:
626626
SGX_MODE: HW
@@ -631,7 +631,7 @@ steps:
631631
- make -C sgx/gbdt-sgx-test
632632

633633
- name: hw-test
634-
image: baiduxlab/sgx-rust:1804-1.0.9
634+
image: baiduxlab/sgx-rust:1804-1.1.0
635635
pull: always
636636
privileged: true
637637
volumes:

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "gbdt"
33
version = "0.1.1"
4-
authors = ["Tongxin Li <litongxin@baidu.com>", "Tianyi Li <n0b0dypku@gmail.com>", "Yu Ding <dingyu02@baidu.com>"]
4+
authors = ["Tongxin Li <litongxin@baidu.com>", "Tianyi Li <n0b0dypku@gmail.com>", "Yu Ding <dingelish@gmail.com>"]
55
homepage = "https://github.com/mesalock-linux/gbdt-rs"
66
repository = "https://github.com/mesalock-linux/gbdt-rs"
77
license = "Apache-2.0"

‎sgx/gbdt-sgx-test/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ RustEnclave_Link_Libs := -L$(CUSTOM_LIBRARY_PATH) -lenclave
107107
RustEnclave_Compile_Flags := $(SGX_COMMON_CFLAGS) -nostdinc -fvisibility=hidden -fpie -fstack-protector $(RustEnclave_Include_Paths)
108108
RustEnclave_Link_Flags := $(SGX_COMMON_CFLAGS) -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles -L$(SGX_LIBRARY_PATH) \
109109
-Wl,--whole-archive -l$(Trts_Library_Name) -l$(Service_Library_Name) -Wl,--no-whole-archive \
110-
-Wl,--start-group -lsgx_tstdc -lsgx_tcxx -l$(Crypto_Library_Name) $(RustEnclave_Link_Libs) -Wl,--end-group \
110+
-Wl,--start-group -lsgx_tcxx -lsgx_tstdc -l$(Crypto_Library_Name) $(RustEnclave_Link_Libs) -Wl,--end-group \
111111
-Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \
112112
-Wl,-pie,-eenclave_entry -Wl,--export-dynamic \
113113
-Wl,--defsym,__ImageBase=0 \

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ authors = ["Baidu"]
55
build = "build.rs"
66

77
[dependencies]
8-
sgx_types = { git = "https://github.com/baidu/rust-sgx-sdk.git" }
9-
sgx_urts = { git = "https://github.com/baidu/rust-sgx-sdk.git" }
8+
sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
9+
sgx_urts = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
1010
dirs = "1.0.2"

‎sgx/gbdt-sgx-test/app/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ fn init_enclave() -> SgxResult<SgxEnclave> {
9696
secs_attr: sgx_attributes_t { flags: 0, xfrm: 0 },
9797
misc_select: 0,
9898
};
99-
let enclave = try!(SgxEnclave::create(
99+
let enclave = SgxEnclave::create(
100100
ENCLAVE_FILE,
101101
debug,
102102
&mut launch_token,
103103
&mut launch_token_updated,
104104
&mut misc_attr
105-
));
105+
)?;
106106

107107
// Step 3: save the launch token if it is updated
108108
if use_token == true && launch_token_updated != 0 {

‎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.0.9", git = "https://github.com/baidu/rust-sgx-sdk.git" }
18-
sgx_tstd = { rev = "v1.0.9", git = "https://github.com/baidu/rust-sgx-sdk.git" }
19-
sgx_tunittest = { rev = "v1.0.9", git = "https://github.com/baidu/rust-sgx-sdk.git" }
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" }

‎sgx/gbdt-sgx/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "gbdt_sgx"
33
version = "0.1.0"
4-
authors = ["Tongxin Li <litongxin@baidu.com>", "Tianyi Li <n0b0dypku@gmail.com>", "Yu Ding <dingyu02@baidu.com>"]
4+
authors = ["Tongxin Li <litongxin@baidu.com>", "Tianyi Li <n0b0dypku@gmail.com>", "Yu Ding <dingelish@gmail.com>"]
55
homepage = "https://github.com/mesalock-linux/gbdt-rs"
66
repository = "https://github.com/mesalock-linux/gbdt-rs"
77
license = "Apache-2.0"
@@ -26,10 +26,10 @@ crate-type = ["rlib", "staticlib"]
2626
serde = { git = "https://github.com/mesalock-linux/serde-sgx" }
2727
serde_derive = { git = "https://github.com/mesalock-linux/serde-sgx" }
2828
serde_json = { git = "https://github.com/mesalock-linux/serde-json-sgx" }
29-
rand = { version = "0.7", optional = true, git = "https://github.com/mesalock-linux/rand-sgx", tag = "v0.6.5_sgx1.0.9" }
29+
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.0.9", git = "https://github.com/baidu/rust-sgx-sdk", optional = true }
32+
sgx_tstd = { rev = "v1.1.0", git = "https://github.com/apache/teaclave-sgx-sdk", optional = true }
3333
cfg-if = "0.1"
3434

3535
[dev-dependencies]

0 commit comments

Comments
 (0)