Support rust-nightly-2022-02-23

apache · Jun 6, 2022 · f59f688 · f59f688
1 parent 08264d6
commit f59f688
Show file tree

Hide file tree

Showing 301 changed files with 9,340 additions and 4,759 deletions.
diff --git a/dockerfile/Dockerfile.1804.nightly b/dockerfile/Dockerfile.1804.nightly
@@ -31,7 +31,7 @@ RUN bash /root/04_psw.sh
 
 # Seventh, Rust
 
-ENV rust_toolchain  nightly-2021-11-01
+ENV rust_toolchain  nightly-2022-02-23
 ADD 05_rust.sh /root
 RUN bash /root/05_rust.sh
 

diff --git a/dockerfile/Dockerfile.2004.nightly b/dockerfile/Dockerfile.2004.nightly
@@ -34,7 +34,7 @@ RUN bash /root/04_psw.sh
 
 # Seventh, Rust
 
-ENV rust_toolchain  nightly-2021-11-01
+ENV rust_toolchain  nightly-2022-02-23
 ADD 05_rust.sh /root
 RUN bash /root/05_rust.sh
 

diff --git a/dockerfile/Dockerfile.centos8.nightly b/dockerfile/Dockerfile.centos8.nightly
@@ -22,7 +22,7 @@ ENV PSW_REPO="https://download.01.org/intel-sgx/sgx-linux/2.16/distro/centos-str
 ADD 04_psw_rpm.sh /root
 RUN bash /root/04_psw_rpm.sh
 
-ENV rust_toolchain  nightly-2021-11-01
+ENV rust_toolchain  nightly-2022-02-23
 ADD 05_rust.sh /root
 RUN bash /root/05_rust.sh
 

