You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by di...@apache.org on 2020/03/18 00:41:37 UTC
[incubator-teaclave-sgx-sdk] branch v1.1.1-testing updated: Fix
samplecode's toml to remove sgx_tservice
This is an automated email from the ASF dual-hosted git repository.
dingyu pushed a commit to branch v1.1.1-testing
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-sgx-sdk.git
The following commit(s) were added to refs/heads/v1.1.1-testing by this push:
new ce978b1 Fix samplecode's toml to remove sgx_tservice
ce978b1 is described below
commit ce978b1789407e47cd8442d1b512c39821200bc4
Author: Yu Ding <di...@gmail.com>
AuthorDate: Tue Mar 17 17:41:24 2020 -0700
Fix samplecode's toml to remove sgx_tservice
---
samplecode/backtrace/enclave/Cargo.toml | 1 -
samplecode/backtrace/enclave/Xargo.toml | 4 -
samplecode/crypto/enclave/Cargo.toml | 1 -
samplecode/crypto/enclave/Xargo.toml | 4 -
samplecode/db-proxy/db-proxy/enclave/Cargo.toml | 1 -
samplecode/db-proxy/db-proxy/enclave/Xargo.toml | 4 -
samplecode/file/enclave/Cargo.toml | 1 -
samplecode/file/enclave/Xargo.toml | 4 -
samplecode/hello-regex/enclave/Cargo.toml | 1 -
samplecode/hello-regex/enclave/Xargo.toml | 4 -
.../hello-rust-vscode-debug/enclave/Cargo.toml | 1 -
.../hello-rust-vscode-debug/enclave/Xargo.toml | 4 -
samplecode/hello-rust/enclave/Cargo.toml | 1 -
samplecode/hello-rust/enclave/Xargo.toml | 4 -
samplecode/helloworld/enclave/Cargo.toml | 1 -
samplecode/helloworld/enclave/Xargo.toml | 4 -
samplecode/http_req/enclave/Cargo.toml | 1 -
samplecode/http_req/enclave/Xargo.toml | 4 -
samplecode/hugemem/enclave/Cargo.toml | 1 -
samplecode/hugemem/enclave/Xargo.toml | 4 -
samplecode/kvdb-memdb/enclave/Cargo.toml | 1 -
samplecode/kvdb-memdb/enclave/Xargo.toml | 4 -
samplecode/localattestation/attestation/Xargo.toml | 4 -
samplecode/localattestation/enclave1/Xargo.toml | 4 -
samplecode/localattestation/enclave2/Xargo.toml | 4 -
samplecode/localattestation/enclave3/Xargo.toml | 4 -
samplecode/logger/enclave/Cargo.toml | 1 -
samplecode/logger/enclave/Xargo.toml | 4 -
samplecode/machine-learning/enclave/Cargo.toml | 1 -
samplecode/machine-learning/enclave/Xargo.toml | 4 -
samplecode/mio/client/enclave/Cargo.toml | 1 -
samplecode/mio/client/enclave/Xargo.toml | 4 -
samplecode/mio/server/enclave/Cargo.toml | 1 -
samplecode/mio/server/enclave/Xargo.toml | 4 -
samplecode/mutual-ra/enclave/Cargo.toml | 1 -
samplecode/mutual-ra/enclave/Xargo.toml | 4 -
samplecode/net2/enclave/Cargo.toml | 1 -
samplecode/net2/enclave/Xargo.toml | 4 -
samplecode/pcl/encrypted-hello/enclave/Cargo.toml | 1 -
samplecode/pcl/encrypted-hello/enclave/Xargo.toml | 4 -
samplecode/pcl/pcl-seal/enclave/Cargo.toml | 1 -
samplecode/pcl/pcl-seal/enclave/Xargo.toml | 4 -
samplecode/prost-protobuf/enclave/Cargo.toml | 1 -
samplecode/prost-protobuf/enclave/Xargo.toml | 4 -
samplecode/protobuf/enclave/Cargo.toml | 1 -
samplecode/protobuf/enclave/Xargo.toml | 4 -
samplecode/psi/SMCServer/enclave/Cargo.toml | 2 -
samplecode/psi/SMCServer/enclave/Xargo.toml | 4 -
.../Application/enclave/Cargo.toml | 2 -
.../Application/enclave/Xargo.toml | 4 -
samplecode/sealeddata/enclave/Cargo.toml | 1 -
samplecode/sealeddata/enclave/Xargo.toml | 4 -
samplecode/secretsharing/enclave/Cargo.toml | 1 -
samplecode/secretsharing/enclave/Xargo.toml | 4 -
samplecode/serialize/enclave/Cargo.toml | 1 -
samplecode/serialize/enclave/Xargo.toml | 4 -
samplecode/sgx-cov/enclave/Cargo.toml | 1 -
samplecode/sgx-cov/enclave/Xargo.toml | 4 -
samplecode/sgxcounter/Makefile | 163 ---------------------
samplecode/sgxcounter/Readme.md | 6 -
samplecode/sgxcounter/app/Cargo.toml | 13 --
samplecode/sgxcounter/app/build.rs | 40 -----
samplecode/sgxcounter/app/src/main.rs | 82 -----------
samplecode/sgxcounter/bin/readme.txt | 1 -
samplecode/sgxcounter/enclave/Cargo.toml | 46 ------
samplecode/sgxcounter/enclave/Enclave.config.xml | 12 --
samplecode/sgxcounter/enclave/Enclave.edl | 29 ----
samplecode/sgxcounter/enclave/Enclave.lds | 9 --
samplecode/sgxcounter/enclave/Enclave_private.pem | 39 -----
samplecode/sgxcounter/enclave/Makefile | 32 ----
samplecode/sgxcounter/enclave/Xargo.toml | 94 ------------
samplecode/sgxcounter/enclave/src/lib.rs | 88 -----------
.../enclave/x86_64-unknown-linux-sgx.json | 31 ----
samplecode/sgxcounter/lib/readme.txt | 1 -
samplecode/sgxtime/Makefile | 163 ---------------------
samplecode/sgxtime/Readme.md | 6 -
samplecode/sgxtime/app/Cargo.toml | 14 --
samplecode/sgxtime/app/build.rs | 40 -----
samplecode/sgxtime/app/src/main.rs | 82 -----------
samplecode/sgxtime/bin/readme.txt | 1 -
samplecode/sgxtime/enclave/Cargo.toml | 46 ------
samplecode/sgxtime/enclave/Enclave.config.xml | 12 --
samplecode/sgxtime/enclave/Enclave.edl | 29 ----
samplecode/sgxtime/enclave/Enclave.lds | 9 --
samplecode/sgxtime/enclave/Enclave_private.pem | 39 -----
samplecode/sgxtime/enclave/Makefile | 32 ----
samplecode/sgxtime/enclave/Xargo.toml | 94 ------------
samplecode/sgxtime/enclave/src/lib.rs | 61 --------
.../sgxtime/enclave/x86_64-unknown-linux-sgx.json | 31 ----
samplecode/sgxtime/lib/readme.txt | 1 -
.../static-data-distribution/enclave/Cargo.toml | 1 -
.../static-data-distribution/enclave/Xargo.toml | 4 -
samplecode/switchless/enclave/Cargo.toml | 1 -
samplecode/switchless/enclave/Xargo.toml | 4 -
samplecode/tcmalloc/enclave/Cargo.toml | 1 -
samplecode/tcmalloc/enclave/Xargo.toml | 4 -
samplecode/thread/enclave/Cargo.toml | 1 -
samplecode/thread/enclave/Xargo.toml | 4 -
samplecode/tls/tlsclient/enclave/Cargo.toml | 1 -
samplecode/tls/tlsclient/enclave/Xargo.toml | 4 -
samplecode/tls/tlsserver/enclave/Cargo.toml | 1 -
samplecode/tls/tlsserver/enclave/Xargo.toml | 4 -
samplecode/tr-mpc/tr-mpc-server/enclave/Cargo.toml | 1 -
samplecode/tr-mpc/tr-mpc-server/enclave/Xargo.toml | 4 -
samplecode/ue-ra/ue-ra-server/enclave/Cargo.toml | 1 -
samplecode/ue-ra/ue-ra-server/enclave/Xargo.toml | 4 -
samplecode/unit-test/enclave/Cargo.toml | 1 -
samplecode/unit-test/enclave/Xargo.toml | 6 +-
samplecode/wasmi/enclave/Cargo.toml | 1 -
samplecode/wasmi/enclave/Xargo.toml | 4 -
.../zlib-lazy-static-sample/enclave/Cargo.toml | 1 -
.../zlib-lazy-static-sample/enclave/Xargo.toml | 4 -
112 files changed, 1 insertion(+), 1555 deletions(-)
diff --git a/samplecode/backtrace/enclave/Cargo.toml b/samplecode/backtrace/enclave/Cargo.toml
index ffd5857..00b1f7b 100644
--- a/samplecode/backtrace/enclave/Cargo.toml
+++ b/samplecode/backtrace/enclave/Cargo.toml
@@ -37,7 +37,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/backtrace/enclave/Xargo.toml b/samplecode/backtrace/enclave/Xargo.toml
index 558d1d0..4b6f280 100644
--- a/samplecode/backtrace/enclave/Xargo.toml
+++ b/samplecode/backtrace/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/crypto/enclave/Cargo.toml b/samplecode/crypto/enclave/Cargo.toml
index b84f74c..b6839c3 100644
--- a/samplecode/crypto/enclave/Cargo.toml
+++ b/samplecode/crypto/enclave/Cargo.toml
@@ -38,7 +38,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/crypto/enclave/Xargo.toml b/samplecode/crypto/enclave/Xargo.toml
index cb43640..6189cbf 100644
--- a/samplecode/crypto/enclave/Xargo.toml
+++ b/samplecode/crypto/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/db-proxy/db-proxy/enclave/Cargo.toml b/samplecode/db-proxy/db-proxy/enclave/Cargo.toml
index 85d4f43..7c13f5d 100644
--- a/samplecode/db-proxy/db-proxy/enclave/Cargo.toml
+++ b/samplecode/db-proxy/db-proxy/enclave/Cargo.toml
@@ -36,7 +36,6 @@ sgx_tprotected_fs = { path = "../../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../../sgx_trts" }
sgx_tse = { path = "../../../../sgx_tse" }
sgx_tseal = { path = "../../../../sgx_tseal" }
-sgx_tservice = { path = "../../../../sgx_tservice" }
sgx_tstd = { path = "../../../../sgx_tstd" }
sgx_tunittest = { path = "../../../../sgx_tunittest" }
sgx_types = { path = "../../../../sgx_types" }
diff --git a/samplecode/db-proxy/db-proxy/enclave/Xargo.toml b/samplecode/db-proxy/db-proxy/enclave/Xargo.toml
index 6d4db74..2fe0af4 100644
--- a/samplecode/db-proxy/db-proxy/enclave/Xargo.toml
+++ b/samplecode/db-proxy/db-proxy/enclave/Xargo.toml
@@ -25,10 +25,6 @@ stage = 2
path = "../../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../../sgx_tse"
stage = 2
diff --git a/samplecode/file/enclave/Cargo.toml b/samplecode/file/enclave/Cargo.toml
index 1245cd7..3bac2bf 100644
--- a/samplecode/file/enclave/Cargo.toml
+++ b/samplecode/file/enclave/Cargo.toml
@@ -41,7 +41,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/file/enclave/Xargo.toml b/samplecode/file/enclave/Xargo.toml
index cb43640..6189cbf 100644
--- a/samplecode/file/enclave/Xargo.toml
+++ b/samplecode/file/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/hello-regex/enclave/Cargo.toml b/samplecode/hello-regex/enclave/Cargo.toml
index eccccba..9e6cfc3 100644
--- a/samplecode/hello-regex/enclave/Cargo.toml
+++ b/samplecode/hello-regex/enclave/Cargo.toml
@@ -39,7 +39,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/hello-regex/enclave/Xargo.toml b/samplecode/hello-regex/enclave/Xargo.toml
index cb43640..6189cbf 100644
--- a/samplecode/hello-regex/enclave/Xargo.toml
+++ b/samplecode/hello-regex/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/hello-rust-vscode-debug/enclave/Cargo.toml b/samplecode/hello-rust-vscode-debug/enclave/Cargo.toml
index d508cd4..f4f3224 100644
--- a/samplecode/hello-rust-vscode-debug/enclave/Cargo.toml
+++ b/samplecode/hello-rust-vscode-debug/enclave/Cargo.toml
@@ -36,7 +36,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/hello-rust-vscode-debug/enclave/Xargo.toml b/samplecode/hello-rust-vscode-debug/enclave/Xargo.toml
index cb43640..6189cbf 100644
--- a/samplecode/hello-rust-vscode-debug/enclave/Xargo.toml
+++ b/samplecode/hello-rust-vscode-debug/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/hello-rust/enclave/Cargo.toml b/samplecode/hello-rust/enclave/Cargo.toml
index eb622f9..8e7afa9 100644
--- a/samplecode/hello-rust/enclave/Cargo.toml
+++ b/samplecode/hello-rust/enclave/Cargo.toml
@@ -33,7 +33,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/hello-rust/enclave/Xargo.toml b/samplecode/hello-rust/enclave/Xargo.toml
index 866117d..66af891 100644
--- a/samplecode/hello-rust/enclave/Xargo.toml
+++ b/samplecode/hello-rust/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/helloworld/enclave/Cargo.toml b/samplecode/helloworld/enclave/Cargo.toml
index d508cd4..f4f3224 100644
--- a/samplecode/helloworld/enclave/Cargo.toml
+++ b/samplecode/helloworld/enclave/Cargo.toml
@@ -36,7 +36,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/helloworld/enclave/Xargo.toml b/samplecode/helloworld/enclave/Xargo.toml
index cb43640..6189cbf 100644
--- a/samplecode/helloworld/enclave/Xargo.toml
+++ b/samplecode/helloworld/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/http_req/enclave/Cargo.toml b/samplecode/http_req/enclave/Cargo.toml
index a4ca4bf..e0cfa8c 100644
--- a/samplecode/http_req/enclave/Cargo.toml
+++ b/samplecode/http_req/enclave/Cargo.toml
@@ -37,7 +37,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/http_req/enclave/Xargo.toml b/samplecode/http_req/enclave/Xargo.toml
index c3fc4df..07d26e8 100644
--- a/samplecode/http_req/enclave/Xargo.toml
+++ b/samplecode/http_req/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/hugemem/enclave/Cargo.toml b/samplecode/hugemem/enclave/Cargo.toml
index d65ec58..76f7695 100644
--- a/samplecode/hugemem/enclave/Cargo.toml
+++ b/samplecode/hugemem/enclave/Cargo.toml
@@ -36,7 +36,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/hugemem/enclave/Xargo.toml b/samplecode/hugemem/enclave/Xargo.toml
index cb43640..6189cbf 100644
--- a/samplecode/hugemem/enclave/Xargo.toml
+++ b/samplecode/hugemem/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/kvdb-memdb/enclave/Cargo.toml b/samplecode/kvdb-memdb/enclave/Cargo.toml
index 89887cd..0bc002c 100644
--- a/samplecode/kvdb-memdb/enclave/Cargo.toml
+++ b/samplecode/kvdb-memdb/enclave/Cargo.toml
@@ -41,7 +41,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/kvdb-memdb/enclave/Xargo.toml b/samplecode/kvdb-memdb/enclave/Xargo.toml
index cb43640..6189cbf 100644
--- a/samplecode/kvdb-memdb/enclave/Xargo.toml
+++ b/samplecode/kvdb-memdb/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/localattestation/attestation/Xargo.toml b/samplecode/localattestation/attestation/Xargo.toml
index cb43640..6189cbf 100644
--- a/samplecode/localattestation/attestation/Xargo.toml
+++ b/samplecode/localattestation/attestation/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/localattestation/enclave1/Xargo.toml b/samplecode/localattestation/enclave1/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/localattestation/enclave1/Xargo.toml
+++ b/samplecode/localattestation/enclave1/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/localattestation/enclave2/Xargo.toml b/samplecode/localattestation/enclave2/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/localattestation/enclave2/Xargo.toml
+++ b/samplecode/localattestation/enclave2/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/localattestation/enclave3/Xargo.toml b/samplecode/localattestation/enclave3/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/localattestation/enclave3/Xargo.toml
+++ b/samplecode/localattestation/enclave3/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/logger/enclave/Cargo.toml b/samplecode/logger/enclave/Cargo.toml
index 95e2550..4c7e6a7 100644
--- a/samplecode/logger/enclave/Cargo.toml
+++ b/samplecode/logger/enclave/Cargo.toml
@@ -40,7 +40,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/logger/enclave/Xargo.toml b/samplecode/logger/enclave/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/logger/enclave/Xargo.toml
+++ b/samplecode/logger/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/machine-learning/enclave/Cargo.toml b/samplecode/machine-learning/enclave/Cargo.toml
index 8fb79c9..1736fdd 100644
--- a/samplecode/machine-learning/enclave/Cargo.toml
+++ b/samplecode/machine-learning/enclave/Cargo.toml
@@ -49,7 +49,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/machine-learning/enclave/Xargo.toml b/samplecode/machine-learning/enclave/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/machine-learning/enclave/Xargo.toml
+++ b/samplecode/machine-learning/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/mio/client/enclave/Cargo.toml b/samplecode/mio/client/enclave/Cargo.toml
index 259ce0d..db670bb 100644
--- a/samplecode/mio/client/enclave/Cargo.toml
+++ b/samplecode/mio/client/enclave/Cargo.toml
@@ -38,7 +38,6 @@ sgx_tprotected_fs = { path = "../../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../../sgx_trts" }
sgx_tse = { path = "../../../../sgx_tse" }
sgx_tseal = { path = "../../../../sgx_tseal" }
-sgx_tservice = { path = "../../../../sgx_tservice" }
sgx_tstd = { path = "../../../../sgx_tstd" }
sgx_tunittest = { path = "../../../../sgx_tunittest" }
sgx_types = { path = "../../../../sgx_types" }
diff --git a/samplecode/mio/client/enclave/Xargo.toml b/samplecode/mio/client/enclave/Xargo.toml
index 780a570..30186d7 100644
--- a/samplecode/mio/client/enclave/Xargo.toml
+++ b/samplecode/mio/client/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../../sgx_tse"
stage = 2
diff --git a/samplecode/mio/server/enclave/Cargo.toml b/samplecode/mio/server/enclave/Cargo.toml
index 5db19a6..14183e5 100644
--- a/samplecode/mio/server/enclave/Cargo.toml
+++ b/samplecode/mio/server/enclave/Cargo.toml
@@ -42,7 +42,6 @@ sgx_tprotected_fs = { path = "../../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../../sgx_trts" }
sgx_tse = { path = "../../../../sgx_tse" }
sgx_tseal = { path = "../../../../sgx_tseal" }
-sgx_tservice = { path = "../../../../sgx_tservice" }
sgx_tstd = { path = "../../../../sgx_tstd" }
sgx_tunittest = { path = "../../../../sgx_tunittest" }
sgx_types = { path = "../../../../sgx_types" }
diff --git a/samplecode/mio/server/enclave/Xargo.toml b/samplecode/mio/server/enclave/Xargo.toml
index 780a570..30186d7 100644
--- a/samplecode/mio/server/enclave/Xargo.toml
+++ b/samplecode/mio/server/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../../sgx_tse"
stage = 2
diff --git a/samplecode/mutual-ra/enclave/Cargo.toml b/samplecode/mutual-ra/enclave/Cargo.toml
index 5c48c28..36920f3 100644
--- a/samplecode/mutual-ra/enclave/Cargo.toml
+++ b/samplecode/mutual-ra/enclave/Cargo.toml
@@ -58,7 +58,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/mutual-ra/enclave/Xargo.toml b/samplecode/mutual-ra/enclave/Xargo.toml
index a057ba7..e01bc02 100644
--- a/samplecode/mutual-ra/enclave/Xargo.toml
+++ b/samplecode/mutual-ra/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/net2/enclave/Cargo.toml b/samplecode/net2/enclave/Cargo.toml
index 4a2d072..5b89b2a 100644
--- a/samplecode/net2/enclave/Cargo.toml
+++ b/samplecode/net2/enclave/Cargo.toml
@@ -39,7 +39,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/net2/enclave/Xargo.toml b/samplecode/net2/enclave/Xargo.toml
index 5400ea8..ed0c076 100644
--- a/samplecode/net2/enclave/Xargo.toml
+++ b/samplecode/net2/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/pcl/encrypted-hello/enclave/Cargo.toml b/samplecode/pcl/encrypted-hello/enclave/Cargo.toml
index f1c968f..abe33c0 100644
--- a/samplecode/pcl/encrypted-hello/enclave/Cargo.toml
+++ b/samplecode/pcl/encrypted-hello/enclave/Cargo.toml
@@ -33,7 +33,6 @@ sgx_tprotected_fs = { path = "../../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../../sgx_trts" }
sgx_tse = { path = "../../../../sgx_tse" }
sgx_tseal = { path = "../../../../sgx_tseal" }
-sgx_tservice = { path = "../../../../sgx_tservice" }
sgx_tstd = { path = "../../../../sgx_tstd" }
sgx_tunittest = { path = "../../../../sgx_tunittest" }
sgx_types = { path = "../../../../sgx_types" }
diff --git a/samplecode/pcl/encrypted-hello/enclave/Xargo.toml b/samplecode/pcl/encrypted-hello/enclave/Xargo.toml
index 74ddc1e..da6e4a0 100644
--- a/samplecode/pcl/encrypted-hello/enclave/Xargo.toml
+++ b/samplecode/pcl/encrypted-hello/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../../sgx_tse"
stage = 2
diff --git a/samplecode/pcl/pcl-seal/enclave/Cargo.toml b/samplecode/pcl/pcl-seal/enclave/Cargo.toml
index 0f0232a..57127e8 100644
--- a/samplecode/pcl/pcl-seal/enclave/Cargo.toml
+++ b/samplecode/pcl/pcl-seal/enclave/Cargo.toml
@@ -50,7 +50,6 @@ sgx_tprotected_fs = { path = "../../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../../sgx_trts" }
sgx_tse = { path = "../../../../sgx_tse" }
sgx_tseal = { path = "../../../../sgx_tseal" }
-sgx_tservice = { path = "../../../../sgx_tservice" }
sgx_tstd = { path = "../../../../sgx_tstd" }
sgx_tunittest = { path = "../../../../sgx_tunittest" }
sgx_types = { path = "../../../../sgx_types" }
diff --git a/samplecode/pcl/pcl-seal/enclave/Xargo.toml b/samplecode/pcl/pcl-seal/enclave/Xargo.toml
index 780a570..30186d7 100644
--- a/samplecode/pcl/pcl-seal/enclave/Xargo.toml
+++ b/samplecode/pcl/pcl-seal/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../../sgx_tse"
stage = 2
diff --git a/samplecode/prost-protobuf/enclave/Cargo.toml b/samplecode/prost-protobuf/enclave/Cargo.toml
index 4862740..becb8a0 100644
--- a/samplecode/prost-protobuf/enclave/Cargo.toml
+++ b/samplecode/prost-protobuf/enclave/Cargo.toml
@@ -41,7 +41,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/prost-protobuf/enclave/Xargo.toml b/samplecode/prost-protobuf/enclave/Xargo.toml
index 866117d..66af891 100644
--- a/samplecode/prost-protobuf/enclave/Xargo.toml
+++ b/samplecode/prost-protobuf/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/protobuf/enclave/Cargo.toml b/samplecode/protobuf/enclave/Cargo.toml
index 9ef1de6..e78579d 100644
--- a/samplecode/protobuf/enclave/Cargo.toml
+++ b/samplecode/protobuf/enclave/Cargo.toml
@@ -39,7 +39,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/protobuf/enclave/Xargo.toml b/samplecode/protobuf/enclave/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/protobuf/enclave/Xargo.toml
+++ b/samplecode/protobuf/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/psi/SMCServer/enclave/Cargo.toml b/samplecode/psi/SMCServer/enclave/Cargo.toml
index 7f7c487..b6e7db2 100644
--- a/samplecode/psi/SMCServer/enclave/Cargo.toml
+++ b/samplecode/psi/SMCServer/enclave/Cargo.toml
@@ -16,7 +16,6 @@ sgx_trts = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_tdh = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_tcrypto = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-sgx_tservice = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_tkey_exchange = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_rand = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
@@ -42,7 +41,6 @@ sgx_tprotected_fs = { path = "../../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../../sgx_trts" }
sgx_tse = { path = "../../../../sgx_tse" }
sgx_tseal = { path = "../../../../sgx_tseal" }
-sgx_tservice = { path = "../../../../sgx_tservice" }
sgx_tstd = { path = "../../../../sgx_tstd" }
sgx_tunittest = { path = "../../../../sgx_tunittest" }
sgx_types = { path = "../../../../sgx_types" }
diff --git a/samplecode/psi/SMCServer/enclave/Xargo.toml b/samplecode/psi/SMCServer/enclave/Xargo.toml
index 74ddc1e..da6e4a0 100644
--- a/samplecode/psi/SMCServer/enclave/Xargo.toml
+++ b/samplecode/psi/SMCServer/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../../sgx_tse"
stage = 2
diff --git a/samplecode/remoteattestation/Application/enclave/Cargo.toml b/samplecode/remoteattestation/Application/enclave/Cargo.toml
index e1847e4..6d15c8a 100644
--- a/samplecode/remoteattestation/Application/enclave/Cargo.toml
+++ b/samplecode/remoteattestation/Application/enclave/Cargo.toml
@@ -16,7 +16,6 @@ sgx_trts = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_tdh = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_tcrypto = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-sgx_tservice = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_tkey_exchange = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
@@ -41,7 +40,6 @@ sgx_tprotected_fs = { path = "../../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../../sgx_trts" }
sgx_tse = { path = "../../../../sgx_tse" }
sgx_tseal = { path = "../../../../sgx_tseal" }
-sgx_tservice = { path = "../../../../sgx_tservice" }
sgx_tstd = { path = "../../../../sgx_tstd" }
sgx_tunittest = { path = "../../../../sgx_tunittest" }
sgx_types = { path = "../../../../sgx_types" }
diff --git a/samplecode/remoteattestation/Application/enclave/Xargo.toml b/samplecode/remoteattestation/Application/enclave/Xargo.toml
index 74ddc1e..da6e4a0 100644
--- a/samplecode/remoteattestation/Application/enclave/Xargo.toml
+++ b/samplecode/remoteattestation/Application/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../../sgx_tse"
stage = 2
diff --git a/samplecode/sealeddata/enclave/Cargo.toml b/samplecode/sealeddata/enclave/Cargo.toml
index bab0b53..8bfce6b 100644
--- a/samplecode/sealeddata/enclave/Cargo.toml
+++ b/samplecode/sealeddata/enclave/Cargo.toml
@@ -43,7 +43,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/sealeddata/enclave/Xargo.toml b/samplecode/sealeddata/enclave/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/sealeddata/enclave/Xargo.toml
+++ b/samplecode/sealeddata/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/secretsharing/enclave/Cargo.toml b/samplecode/secretsharing/enclave/Cargo.toml
index 4a51586..ad50140 100644
--- a/samplecode/secretsharing/enclave/Cargo.toml
+++ b/samplecode/secretsharing/enclave/Cargo.toml
@@ -39,7 +39,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/secretsharing/enclave/Xargo.toml b/samplecode/secretsharing/enclave/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/secretsharing/enclave/Xargo.toml
+++ b/samplecode/secretsharing/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/serialize/enclave/Cargo.toml b/samplecode/serialize/enclave/Cargo.toml
index adf8f51..8496a58 100644
--- a/samplecode/serialize/enclave/Cargo.toml
+++ b/samplecode/serialize/enclave/Cargo.toml
@@ -36,7 +36,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/serialize/enclave/Xargo.toml b/samplecode/serialize/enclave/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/serialize/enclave/Xargo.toml
+++ b/samplecode/serialize/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/sgx-cov/enclave/Cargo.toml b/samplecode/sgx-cov/enclave/Cargo.toml
index a5983b6..31499de 100644
--- a/samplecode/sgx-cov/enclave/Cargo.toml
+++ b/samplecode/sgx-cov/enclave/Cargo.toml
@@ -38,7 +38,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/sgx-cov/enclave/Xargo.toml b/samplecode/sgx-cov/enclave/Xargo.toml
index 56b4df0..abc6f28 100644
--- a/samplecode/sgx-cov/enclave/Xargo.toml
+++ b/samplecode/sgx-cov/enclave/Xargo.toml
@@ -33,10 +33,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/sgxcounter/Makefile b/samplecode/sgxcounter/Makefile
deleted file mode 100644
index 2264f4b..0000000
--- a/samplecode/sgxcounter/Makefile
+++ /dev/null
@@ -1,163 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-######## SGX SDK Settings ########
-
-SGX_SDK ?= /opt/intel/sgxsdk
-SGX_MODE ?= HW
-SGX_ARCH ?= x64
-
-ifeq ($(shell getconf LONG_BIT), 32)
- SGX_ARCH := x86
-else ifeq ($(findstring -m32, $(CXXFLAGS)), -m32)
- SGX_ARCH := x86
-endif
-
-ifeq ($(SGX_ARCH), x86)
- SGX_COMMON_CFLAGS := -m32
- SGX_LIBRARY_PATH := $(SGX_SDK)/lib
- SGX_ENCLAVE_SIGNER := $(SGX_SDK)/bin/x86/sgx_sign
- SGX_EDGER8R := $(SGX_SDK)/bin/x86/sgx_edger8r
-else
- SGX_COMMON_CFLAGS := -m64
- SGX_LIBRARY_PATH := $(SGX_SDK)/lib64
- SGX_ENCLAVE_SIGNER := $(SGX_SDK)/bin/x64/sgx_sign
- SGX_EDGER8R := $(SGX_SDK)/bin/x64/sgx_edger8r
-endif
-
-ifeq ($(SGX_DEBUG), 1)
-ifeq ($(SGX_PRERELEASE), 1)
-$(error Cannot set SGX_DEBUG and SGX_PRERELEASE at the same time!!)
-endif
-endif
-
-
-ifeq ($(SGX_DEBUG), 1)
- SGX_COMMON_CFLAGS += -O0 -g
-else
- SGX_COMMON_CFLAGS += -O2
-endif
-
-######## CUSTOM Settings ########
-
-CUSTOM_LIBRARY_PATH := ./lib
-CUSTOM_BIN_PATH := ./bin
-CUSTOM_EDL_PATH := ../../edl
-CUSTOM_COMMON_PATH := ../../common
-
-######## EDL Settings ########
-
-Enclave_EDL_Files := enclave/Enclave_t.c enclave/Enclave_t.h app/Enclave_u.c app/Enclave_u.h
-
-######## APP Settings ########
-
-App_Rust_Flags := --release
-App_Include_Paths := -I ./app -I./include -I$(SGX_SDK)/include -I$(CUSTOM_EDL_PATH)
-App_C_Flags := $(SGX_COMMON_CFLAGS) -fPIC -Wno-attributes $(App_Include_Paths)
-
-App_Rust_Path := ./app/target/release
-App_Enclave_u_Object :=app/libEnclave_u.a
-App_Name := bin/app
-
-######## Enclave Settings ########
-
-ifneq ($(SGX_MODE), HW)
- Trts_Library_Name := sgx_trts_sim
- Service_Library_Name := sgx_tservice_sim
-else
- Trts_Library_Name := sgx_trts
- Service_Library_Name := sgx_tservice
-endif
-Crypto_Library_Name := sgx_tcrypto
-KeyExchange_Library_Name := sgx_tkey_exchange
-ProtectedFs_Library_Name := sgx_tprotected_fs
-
-RustEnclave_C_Files := $(wildcard ./enclave/*.c)
-RustEnclave_C_Objects := $(RustEnclave_C_Files:.c=.o)
-RustEnclave_Include_Paths := -I$(CUSTOM_COMMON_PATH)/inc -I$(CUSTOM_EDL_PATH) -I$(SGX_SDK)/include -I$(SGX_SDK)/include/tlibc -I$(SGX_SDK)/include/stlport -I$(SGX_SDK)/include/epid -I ./enclave -I./include
-
-RustEnclave_Link_Libs := -L$(CUSTOM_LIBRARY_PATH) -lcompiler-rt-patch -lenclave
-RustEnclave_Compile_Flags := $(SGX_COMMON_CFLAGS) -nostdinc -fvisibility=hidden -fpie -fstack-protector $(RustEnclave_Include_Paths)
-RustEnclave_Link_Flags := $(SGX_COMMON_CFLAGS) -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles -L$(SGX_LIBRARY_PATH) \
- -Wl,--whole-archive -l$(Trts_Library_Name) -Wl,--no-whole-archive \
- -Wl,--start-group -lsgx_tstdc -lsgx_tcxx -l$(Service_Library_Name) -lsgx_uae_service -l$(Crypto_Library_Name) $(RustEnclave_Link_Libs) -Wl,--end-group \
- -Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \
- -Wl,-pie,-eenclave_entry -Wl,--export-dynamic \
- -Wl,--gc-sections \
- -Wl,--defsym,__ImageBase=0 \
- -Wl,--version-script=enclave/Enclave.lds
-#-Wl,--gc-sections \
-
-RustEnclave_Name := enclave/enclave.so
-Signed_RustEnclave_Name := bin/enclave.signed.so
-
-.PHONY: all
-all: $(App_Name) $(Signed_RustEnclave_Name)
-
-######## EDL Objects ########
-
-$(Enclave_EDL_Files): $(SGX_EDGER8R) enclave/Enclave.edl
- $(SGX_EDGER8R) --trusted enclave/Enclave.edl --search-path $(SGX_SDK)/include --search-path ../../edl --trusted-dir enclave
- $(SGX_EDGER8R) --untrusted enclave/Enclave.edl --search-path $(SGX_SDK)/include --search-path ../../edl --untrusted-dir app
- @echo "GEN => $(Enclave_EDL_Files)"
-
-######## App Objects ########
-
-app/Enclave_u.o: $(Enclave_EDL_Files)
- @$(CC) $(App_C_Flags) -c app/Enclave_u.c -o $@
- @echo "CC <= $<"
-
-$(App_Enclave_u_Object): app/Enclave_u.o
- $(AR) rcsD $@ $^
- cp $(App_Enclave_u_Object) ./lib
-
-$(App_Name): $(App_Enclave_u_Object)
- @cd app && SGX_SDK=$(SGX_SDK) cargo build $(App_Rust_Flags)
- @echo "Cargo => $@"
- mkdir -p bin
- cp $(App_Rust_Path)/app ./bin
-
-######## Enclave Objects ########
-
-enclave/Enclave_t.o: $(Enclave_EDL_Files)
- @$(CC) $(RustEnclave_Compile_Flags) -c enclave/Enclave_t.c -o $@
- @echo "CC <= $<"
-
-$(RustEnclave_Name): enclave compiler-rt enclave/Enclave_t.o
- cp ../../compiler-rt/libcompiler-rt-patch.a ./lib
- @$(CXX) enclave/Enclave_t.o -o $@ $(RustEnclave_Link_Flags)
- @echo "LINK => $@"
-
-$(Signed_RustEnclave_Name): $(RustEnclave_Name)
- mkdir -p bin
- @$(SGX_ENCLAVE_SIGNER) sign -key enclave/Enclave_private.pem -enclave $(RustEnclave_Name) -out $@ -config enclave/Enclave.config.xml
- @echo "SIGN => $@"
-
-.PHONY: enclave
-enclave:
- $(MAKE) -C ./enclave/
-
-.PHONY: compiler-rt
-compiler-rt:
- $(MAKE) -C ../../compiler-rt/ 2> /dev/null
-
-.PHONY: clean
-clean:
- @rm -f $(App_Name) $(RustEnclave_Name) $(Signed_RustEnclave_Name) enclave/*_t.* app/*_u.* lib/*.a
- @cd enclave && cargo clean && rm -f Cargo.lock
- @cd app && cargo clean && rm -f Cargo.lock
-
diff --git a/samplecode/sgxcounter/Readme.md b/samplecode/sgxcounter/Readme.md
deleted file mode 100644
index 338a063..0000000
--- a/samplecode/sgxcounter/Readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Trusted Counter is deprecated
-
-According to the following discussion, PSE is officially unsupported since 2.7. Discussions are:
-
-(1) [Intel SGX SDK Github issue 373](https://github.com/intel/linux-sgx/issues/373#issuecomment-546231049)
-(2) [Intel SGX forum thread 820329](https://software.intel.com/en-us/forums/intel-software-guard-extensions-intel-sgx/topic/820329)
diff --git a/samplecode/sgxcounter/app/Cargo.toml b/samplecode/sgxcounter/app/Cargo.toml
deleted file mode 100644
index eff1586..0000000
--- a/samplecode/sgxcounter/app/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "app"
-version = "1.0.0"
-authors = ["The Teaclave Authors"]
-build = "build.rs"
-
-[dependencies]
-sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-sgx_urts = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-
-[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
-sgx_types = { path = "../../../sgx_types" }
-sgx_urts = { path = "../../../sgx_urts" }
diff --git a/samplecode/sgxcounter/app/build.rs b/samplecode/sgxcounter/app/build.rs
deleted file mode 100644
index 9dc70eb..0000000
--- a/samplecode/sgxcounter/app/build.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License..
-
-use std::env;
-
-fn main () {
- let sdk_dir = env::var("SGX_SDK")
- .unwrap_or_else(|_| "/opt/intel/sgxsdk".to_string());
- let is_sim = env::var("SGX_MODE")
- .unwrap_or_else(|_| "HW".to_string());
-
- println!("cargo:rustc-link-search=native=../lib");
- println!("cargo:rustc-link-lib=static=Enclave_u");
-
- println!("cargo:rustc-link-search=native={}/lib64", sdk_dir);
- match is_sim.as_ref() {
- "SW" => {
- println!("cargo:rustc-link-lib=dylib=sgx_urts_sim");
- println!("cargo:rustc-link-lib=dylib=sgx_uae_service_sim");
- },
- _ => { // HW by default
- println!("cargo:rustc-link-lib=dylib=sgx_urts");
- println!("cargo:rustc-link-lib=dylib=sgx_uae_service");
- },
- }
-}
diff --git a/samplecode/sgxcounter/app/src/main.rs b/samplecode/sgxcounter/app/src/main.rs
deleted file mode 100644
index 4e19686..0000000
--- a/samplecode/sgxcounter/app/src/main.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License..
-
-extern crate sgx_types;
-extern crate sgx_urts;
-use sgx_types::*;
-use sgx_urts::SgxEnclave;
-
-static ENCLAVE_FILE: &'static str = "enclave.signed.so";
-
-extern {
- fn sgx_counter_sample(eid: sgx_enclave_id_t, retval: *mut sgx_status_t) -> sgx_status_t;
-}
-
-fn init_enclave() -> SgxResult<SgxEnclave> {
- let mut launch_token: sgx_launch_token_t = [0; 1024];
- let mut launch_token_updated: i32 = 0;
- // call sgx_create_enclave to initialize an enclave instance
- // Debug Support: set 2nd parameter to 1
- let debug = 1;
- let mut misc_attr = sgx_misc_attribute_t {secs_attr: sgx_attributes_t { flags:0, xfrm:0}, misc_select:0};
- SgxEnclave::create(ENCLAVE_FILE,
- debug,
- &mut launch_token,
- &mut launch_token_updated,
- &mut misc_attr)
-}
-
-fn main() {
-
- let enclave = match init_enclave() {
- Ok(r) => {
- println!("[+] Init Enclave Successful {}!", r.geteid());
- r
- },
- Err(x) => {
- println!("[-] Init Enclave Failed {}!", x.as_str());
- return;
- },
- };
-
- let mut retval = sgx_status_t::SGX_SUCCESS;
-
- let result = unsafe {
- sgx_counter_sample(enclave.geteid(),
- &mut retval)
- };
-
- match result {
- sgx_status_t::SGX_SUCCESS => {},
- _ => {
- println!("[-] ECALL Enclave Failed {}!", result.as_str());
- return;
- }
- }
-
- match retval {
- sgx_status_t::SGX_SUCCESS => {},
- _ => {
- println!("[-] ECALL Enclave returned error {}!", retval.as_str());
- return;
- }
- }
-
- println!("[+] sgx_counter_sample success...");
-
- enclave.destroy();
-}
diff --git a/samplecode/sgxcounter/bin/readme.txt b/samplecode/sgxcounter/bin/readme.txt
deleted file mode 100644
index c5e82d7..0000000
--- a/samplecode/sgxcounter/bin/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/samplecode/sgxcounter/enclave/Cargo.toml b/samplecode/sgxcounter/enclave/Cargo.toml
deleted file mode 100644
index cc0c3b7..0000000
--- a/samplecode/sgxcounter/enclave/Cargo.toml
+++ /dev/null
@@ -1,46 +0,0 @@
-[package]
-name = "Sgxcounterenclave"
-version = "1.0.0"
-authors = ["The Teaclave Authors"]
-
-[lib]
-name = "sgxcounterenclave"
-crate-type = ["staticlib"]
-
-[features]
-default = []
-
-[dependencies]
-itertools = { version = "*", default-features = false }
-
-[target.'cfg(not(target_env = "sgx"))'.dependencies]
-sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-sgx_tservice = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-
-[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
-sgx_alloc = { path = "../../../sgx_alloc" }
-sgx_build_helper = { path = "../../../sgx_build_helper" }
-sgx_cov = { path = "../../../sgx_cov" }
-sgx_crypto_helper = { path = "../../../sgx_crypto_helper" }
-sgx_libc = { path = "../../../sgx_libc" }
-sgx_rand = { path = "../../../sgx_rand" }
-sgx_rand_derive = { path = "../../../sgx_rand_derive" }
-sgx_serialize = { path = "../../../sgx_serialize" }
-sgx_serialize_derive = { path = "../../../sgx_serialize_derive" }
-sgx_serialize_derive_internals = { path = "../../../sgx_serialize_derive_internals" }
-sgx_tcrypto = { path = "../../../sgx_tcrypto" }
-sgx_tcrypto_helper = { path = "../../../sgx_tcrypto_helper" }
-sgx_tdh = { path = "../../../sgx_tdh" }
-sgx_tkey_exchange = { path = "../../../sgx_tkey_exchange" }
-sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
-sgx_trts = { path = "../../../sgx_trts" }
-sgx_tse = { path = "../../../sgx_tse" }
-sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
-sgx_tstd = { path = "../../../sgx_tstd" }
-sgx_tunittest = { path = "../../../sgx_tunittest" }
-sgx_types = { path = "../../../sgx_types" }
-sgx_ucrypto = { path = "../../../sgx_ucrypto" }
-sgx_unwind = { path = "../../../sgx_unwind" }
-sgx_urts = { path = "../../../sgx_urts" }
diff --git a/samplecode/sgxcounter/enclave/Enclave.config.xml b/samplecode/sgxcounter/enclave/Enclave.config.xml
deleted file mode 100644
index ee4c3f7..0000000
--- a/samplecode/sgxcounter/enclave/Enclave.config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- Please refer to User's Guide for the explanation of each field -->
-<EnclaveConfiguration>
- <ProdID>0</ProdID>
- <ISVSVN>0</ISVSVN>
- <StackMaxSize>0x40000</StackMaxSize>
- <HeapMaxSize>0x100000</HeapMaxSize>
- <TCSNum>1</TCSNum>
- <TCSPolicy>1</TCSPolicy>
- <DisableDebug>0</DisableDebug>
- <MiscSelect>0</MiscSelect>
- <MiscMask>0xFFFFFFFF</MiscMask>
-</EnclaveConfiguration>
diff --git a/samplecode/sgxcounter/enclave/Enclave.edl b/samplecode/sgxcounter/enclave/Enclave.edl
deleted file mode 100644
index 18ff069..0000000
--- a/samplecode/sgxcounter/enclave/Enclave.edl
+++ /dev/null
@@ -1,29 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-enclave {
- from "sgx_tstd.edl" import *;
- from "sgx_stdio.edl" import *;
- from "sgx_backtrace.edl" import *;
- from "sgx_tae_service.edl" import *;
- //from "sgx_tstdc.edl" import *;
- trusted {
- /* define ECALLs here. */
-
- public sgx_status_t sgx_counter_sample();
- };
-};
diff --git a/samplecode/sgxcounter/enclave/Enclave.lds b/samplecode/sgxcounter/enclave/Enclave.lds
deleted file mode 100644
index e3d9d0e..0000000
--- a/samplecode/sgxcounter/enclave/Enclave.lds
+++ /dev/null
@@ -1,9 +0,0 @@
-enclave.so
-{
- global:
- g_global_data_sim;
- g_global_data;
- enclave_entry;
- local:
- *;
-};
diff --git a/samplecode/sgxcounter/enclave/Enclave_private.pem b/samplecode/sgxcounter/enclave/Enclave_private.pem
deleted file mode 100644
index 529d07b..0000000
--- a/samplecode/sgxcounter/enclave/Enclave_private.pem
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/samplecode/sgxcounter/enclave/Makefile b/samplecode/sgxcounter/enclave/Makefile
deleted file mode 100644
index 60bb297..0000000
--- a/samplecode/sgxcounter/enclave/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-Rust_Enclave_Name := libenclave.a
-Rust_Enclave_Files := $(wildcard src/*.rs)
-Rust_Target_Path := $(CURDIR)/../../../xargo
-
-.PHONY: all
-
-all: $(Rust_Enclave_Name)
-
-$(Rust_Enclave_Name): $(Rust_Enclave_Files)
-ifeq ($(XARGO_SGX), 1)
- RUST_TARGET_PATH=$(Rust_Target_Path) xargo build --target x86_64-unknown-linux-sgx --release
- cp ./target/x86_64-unknown-linux-sgx/release/libsgxcounterenclave.a ../lib/libenclave.a
-else
- cargo build --release
- cp ./target/release/libsgxcounterenclave.a ../lib/libenclave.a
-endif
diff --git a/samplecode/sgxcounter/enclave/Xargo.toml b/samplecode/sgxcounter/enclave/Xargo.toml
deleted file mode 100644
index b157608..0000000
--- a/samplecode/sgxcounter/enclave/Xargo.toml
+++ /dev/null
@@ -1,94 +0,0 @@
-[dependencies]
-alloc = {}
-
-[dependencies.sgx_types]
-path = "../../../sgx_types"
-stage = 1
-
-[dependencies.sgx_alloc]
-path = "../../../sgx_alloc"
-stage = 1
-
-[dependencies.sgx_unwind]
-path = "../../../sgx_unwind"
-stage = 1
-
-[dependencies.sgx_demangle]
-path = "../../../sgx_demangle"
-stage = 1
-
-[dependencies.panic_abort]
-path = "../../../sgx_panic_abort"
-stage = 1
-
-[dependencies.sgx_libc]
-path = "../../../sgx_libc"
-stage = 2
-
-[dependencies.sgx_tkey_exchange]
-path = "../../../sgx_tkey_exchange"
-stage = 2
-
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
-[dependencies.sgx_tse]
-path = "../../../sgx_tse"
-stage = 2
-
-[dependencies.sgx_tcrypto]
-path = "../../../sgx_tcrypto"
-stage = 2
-
-[dependencies.sgx_trts]
-path = "../../../sgx_trts"
-stage = 3
-
-[dependencies.sgx_backtrace_sys]
-path = "../../../sgx_backtrace_sys"
-stage = 3
-
-[dependencies.panic_unwind]
-path = "../../../sgx_panic_unwind"
-stage = 3
-
-[dependencies.sgx_tdh]
-path = "../../../sgx_tdh"
-stage = 4
-
-[dependencies.sgx_tseal]
-path = "../../../sgx_tseal"
-stage = 4
-
-[dependencies.sgx_tprotected_fs]
-path = "../../../sgx_tprotected_fs"
-stage = 4
-
-[dependencies.std]
-path = "../../../xargo/sgx_tstd"
-stage = 5
-
-[dependencies.sgx_no_tstd]
-path = "../../../sgx_no_tstd"
-stage = 5
-
-[dependencies.sgx_rand]
-path = "../../../sgx_rand"
-stage = 6
-
-[dependencies.sgx_serialize]
-path = "../../../sgx_serialize"
-stage = 6
-
-[dependencies.sgx_tunittest]
-path = "../../../sgx_tunittest"
-stage = 6
-
-[dependencies.sgx_backtrace]
-path = "../../../sgx_backtrace"
-stage = 7
-
-[dependencies.sgx_cov]
-path = "../../../sgx_cov"
-stage = 7
\ No newline at end of file
diff --git a/samplecode/sgxcounter/enclave/src/lib.rs b/samplecode/sgxcounter/enclave/src/lib.rs
deleted file mode 100644
index 1dd0580..0000000
--- a/samplecode/sgxcounter/enclave/src/lib.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License..
-
-#![crate_name = "sgxcounterenclave"]
-#![crate_type = "staticlib"]
-
-#![cfg_attr(not(target_env = "sgx"), no_std)]
-#![cfg_attr(target_env = "sgx", feature(rustc_private))]
-
-extern crate sgx_types;
-#[cfg(not(target_env = "sgx"))]
-#[macro_use]
-extern crate sgx_tstd as std;
-extern crate sgx_tservice;
-extern crate itertools;
-
-use sgx_types::*;
-use sgx_tservice::*;
-
-use itertools::Itertools;
-
-#[no_mangle]
-pub extern "C" fn sgx_counter_sample() -> sgx_status_t {
-
- match rsgx_create_pse_session() {
- Ok(_) => println!("Create PSE session done"),
- _ => {
- println!("Cannot create PSE session");
- return sgx_status_t::SGX_ERROR_UNEXPECTED;
- }
- }
- let mut init_val: u32 = 100;
- let tcounter = sgxcounter::SgxMonotonicCounter::new(&mut init_val).unwrap();
-
- for _ in 0..10 {
- tcounter.increment().unwrap();
- println!("value after increment = {}", tcounter.read().unwrap());
- }
-
- let uuid = tcounter.get_uuid().unwrap();
-
- println!("acquired uuid = {:02X}", uuid.counter_id.iter().format(""));
- println!("acquired nonce = {:02X}", uuid.nonce.iter().format(""));
-
- match rsgx_close_pse_session() {
- Ok(_) => println!("close PSE session done"),
- _ => {
- println!("Cannot close PSE session");
- return sgx_status_t::SGX_ERROR_UNEXPECTED;
- }
- }
-
- // Emulate the 2nd session
- match rsgx_create_pse_session() {
- Ok(_) => println!("Create PSE session done"),
- _ => {
- println!("Cannot create PSE session");
- return sgx_status_t::SGX_ERROR_UNEXPECTED;
- }
- }
-
- let recovered_counter = sgxcounter::SgxMonotonicCounter::from_uuid(uuid);
- println!("recovered uuid value = {}", recovered_counter.read().unwrap());
-
- match rsgx_close_pse_session() {
- Ok(_) => println!("close PSE session done"),
- _ => {
- println!("Cannot close PSE session");
- return sgx_status_t::SGX_ERROR_UNEXPECTED;
- }
- }
-
- sgx_status_t::SGX_SUCCESS
-}
diff --git a/samplecode/sgxcounter/enclave/x86_64-unknown-linux-sgx.json b/samplecode/sgxcounter/enclave/x86_64-unknown-linux-sgx.json
deleted file mode 100644
index 10d37a7..0000000
--- a/samplecode/sgxcounter/enclave/x86_64-unknown-linux-sgx.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "arch": "x86_64",
- "cpu": "x86-64",
- "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
- "dynamic-linking": true,
- "env": "sgx",
- "exe-allocation-crate": "alloc_system",
- "executables": true,
- "has-elf-tls": true,
- "has-rpath": true,
- "linker-flavor": "gcc",
- "linker-is-gnu": true,
- "llvm-target": "x86_64-unknown-linux-gnu",
- "max-atomic-width": 64,
- "os": "linux",
- "position-independent-executables": true,
- "pre-link-args": {
- "gcc": [
- "-Wl,--as-needed",
- "-Wl,-z,noexecstack",
- "-m64"
- ]
- },
- "relro-level": "full",
- "stack-probes": true,
- "target-c-int-width": "32",
- "target-endian": "little",
- "target-family": "unix",
- "target-pointer-width": "64",
- "vendor": "mesalock"
-}
diff --git a/samplecode/sgxcounter/lib/readme.txt b/samplecode/sgxcounter/lib/readme.txt
deleted file mode 100644
index 7951405..0000000
--- a/samplecode/sgxcounter/lib/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-lib
\ No newline at end of file
diff --git a/samplecode/sgxtime/Makefile b/samplecode/sgxtime/Makefile
deleted file mode 100644
index 2264f4b..0000000
--- a/samplecode/sgxtime/Makefile
+++ /dev/null
@@ -1,163 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-######## SGX SDK Settings ########
-
-SGX_SDK ?= /opt/intel/sgxsdk
-SGX_MODE ?= HW
-SGX_ARCH ?= x64
-
-ifeq ($(shell getconf LONG_BIT), 32)
- SGX_ARCH := x86
-else ifeq ($(findstring -m32, $(CXXFLAGS)), -m32)
- SGX_ARCH := x86
-endif
-
-ifeq ($(SGX_ARCH), x86)
- SGX_COMMON_CFLAGS := -m32
- SGX_LIBRARY_PATH := $(SGX_SDK)/lib
- SGX_ENCLAVE_SIGNER := $(SGX_SDK)/bin/x86/sgx_sign
- SGX_EDGER8R := $(SGX_SDK)/bin/x86/sgx_edger8r
-else
- SGX_COMMON_CFLAGS := -m64
- SGX_LIBRARY_PATH := $(SGX_SDK)/lib64
- SGX_ENCLAVE_SIGNER := $(SGX_SDK)/bin/x64/sgx_sign
- SGX_EDGER8R := $(SGX_SDK)/bin/x64/sgx_edger8r
-endif
-
-ifeq ($(SGX_DEBUG), 1)
-ifeq ($(SGX_PRERELEASE), 1)
-$(error Cannot set SGX_DEBUG and SGX_PRERELEASE at the same time!!)
-endif
-endif
-
-
-ifeq ($(SGX_DEBUG), 1)
- SGX_COMMON_CFLAGS += -O0 -g
-else
- SGX_COMMON_CFLAGS += -O2
-endif
-
-######## CUSTOM Settings ########
-
-CUSTOM_LIBRARY_PATH := ./lib
-CUSTOM_BIN_PATH := ./bin
-CUSTOM_EDL_PATH := ../../edl
-CUSTOM_COMMON_PATH := ../../common
-
-######## EDL Settings ########
-
-Enclave_EDL_Files := enclave/Enclave_t.c enclave/Enclave_t.h app/Enclave_u.c app/Enclave_u.h
-
-######## APP Settings ########
-
-App_Rust_Flags := --release
-App_Include_Paths := -I ./app -I./include -I$(SGX_SDK)/include -I$(CUSTOM_EDL_PATH)
-App_C_Flags := $(SGX_COMMON_CFLAGS) -fPIC -Wno-attributes $(App_Include_Paths)
-
-App_Rust_Path := ./app/target/release
-App_Enclave_u_Object :=app/libEnclave_u.a
-App_Name := bin/app
-
-######## Enclave Settings ########
-
-ifneq ($(SGX_MODE), HW)
- Trts_Library_Name := sgx_trts_sim
- Service_Library_Name := sgx_tservice_sim
-else
- Trts_Library_Name := sgx_trts
- Service_Library_Name := sgx_tservice
-endif
-Crypto_Library_Name := sgx_tcrypto
-KeyExchange_Library_Name := sgx_tkey_exchange
-ProtectedFs_Library_Name := sgx_tprotected_fs
-
-RustEnclave_C_Files := $(wildcard ./enclave/*.c)
-RustEnclave_C_Objects := $(RustEnclave_C_Files:.c=.o)
-RustEnclave_Include_Paths := -I$(CUSTOM_COMMON_PATH)/inc -I$(CUSTOM_EDL_PATH) -I$(SGX_SDK)/include -I$(SGX_SDK)/include/tlibc -I$(SGX_SDK)/include/stlport -I$(SGX_SDK)/include/epid -I ./enclave -I./include
-
-RustEnclave_Link_Libs := -L$(CUSTOM_LIBRARY_PATH) -lcompiler-rt-patch -lenclave
-RustEnclave_Compile_Flags := $(SGX_COMMON_CFLAGS) -nostdinc -fvisibility=hidden -fpie -fstack-protector $(RustEnclave_Include_Paths)
-RustEnclave_Link_Flags := $(SGX_COMMON_CFLAGS) -Wl,--no-undefined -nostdlib -nodefaultlibs -nostartfiles -L$(SGX_LIBRARY_PATH) \
- -Wl,--whole-archive -l$(Trts_Library_Name) -Wl,--no-whole-archive \
- -Wl,--start-group -lsgx_tstdc -lsgx_tcxx -l$(Service_Library_Name) -lsgx_uae_service -l$(Crypto_Library_Name) $(RustEnclave_Link_Libs) -Wl,--end-group \
- -Wl,-Bstatic -Wl,-Bsymbolic -Wl,--no-undefined \
- -Wl,-pie,-eenclave_entry -Wl,--export-dynamic \
- -Wl,--gc-sections \
- -Wl,--defsym,__ImageBase=0 \
- -Wl,--version-script=enclave/Enclave.lds
-#-Wl,--gc-sections \
-
-RustEnclave_Name := enclave/enclave.so
-Signed_RustEnclave_Name := bin/enclave.signed.so
-
-.PHONY: all
-all: $(App_Name) $(Signed_RustEnclave_Name)
-
-######## EDL Objects ########
-
-$(Enclave_EDL_Files): $(SGX_EDGER8R) enclave/Enclave.edl
- $(SGX_EDGER8R) --trusted enclave/Enclave.edl --search-path $(SGX_SDK)/include --search-path ../../edl --trusted-dir enclave
- $(SGX_EDGER8R) --untrusted enclave/Enclave.edl --search-path $(SGX_SDK)/include --search-path ../../edl --untrusted-dir app
- @echo "GEN => $(Enclave_EDL_Files)"
-
-######## App Objects ########
-
-app/Enclave_u.o: $(Enclave_EDL_Files)
- @$(CC) $(App_C_Flags) -c app/Enclave_u.c -o $@
- @echo "CC <= $<"
-
-$(App_Enclave_u_Object): app/Enclave_u.o
- $(AR) rcsD $@ $^
- cp $(App_Enclave_u_Object) ./lib
-
-$(App_Name): $(App_Enclave_u_Object)
- @cd app && SGX_SDK=$(SGX_SDK) cargo build $(App_Rust_Flags)
- @echo "Cargo => $@"
- mkdir -p bin
- cp $(App_Rust_Path)/app ./bin
-
-######## Enclave Objects ########
-
-enclave/Enclave_t.o: $(Enclave_EDL_Files)
- @$(CC) $(RustEnclave_Compile_Flags) -c enclave/Enclave_t.c -o $@
- @echo "CC <= $<"
-
-$(RustEnclave_Name): enclave compiler-rt enclave/Enclave_t.o
- cp ../../compiler-rt/libcompiler-rt-patch.a ./lib
- @$(CXX) enclave/Enclave_t.o -o $@ $(RustEnclave_Link_Flags)
- @echo "LINK => $@"
-
-$(Signed_RustEnclave_Name): $(RustEnclave_Name)
- mkdir -p bin
- @$(SGX_ENCLAVE_SIGNER) sign -key enclave/Enclave_private.pem -enclave $(RustEnclave_Name) -out $@ -config enclave/Enclave.config.xml
- @echo "SIGN => $@"
-
-.PHONY: enclave
-enclave:
- $(MAKE) -C ./enclave/
-
-.PHONY: compiler-rt
-compiler-rt:
- $(MAKE) -C ../../compiler-rt/ 2> /dev/null
-
-.PHONY: clean
-clean:
- @rm -f $(App_Name) $(RustEnclave_Name) $(Signed_RustEnclave_Name) enclave/*_t.* app/*_u.* lib/*.a
- @cd enclave && cargo clean && rm -f Cargo.lock
- @cd app && cargo clean && rm -f Cargo.lock
-
diff --git a/samplecode/sgxtime/Readme.md b/samplecode/sgxtime/Readme.md
deleted file mode 100644
index fe2d62a..0000000
--- a/samplecode/sgxtime/Readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Trusted Timer is deprecated
-
-According to the following discussion, PSE is officially unsupported since 2.7. Discussions are:
-
-(1) [Intel SGX SDK Github issue 373](https://github.com/intel/linux-sgx/issues/373#issuecomment-546231049)
-(2) [Intel SGX forum thread 820329](https://software.intel.com/en-us/forums/intel-software-guard-extensions-intel-sgx/topic/820329)
diff --git a/samplecode/sgxtime/app/Cargo.toml b/samplecode/sgxtime/app/Cargo.toml
deleted file mode 100644
index a7dc08f..0000000
--- a/samplecode/sgxtime/app/Cargo.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[package]
-name = "app"
-version = "1.0.0"
-authors = ["The Teaclave Authors"]
-build = "build.rs"
-
-[dependencies]
-sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-sgx_urts = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-
-[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
-sgx_types = { path = "../../../sgx_types" }
-sgx_urts = { path = "../../../sgx_urts" }
-
diff --git a/samplecode/sgxtime/app/build.rs b/samplecode/sgxtime/app/build.rs
deleted file mode 100644
index 9dc70eb..0000000
--- a/samplecode/sgxtime/app/build.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License..
-
-use std::env;
-
-fn main () {
- let sdk_dir = env::var("SGX_SDK")
- .unwrap_or_else(|_| "/opt/intel/sgxsdk".to_string());
- let is_sim = env::var("SGX_MODE")
- .unwrap_or_else(|_| "HW".to_string());
-
- println!("cargo:rustc-link-search=native=../lib");
- println!("cargo:rustc-link-lib=static=Enclave_u");
-
- println!("cargo:rustc-link-search=native={}/lib64", sdk_dir);
- match is_sim.as_ref() {
- "SW" => {
- println!("cargo:rustc-link-lib=dylib=sgx_urts_sim");
- println!("cargo:rustc-link-lib=dylib=sgx_uae_service_sim");
- },
- _ => { // HW by default
- println!("cargo:rustc-link-lib=dylib=sgx_urts");
- println!("cargo:rustc-link-lib=dylib=sgx_uae_service");
- },
- }
-}
diff --git a/samplecode/sgxtime/app/src/main.rs b/samplecode/sgxtime/app/src/main.rs
deleted file mode 100644
index 96458e4..0000000
--- a/samplecode/sgxtime/app/src/main.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License..
-
-extern crate sgx_types;
-extern crate sgx_urts;
-use sgx_types::*;
-use sgx_urts::SgxEnclave;
-
-static ENCLAVE_FILE: &'static str = "enclave.signed.so";
-
-extern {
- fn sgx_time_sample(eid: sgx_enclave_id_t, retval: *mut sgx_status_t) -> sgx_status_t;
-}
-
-fn init_enclave() -> SgxResult<SgxEnclave> {
- let mut launch_token: sgx_launch_token_t = [0; 1024];
- let mut launch_token_updated: i32 = 0;
- // call sgx_create_enclave to initialize an enclave instance
- // Debug Support: set 2nd parameter to 1
- let debug = 1;
- let mut misc_attr = sgx_misc_attribute_t {secs_attr: sgx_attributes_t { flags:0, xfrm:0}, misc_select:0};
- SgxEnclave::create(ENCLAVE_FILE,
- debug,
- &mut launch_token,
- &mut launch_token_updated,
- &mut misc_attr)
-}
-
-fn main() {
-
- let enclave = match init_enclave() {
- Ok(r) => {
- println!("[+] Init Enclave Successful {}!", r.geteid());
- r
- },
- Err(x) => {
- println!("[-] Init Enclave Failed {}!", x.as_str());
- return;
- },
- };
-
- let mut retval = sgx_status_t::SGX_SUCCESS;
-
- let result = unsafe {
- sgx_time_sample(enclave.geteid(),
- &mut retval)
- };
-
- match result {
- sgx_status_t::SGX_SUCCESS => {},
- _ => {
- println!("[-] ECALL Enclave Failed {}!", result.as_str());
- return;
- }
- }
-
- match retval {
- sgx_status_t::SGX_SUCCESS => {},
- _ => {
- println!("[-] ECALL Enclave returned error {}!", retval.as_str());
- return;
- }
- }
-
- println!("[+] sgx_time_sample success...");
-
- enclave.destroy();
-}
diff --git a/samplecode/sgxtime/bin/readme.txt b/samplecode/sgxtime/bin/readme.txt
deleted file mode 100644
index c5e82d7..0000000
--- a/samplecode/sgxtime/bin/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/samplecode/sgxtime/enclave/Cargo.toml b/samplecode/sgxtime/enclave/Cargo.toml
deleted file mode 100644
index 391dd63..0000000
--- a/samplecode/sgxtime/enclave/Cargo.toml
+++ /dev/null
@@ -1,46 +0,0 @@
-[package]
-name = "Sgxtimeenclave"
-version = "1.0.0"
-authors = ["The Teaclave Authors"]
-
-[lib]
-name = "sgxtimeenclave"
-crate-type = ["staticlib"]
-
-[features]
-default = []
-
-[target.'cfg(not(target_env = "sgx"))'.dependencies]
-sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-sgx_tservice = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-
-[patch.'https://github.com/apache/teaclave-sgx-sdk.git']
-sgx_alloc = { path = "../../../sgx_alloc" }
-sgx_backtrace = { path = "../../../sgx_backtrace" }
-sgx_backtrace_sys = { path = "../../../sgx_backtrace_sys" }
-sgx_build_helper = { path = "../../../sgx_build_helper" }
-sgx_cov = { path = "../../../sgx_cov" }
-sgx_crypto_helper = { path = "../../../sgx_crypto_helper" }
-sgx_demangle = { path = "../../../sgx_demangle" }
-sgx_libc = { path = "../../../sgx_libc" }
-sgx_rand = { path = "../../../sgx_rand" }
-sgx_rand_derive = { path = "../../../sgx_rand_derive" }
-sgx_serialize = { path = "../../../sgx_serialize" }
-sgx_serialize_derive = { path = "../../../sgx_serialize_derive" }
-sgx_serialize_derive_internals = { path = "../../../sgx_serialize_derive_internals" }
-sgx_tcrypto = { path = "../../../sgx_tcrypto" }
-sgx_tcrypto_helper = { path = "../../../sgx_tcrypto_helper" }
-sgx_tdh = { path = "../../../sgx_tdh" }
-sgx_tkey_exchange = { path = "../../../sgx_tkey_exchange" }
-sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
-sgx_trts = { path = "../../../sgx_trts" }
-sgx_tse = { path = "../../../sgx_tse" }
-sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
-sgx_tstd = { path = "../../../sgx_tstd" }
-sgx_tunittest = { path = "../../../sgx_tunittest" }
-sgx_types = { path = "../../../sgx_types" }
-#sgx_ucrypto = { path = "../../../sgx_ucrypto" }
-sgx_unwind = { path = "../../../sgx_unwind" }
-#sgx_urts = { path = "../../../sgx_urts" }
diff --git a/samplecode/sgxtime/enclave/Enclave.config.xml b/samplecode/sgxtime/enclave/Enclave.config.xml
deleted file mode 100644
index ee4c3f7..0000000
--- a/samplecode/sgxtime/enclave/Enclave.config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- Please refer to User's Guide for the explanation of each field -->
-<EnclaveConfiguration>
- <ProdID>0</ProdID>
- <ISVSVN>0</ISVSVN>
- <StackMaxSize>0x40000</StackMaxSize>
- <HeapMaxSize>0x100000</HeapMaxSize>
- <TCSNum>1</TCSNum>
- <TCSPolicy>1</TCSPolicy>
- <DisableDebug>0</DisableDebug>
- <MiscSelect>0</MiscSelect>
- <MiscMask>0xFFFFFFFF</MiscMask>
-</EnclaveConfiguration>
diff --git a/samplecode/sgxtime/enclave/Enclave.edl b/samplecode/sgxtime/enclave/Enclave.edl
deleted file mode 100644
index 6484508..0000000
--- a/samplecode/sgxtime/enclave/Enclave.edl
+++ /dev/null
@@ -1,29 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-enclave {
- from "sgx_tstd.edl" import *;
- from "sgx_stdio.edl" import *;
- from "sgx_backtrace.edl" import *;
- from "sgx_tae_service.edl" import *;
- //from "sgx_tstdc.edl" import *;
- trusted {
- /* define ECALLs here. */
-
- public sgx_status_t sgx_time_sample();
- };
-};
diff --git a/samplecode/sgxtime/enclave/Enclave.lds b/samplecode/sgxtime/enclave/Enclave.lds
deleted file mode 100644
index e3d9d0e..0000000
--- a/samplecode/sgxtime/enclave/Enclave.lds
+++ /dev/null
@@ -1,9 +0,0 @@
-enclave.so
-{
- global:
- g_global_data_sim;
- g_global_data;
- enclave_entry;
- local:
- *;
-};
diff --git a/samplecode/sgxtime/enclave/Enclave_private.pem b/samplecode/sgxtime/enclave/Enclave_private.pem
deleted file mode 100644
index 529d07b..0000000
--- a/samplecode/sgxtime/enclave/Enclave_private.pem
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/samplecode/sgxtime/enclave/Makefile b/samplecode/sgxtime/enclave/Makefile
deleted file mode 100644
index 53bf3a3..0000000
--- a/samplecode/sgxtime/enclave/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-Rust_Enclave_Name := libenclave.a
-Rust_Enclave_Files := $(wildcard src/*.rs)
-Rust_Target_Path := $(CURDIR)/../../../xargo
-
-.PHONY: all
-
-all: $(Rust_Enclave_Name)
-
-$(Rust_Enclave_Name): $(Rust_Enclave_Files)
-ifeq ($(XARGO_SGX), 1)
- RUST_TARGET_PATH=$(Rust_Target_Path) xargo build --target x86_64-unknown-linux-sgx --release
- cp ./target/x86_64-unknown-linux-sgx/release/libsgxtimeenclave.a ../lib/libenclave.a
-else
- cargo build --release
- cp ./target/release/libsgxtimeenclave.a ../lib/libenclave.a
-endif
diff --git a/samplecode/sgxtime/enclave/Xargo.toml b/samplecode/sgxtime/enclave/Xargo.toml
deleted file mode 100644
index b157608..0000000
--- a/samplecode/sgxtime/enclave/Xargo.toml
+++ /dev/null
@@ -1,94 +0,0 @@
-[dependencies]
-alloc = {}
-
-[dependencies.sgx_types]
-path = "../../../sgx_types"
-stage = 1
-
-[dependencies.sgx_alloc]
-path = "../../../sgx_alloc"
-stage = 1
-
-[dependencies.sgx_unwind]
-path = "../../../sgx_unwind"
-stage = 1
-
-[dependencies.sgx_demangle]
-path = "../../../sgx_demangle"
-stage = 1
-
-[dependencies.panic_abort]
-path = "../../../sgx_panic_abort"
-stage = 1
-
-[dependencies.sgx_libc]
-path = "../../../sgx_libc"
-stage = 2
-
-[dependencies.sgx_tkey_exchange]
-path = "../../../sgx_tkey_exchange"
-stage = 2
-
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
-[dependencies.sgx_tse]
-path = "../../../sgx_tse"
-stage = 2
-
-[dependencies.sgx_tcrypto]
-path = "../../../sgx_tcrypto"
-stage = 2
-
-[dependencies.sgx_trts]
-path = "../../../sgx_trts"
-stage = 3
-
-[dependencies.sgx_backtrace_sys]
-path = "../../../sgx_backtrace_sys"
-stage = 3
-
-[dependencies.panic_unwind]
-path = "../../../sgx_panic_unwind"
-stage = 3
-
-[dependencies.sgx_tdh]
-path = "../../../sgx_tdh"
-stage = 4
-
-[dependencies.sgx_tseal]
-path = "../../../sgx_tseal"
-stage = 4
-
-[dependencies.sgx_tprotected_fs]
-path = "../../../sgx_tprotected_fs"
-stage = 4
-
-[dependencies.std]
-path = "../../../xargo/sgx_tstd"
-stage = 5
-
-[dependencies.sgx_no_tstd]
-path = "../../../sgx_no_tstd"
-stage = 5
-
-[dependencies.sgx_rand]
-path = "../../../sgx_rand"
-stage = 6
-
-[dependencies.sgx_serialize]
-path = "../../../sgx_serialize"
-stage = 6
-
-[dependencies.sgx_tunittest]
-path = "../../../sgx_tunittest"
-stage = 6
-
-[dependencies.sgx_backtrace]
-path = "../../../sgx_backtrace"
-stage = 7
-
-[dependencies.sgx_cov]
-path = "../../../sgx_cov"
-stage = 7
\ No newline at end of file
diff --git a/samplecode/sgxtime/enclave/src/lib.rs b/samplecode/sgxtime/enclave/src/lib.rs
deleted file mode 100644
index 30bcd24..0000000
--- a/samplecode/sgxtime/enclave/src/lib.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License..
-
-#![crate_name = "sgxtimeenclave"]
-#![crate_type = "staticlib"]
-
-#![cfg_attr(not(target_env = "sgx"), no_std)]
-#![cfg_attr(target_env = "sgx", feature(rustc_private))]
-
-extern crate sgx_types;
-#[cfg(not(target_env = "sgx"))]
-#[macro_use]
-extern crate sgx_tstd as std;
-extern crate sgx_tservice;
-
-use sgx_types::*;
-use sgx_tservice::*;
-
-#[no_mangle]
-pub extern "C" fn sgx_time_sample() -> sgx_status_t {
-
- match rsgx_create_pse_session() {
- Ok(_) => println!("Create PSE session done"),
- _ => {
- println!("Cannot create PSE session");
- return sgx_status_t::SGX_ERROR_UNEXPECTED;
- }
- }
- let ttime = sgxtime::SgxTime::now();
- //println!("timestamp: {}", ttime.timestamp);
- match ttime {
- Ok(st) => println!("Ok with {:?}", st),
- Err(x) => {
- println!("Err with {}", x);
- return sgx_status_t::SGX_ERROR_UNEXPECTED;
- }
- }
- match rsgx_close_pse_session() {
- Ok(_) => println!("close PSE session done"),
- _ => {
- println!("Cannot close PSE session");
- return sgx_status_t::SGX_ERROR_UNEXPECTED;
- }
- }
-
- sgx_status_t::SGX_SUCCESS
-}
diff --git a/samplecode/sgxtime/enclave/x86_64-unknown-linux-sgx.json b/samplecode/sgxtime/enclave/x86_64-unknown-linux-sgx.json
deleted file mode 100644
index 10d37a7..0000000
--- a/samplecode/sgxtime/enclave/x86_64-unknown-linux-sgx.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "arch": "x86_64",
- "cpu": "x86-64",
- "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
- "dynamic-linking": true,
- "env": "sgx",
- "exe-allocation-crate": "alloc_system",
- "executables": true,
- "has-elf-tls": true,
- "has-rpath": true,
- "linker-flavor": "gcc",
- "linker-is-gnu": true,
- "llvm-target": "x86_64-unknown-linux-gnu",
- "max-atomic-width": 64,
- "os": "linux",
- "position-independent-executables": true,
- "pre-link-args": {
- "gcc": [
- "-Wl,--as-needed",
- "-Wl,-z,noexecstack",
- "-m64"
- ]
- },
- "relro-level": "full",
- "stack-probes": true,
- "target-c-int-width": "32",
- "target-endian": "little",
- "target-family": "unix",
- "target-pointer-width": "64",
- "vendor": "mesalock"
-}
diff --git a/samplecode/sgxtime/lib/readme.txt b/samplecode/sgxtime/lib/readme.txt
deleted file mode 100644
index 7951405..0000000
--- a/samplecode/sgxtime/lib/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-lib
\ No newline at end of file
diff --git a/samplecode/static-data-distribution/enclave/Cargo.toml b/samplecode/static-data-distribution/enclave/Cargo.toml
index d0e89e9..29285f4 100644
--- a/samplecode/static-data-distribution/enclave/Cargo.toml
+++ b/samplecode/static-data-distribution/enclave/Cargo.toml
@@ -39,7 +39,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/static-data-distribution/enclave/Xargo.toml b/samplecode/static-data-distribution/enclave/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/static-data-distribution/enclave/Xargo.toml
+++ b/samplecode/static-data-distribution/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/switchless/enclave/Cargo.toml b/samplecode/switchless/enclave/Cargo.toml
index 4c1a38b..24bf333 100644
--- a/samplecode/switchless/enclave/Cargo.toml
+++ b/samplecode/switchless/enclave/Cargo.toml
@@ -36,7 +36,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/switchless/enclave/Xargo.toml b/samplecode/switchless/enclave/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/switchless/enclave/Xargo.toml
+++ b/samplecode/switchless/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/tcmalloc/enclave/Cargo.toml b/samplecode/tcmalloc/enclave/Cargo.toml
index d508cd4..f4f3224 100644
--- a/samplecode/tcmalloc/enclave/Cargo.toml
+++ b/samplecode/tcmalloc/enclave/Cargo.toml
@@ -36,7 +36,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/tcmalloc/enclave/Xargo.toml b/samplecode/tcmalloc/enclave/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/tcmalloc/enclave/Xargo.toml
+++ b/samplecode/tcmalloc/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/thread/enclave/Cargo.toml b/samplecode/thread/enclave/Cargo.toml
index 20797ef..4234637 100644
--- a/samplecode/thread/enclave/Cargo.toml
+++ b/samplecode/thread/enclave/Cargo.toml
@@ -35,7 +35,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/thread/enclave/Xargo.toml b/samplecode/thread/enclave/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/thread/enclave/Xargo.toml
+++ b/samplecode/thread/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/tls/tlsclient/enclave/Cargo.toml b/samplecode/tls/tlsclient/enclave/Cargo.toml
index 89890c4..2947296 100644
--- a/samplecode/tls/tlsclient/enclave/Cargo.toml
+++ b/samplecode/tls/tlsclient/enclave/Cargo.toml
@@ -43,7 +43,6 @@ sgx_tprotected_fs = { path = "../../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../../sgx_trts" }
sgx_tse = { path = "../../../../sgx_tse" }
sgx_tseal = { path = "../../../../sgx_tseal" }
-sgx_tservice = { path = "../../../../sgx_tservice" }
sgx_tstd = { path = "../../../../sgx_tstd" }
sgx_tunittest = { path = "../../../../sgx_tunittest" }
sgx_types = { path = "../../../../sgx_types" }
diff --git a/samplecode/tls/tlsclient/enclave/Xargo.toml b/samplecode/tls/tlsclient/enclave/Xargo.toml
index 780a570..30186d7 100644
--- a/samplecode/tls/tlsclient/enclave/Xargo.toml
+++ b/samplecode/tls/tlsclient/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../../sgx_tse"
stage = 2
diff --git a/samplecode/tls/tlsserver/enclave/Cargo.toml b/samplecode/tls/tlsserver/enclave/Cargo.toml
index 4f9926c..5e9debe 100644
--- a/samplecode/tls/tlsserver/enclave/Cargo.toml
+++ b/samplecode/tls/tlsserver/enclave/Cargo.toml
@@ -42,7 +42,6 @@ sgx_tprotected_fs = { path = "../../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../../sgx_trts" }
sgx_tse = { path = "../../../../sgx_tse" }
sgx_tseal = { path = "../../../../sgx_tseal" }
-sgx_tservice = { path = "../../../../sgx_tservice" }
sgx_tstd = { path = "../../../../sgx_tstd" }
sgx_tunittest = { path = "../../../../sgx_tunittest" }
sgx_types = { path = "../../../../sgx_types" }
diff --git a/samplecode/tls/tlsserver/enclave/Xargo.toml b/samplecode/tls/tlsserver/enclave/Xargo.toml
index 780a570..30186d7 100644
--- a/samplecode/tls/tlsserver/enclave/Xargo.toml
+++ b/samplecode/tls/tlsserver/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../../sgx_tse"
stage = 2
diff --git a/samplecode/tr-mpc/tr-mpc-server/enclave/Cargo.toml b/samplecode/tr-mpc/tr-mpc-server/enclave/Cargo.toml
index fa1e571..0c9e9e6 100644
--- a/samplecode/tr-mpc/tr-mpc-server/enclave/Cargo.toml
+++ b/samplecode/tr-mpc/tr-mpc-server/enclave/Cargo.toml
@@ -53,7 +53,6 @@ sgx_tprotected_fs = { path = "../../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../../sgx_trts" }
sgx_tse = { path = "../../../../sgx_tse" }
sgx_tseal = { path = "../../../../sgx_tseal" }
-sgx_tservice = { path = "../../../../sgx_tservice" }
sgx_tstd = { path = "../../../../sgx_tstd" }
sgx_tunittest = { path = "../../../../sgx_tunittest" }
sgx_types = { path = "../../../../sgx_types" }
diff --git a/samplecode/tr-mpc/tr-mpc-server/enclave/Xargo.toml b/samplecode/tr-mpc/tr-mpc-server/enclave/Xargo.toml
index 780a570..30186d7 100644
--- a/samplecode/tr-mpc/tr-mpc-server/enclave/Xargo.toml
+++ b/samplecode/tr-mpc/tr-mpc-server/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../../sgx_tse"
stage = 2
diff --git a/samplecode/ue-ra/ue-ra-server/enclave/Cargo.toml b/samplecode/ue-ra/ue-ra-server/enclave/Cargo.toml
index 9fe58d5..071e8ad 100644
--- a/samplecode/ue-ra/ue-ra-server/enclave/Cargo.toml
+++ b/samplecode/ue-ra/ue-ra-server/enclave/Cargo.toml
@@ -52,7 +52,6 @@ sgx_tprotected_fs = { path = "../../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../../sgx_trts" }
sgx_tse = { path = "../../../../sgx_tse" }
sgx_tseal = { path = "../../../../sgx_tseal" }
-sgx_tservice = { path = "../../../../sgx_tservice" }
sgx_tstd = { path = "../../../../sgx_tstd" }
sgx_tunittest = { path = "../../../../sgx_tunittest" }
sgx_types = { path = "../../../../sgx_types" }
diff --git a/samplecode/ue-ra/ue-ra-server/enclave/Xargo.toml b/samplecode/ue-ra/ue-ra-server/enclave/Xargo.toml
index 780a570..30186d7 100644
--- a/samplecode/ue-ra/ue-ra-server/enclave/Xargo.toml
+++ b/samplecode/ue-ra/ue-ra-server/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../../sgx_tse"
stage = 2
diff --git a/samplecode/unit-test/enclave/Cargo.toml b/samplecode/unit-test/enclave/Cargo.toml
index 96ef64b..21ce279 100644
--- a/samplecode/unit-test/enclave/Cargo.toml
+++ b/samplecode/unit-test/enclave/Cargo.toml
@@ -48,7 +48,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/unit-test/enclave/Xargo.toml b/samplecode/unit-test/enclave/Xargo.toml
index 543e88d..681554e 100644
--- a/samplecode/unit-test/enclave/Xargo.toml
+++ b/samplecode/unit-test/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
@@ -92,4 +88,4 @@ stage = 7
[dependencies.sgx_cov]
path = "../../../sgx_cov"
-stage = 7
\ No newline at end of file
+stage = 7
diff --git a/samplecode/wasmi/enclave/Cargo.toml b/samplecode/wasmi/enclave/Cargo.toml
index 8f0b702..410497e 100644
--- a/samplecode/wasmi/enclave/Cargo.toml
+++ b/samplecode/wasmi/enclave/Cargo.toml
@@ -39,7 +39,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/wasmi/enclave/Xargo.toml b/samplecode/wasmi/enclave/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/wasmi/enclave/Xargo.toml
+++ b/samplecode/wasmi/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
diff --git a/samplecode/zlib-lazy-static-sample/enclave/Cargo.toml b/samplecode/zlib-lazy-static-sample/enclave/Cargo.toml
index f5a4cdb..a5ebcec 100644
--- a/samplecode/zlib-lazy-static-sample/enclave/Cargo.toml
+++ b/samplecode/zlib-lazy-static-sample/enclave/Cargo.toml
@@ -41,7 +41,6 @@ sgx_tprotected_fs = { path = "../../../sgx_tprotected_fs" }
sgx_trts = { path = "../../../sgx_trts" }
sgx_tse = { path = "../../../sgx_tse" }
sgx_tseal = { path = "../../../sgx_tseal" }
-sgx_tservice = { path = "../../../sgx_tservice" }
sgx_tstd = { path = "../../../sgx_tstd" }
sgx_tunittest = { path = "../../../sgx_tunittest" }
sgx_types = { path = "../../../sgx_types" }
diff --git a/samplecode/zlib-lazy-static-sample/enclave/Xargo.toml b/samplecode/zlib-lazy-static-sample/enclave/Xargo.toml
index b157608..b51ceef 100644
--- a/samplecode/zlib-lazy-static-sample/enclave/Xargo.toml
+++ b/samplecode/zlib-lazy-static-sample/enclave/Xargo.toml
@@ -29,10 +29,6 @@ stage = 2
path = "../../../sgx_tkey_exchange"
stage = 2
-[dependencies.sgx_tservice]
-path = "../../../sgx_tservice"
-stage = 2
-
[dependencies.sgx_tse]
path = "../../../sgx_tse"
stage = 2
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org