diff --git a/edl/sgx_file.edl b/edl/sgx_file.edl
@@ -27,6 +27,7 @@ enclave {
     untrusted {
         int u_open_ocall([out] int *error, [in, string] const char *pathname, int flags);
         int u_open64_ocall([out] int *error, [in, string] const char *path, int oflag, int mode);
+        int u_openat_ocall([out] int *error, int dirfd, [in, string] const char *pathname, int flags);
 
         int u_fstat_ocall([out] int *error, int fd, [out] struct stat_t *buf);
         int u_fstat64_ocall([out] int *error, int fd, [out] struct stat64_t *buf);
@@ -46,6 +47,7 @@ enclave {
         int u_fchmod_ocall([out] int *error, int fd, uint32_t mode);
         int u_unlink_ocall([out] int *error, [in, string] const char *pathname);
         int u_link_ocall([out] int *error, [in, string] const char *oldpath, [in, string] const char *newpath);
+        int u_unlinkat_ocall([out] int *error, int dirfd, [in, string] const char *pathname, int flags);
         int u_linkat_ocall([out] int *error, int olddirfd, [in, string] const char *oldpath, int newdirfd, [in, string] const char *newpath, int flags);
         int u_rename_ocall([out] int *error, [in, string] const char *oldpath, [in, string] const char *newpath);
         int u_chmod_ocall([out] int *error, [in, string] const char *path, uint32_t mode);
@@ -54,6 +56,7 @@ enclave {
         char *u_realpath_ocall([out] int *error, [in, string] const char *pathname);
         int u_mkdir_ocall([out] int *error, [in, string] const char *pathname, uint32_t mode);
         int u_rmdir_ocall([out] int *error, [in, string] const char *pathname);
+        void *u_fdopendir_ocall([out] int *error, int fd);
         void *u_opendir_ocall([out] int *error, [in, string] const char *pathname);
         int u_readdir64_r_ocall([user_check] void *dirp, [in, out] struct dirent64_t *entry, [out] struct dirent64_t **result);
         int u_closedir_ocall([out] int *error, [user_check] void *dirp);

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2021-11-01
+nightly-2022-02-23
diff --git a/samplecode/backtrace/enclave/Cargo.toml b/samplecode/backtrace/enclave/Cargo.toml
@@ -16,6 +16,7 @@ sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git", features =
 sgx_backtrace = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 
 [patch.'https://github.com/apache/teaclave-sgx-sdk.git']
+sgx_align_struct_attribute = { path = "../../../sgx_align_struct_attribute" }
 sgx_alloc = { path = "../../../sgx_alloc" }
 sgx_backtrace = { path = "../../../sgx_backtrace" }
 sgx_backtrace_sys = { path = "../../../sgx_backtrace_sys" }
@@ -24,6 +25,7 @@ sgx_cov = { path = "../../../sgx_cov" }
 sgx_crypto_helper = { path = "../../../sgx_crypto_helper" }
 sgx_demangle = { path = "../../../sgx_demangle" }
 sgx_libc = { path = "../../../sgx_libc" }
+sgx_no_tstd = { path = "../../../sgx_no_tstd" }
 sgx_rand = { path = "../../../sgx_rand" }
 sgx_rand_derive = { path = "../../../sgx_rand_derive" }
 sgx_serialize = { path = "../../../sgx_serialize" }

diff --git a/samplecode/backtrace/enclave/Xargo.toml b/samplecode/backtrace/enclave/Xargo.toml
@@ -89,6 +89,7 @@ stage = 7
 [dependencies.sgx_cov]
 path = "../../../sgx_cov"
 stage = 7
+
 [dependencies.sgx_signal]
 path = "../../../sgx_signal"
 stage = 7
diff --git a/samplecode/backtrace/enclave/x86_64-unknown-linux-sgx.json b/samplecode/backtrace/enclave/x86_64-unknown-linux-sgx.json
@@ -1,13 +1,13 @@
 {
   "arch": "x86_64",
   "cpu": "x86-64",
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-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,
+  "has-thread-local": true,
   "linker-flavor": "gcc",
   "linker-is-gnu": true,
   "llvm-target": "x86_64-unknown-linux-gnu",
@@ -30,6 +30,13 @@
       1
     ]
   },
+  "supported-sanitizers": [
+    "address",
+    "cfi",
+    "leak",
+    "memory",
+    "thread"
+  ],
   "target-c-int-width": "32",
   "target-endian": "little",
   "target-family": "unix",

diff --git a/samplecode/crypto/enclave/Cargo.toml b/samplecode/crypto/enclave/Cargo.toml
@@ -17,6 +17,7 @@ sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 sgx_tcrypto = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 
 [patch.'https://github.com/apache/teaclave-sgx-sdk.git']
+sgx_align_struct_attribute = { path = "../../../sgx_align_struct_attribute" }
 sgx_alloc = { path = "../../../sgx_alloc" }
 sgx_backtrace = { path = "../../../sgx_backtrace" }
 sgx_backtrace_sys = { path = "../../../sgx_backtrace_sys" }
@@ -25,6 +26,7 @@ sgx_cov = { path = "../../../sgx_cov" }
 sgx_crypto_helper = { path = "../../../sgx_crypto_helper" }
 sgx_demangle = { path = "../../../sgx_demangle" }
 sgx_libc = { path = "../../../sgx_libc" }
+sgx_no_tstd = { path = "../../../sgx_no_tstd" }
 sgx_rand = { path = "../../../sgx_rand" }
 sgx_rand_derive = { path = "../../../sgx_rand_derive" }
 sgx_serialize = { path = "../../../sgx_serialize" }
@@ -41,6 +43,6 @@ sgx_tseal = { path = "../../../sgx_tseal" }
 sgx_tstd = { path = "../../../sgx_tstd" }
 sgx_tunittest = { path = "../../../sgx_tunittest" }
 sgx_types = { path = "../../../sgx_types" }
-sgx_ucrypto = { path = "../../../sgx_ucrypto" }
+#sgx_ucrypto = { path = "../../../sgx_ucrypto" }
 sgx_unwind = { path = "../../../sgx_unwind" }
-sgx_urts = { path = "../../../sgx_urts" }
+#sgx_urts = { path = "../../../sgx_urts" }
diff --git a/samplecode/crypto/enclave/x86_64-unknown-linux-sgx.json b/samplecode/crypto/enclave/x86_64-unknown-linux-sgx.json
@@ -1,13 +1,13 @@
 {
   "arch": "x86_64",
   "cpu": "x86-64",
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-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,
+  "has-thread-local": true,
   "linker-flavor": "gcc",
   "linker-is-gnu": true,
   "llvm-target": "x86_64-unknown-linux-gnu",
@@ -30,6 +30,13 @@
       1
     ]
   },
+  "supported-sanitizers": [
+    "address",
+    "cfi",
+    "leak",
+    "memory",
+    "thread"
+  ],
   "target-c-int-width": "32",
   "target-endian": "little",
   "target-family": "unix",

diff --git a/samplecode/db-proxy/db-proxy/enclave/Cargo.toml b/samplecode/db-proxy/db-proxy/enclave/Cargo.toml
@@ -15,6 +15,7 @@ sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 
 [patch.'https://github.com/apache/teaclave-sgx-sdk.git']
+sgx_align_struct_attribute = { path = "../../../../sgx_align_struct_attribute" }
 sgx_alloc = { path = "../../../../sgx_alloc" }
 sgx_backtrace = { path = "../../../../sgx_backtrace" }
 sgx_backtrace_sys = { path = "../../../../sgx_backtrace_sys" }
@@ -23,6 +24,7 @@ sgx_cov = { path = "../../../../sgx_cov" }
 sgx_crypto_helper = { path = "../../../../sgx_crypto_helper" }
 sgx_demangle = { path = "../../../../sgx_demangle" }
 sgx_libc = { path = "../../../../sgx_libc" }
+sgx_no_tstd = { path = "../../../../sgx_no_tstd" }
 sgx_rand = { path = "../../../../sgx_rand" }
 sgx_rand_derive = { path = "../../../../sgx_rand_derive" }
 sgx_serialize = { path = "../../../../sgx_serialize" }
@@ -41,4 +43,4 @@ 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" }
+#sgx_urts = { path = "../../../../sgx_urts" }
diff --git a/samplecode/db-proxy/db-proxy/enclave/x86_64-unknown-linux-sgx.json b/samplecode/db-proxy/db-proxy/enclave/x86_64-unknown-linux-sgx.json
@@ -1,13 +1,13 @@
 {
   "arch": "x86_64",
   "cpu": "x86-64",
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-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,
+  "has-thread-local": true,
   "linker-flavor": "gcc",
   "linker-is-gnu": true,
   "llvm-target": "x86_64-unknown-linux-gnu",
@@ -30,6 +30,13 @@
       1
     ]
   },
+  "supported-sanitizers": [
+    "address",
+    "cfi",
+    "leak",
+    "memory",
+    "thread"
+  ],
   "target-c-int-width": "32",
   "target-endian": "little",
   "target-family": "unix",

diff --git a/samplecode/dcap-pckretrieval/enclave/x86_64-unknown-linux-sgx.json b/samplecode/dcap-pckretrieval/enclave/x86_64-unknown-linux-sgx.json
@@ -1,13 +1,13 @@
 {
   "arch": "x86_64",
   "cpu": "x86-64",
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-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,
+  "has-thread-local": true,
   "linker-flavor": "gcc",
   "linker-is-gnu": true,
   "llvm-target": "x86_64-unknown-linux-gnu",
@@ -30,6 +30,13 @@
       1
     ]
   },
+  "supported-sanitizers": [
+    "address",
+    "cfi",
+    "leak",
+    "memory",
+    "thread"
+  ],
   "target-c-int-width": "32",
   "target-endian": "little",
   "target-family": "unix",

diff --git a/samplecode/file/enclave/Cargo.toml b/samplecode/file/enclave/Cargo.toml
@@ -20,6 +20,7 @@ sgx_rand_derive = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 sgx_serialize_derive = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 
 [patch.'https://github.com/apache/teaclave-sgx-sdk.git']
+sgx_align_struct_attribute = { path = "../../../sgx_align_struct_attribute" }
 sgx_alloc = { path = "../../../sgx_alloc" }
 sgx_backtrace = { path = "../../../sgx_backtrace" }
 sgx_backtrace_sys = { path = "../../../sgx_backtrace_sys" }
@@ -28,6 +29,7 @@ sgx_cov = { path = "../../../sgx_cov" }
 sgx_crypto_helper = { path = "../../../sgx_crypto_helper" }
 sgx_demangle = { path = "../../../sgx_demangle" }
 sgx_libc = { path = "../../../sgx_libc" }
+sgx_no_tstd = { path = "../../../sgx_no_tstd" }
 sgx_rand = { path = "../../../sgx_rand" }
 sgx_rand_derive = { path = "../../../sgx_rand_derive" }
 sgx_serialize = { path = "../../../sgx_serialize" }

diff --git a/samplecode/file/enclave/x86_64-unknown-linux-sgx.json b/samplecode/file/enclave/x86_64-unknown-linux-sgx.json
@@ -1,13 +1,13 @@
 {
   "arch": "x86_64",
   "cpu": "x86-64",
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-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,
+  "has-thread-local": true,
   "linker-flavor": "gcc",
   "linker-is-gnu": true,
   "llvm-target": "x86_64-unknown-linux-gnu",
@@ -30,6 +30,13 @@
       1
     ]
   },
+  "supported-sanitizers": [
+    "address",
+    "cfi",
+    "leak",
+    "memory",
+    "thread"
+  ],
   "target-c-int-width": "32",
   "target-endian": "little",
   "target-family": "unix",

diff --git a/samplecode/hello-regex/enclave/Cargo.toml b/samplecode/hello-regex/enclave/Cargo.toml
@@ -18,6 +18,7 @@ sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 
 [patch.'https://github.com/apache/teaclave-sgx-sdk.git']
+sgx_align_struct_attribute = { path = "../../../sgx_align_struct_attribute" }
 sgx_alloc = { path = "../../../sgx_alloc" }
 sgx_backtrace = { path = "../../../sgx_backtrace" }
 sgx_backtrace_sys = { path = "../../../sgx_backtrace_sys" }
@@ -26,6 +27,7 @@ sgx_cov = { path = "../../../sgx_cov" }
 sgx_crypto_helper = { path = "../../../sgx_crypto_helper" }
 sgx_demangle = { path = "../../../sgx_demangle" }
 sgx_libc = { path = "../../../sgx_libc" }
+sgx_no_tstd = { path = "../../../sgx_no_tstd" }
 sgx_rand = { path = "../../../sgx_rand" }
 sgx_rand_derive = { path = "../../../sgx_rand_derive" }
 sgx_serialize = { path = "../../../sgx_serialize" }

diff --git a/samplecode/hello-regex/enclave/x86_64-unknown-linux-sgx.json b/samplecode/hello-regex/enclave/x86_64-unknown-linux-sgx.json
@@ -1,13 +1,13 @@
 {
   "arch": "x86_64",
   "cpu": "x86-64",
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-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,
+  "has-thread-local": true,
   "linker-flavor": "gcc",
   "linker-is-gnu": true,
   "llvm-target": "x86_64-unknown-linux-gnu",
@@ -30,6 +30,13 @@
       1
     ]
   },
+  "supported-sanitizers": [
+    "address",
+    "cfi",
+    "leak",
+    "memory",
+    "thread"
+  ],
   "target-c-int-width": "32",
   "target-endian": "little",
   "target-family": "unix",

diff --git a/samplecode/hello-rust-vscode-debug/Cargo.toml b/samplecode/hello-rust-vscode-debug/Cargo.toml
@@ -4,29 +4,3 @@ members = [
     "app",
     "enclave",
 ]
-
-[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_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/hello-rust-vscode-debug/enclave/Cargo.toml b/samplecode/hello-rust-vscode-debug/enclave/Cargo.toml
@@ -15,6 +15,7 @@ sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 sgx_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 
 [patch.'https://github.com/apache/teaclave-sgx-sdk.git']
+sgx_align_struct_attribute = { path = "../../../sgx_align_struct_attribute" }
 sgx_alloc = { path = "../../../sgx_alloc" }
 sgx_backtrace = { path = "../../../sgx_backtrace" }
 sgx_backtrace_sys = { path = "../../../sgx_backtrace_sys" }
@@ -23,6 +24,7 @@ sgx_cov = { path = "../../../sgx_cov" }
 sgx_crypto_helper = { path = "../../../sgx_crypto_helper" }
 sgx_demangle = { path = "../../../sgx_demangle" }
 sgx_libc = { path = "../../../sgx_libc" }
+sgx_no_tstd = { path = "../../../sgx_no_tstd" }
 sgx_rand = { path = "../../../sgx_rand" }
 sgx_rand_derive = { path = "../../../sgx_rand_derive" }
 sgx_serialize = { path = "../../../sgx_serialize" }