Upgrade to sgx 1.0.9

Author: dingelish

sgx/gbdt-sgx-test/common/inc/dirent.h

@@ -0,0 +1,59 @@
+/* Copyright (C) 1996-2018 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _DIRENT_H
+#define _DIRENT_H
+
+struct dirent
+{
+#ifndef __USE_FILE_OFFSET64
+    __ino_t d_ino;
+    __off_t d_off;
+#else
+    __ino64_t d_ino;
+    __off64_t d_off;
+#endif
+    unsigned short int d_reclen;
+    unsigned char d_type;
+    char d_name[256];		/* We must not include limits.h! */
+};
+
+//#ifdef __USE_LARGEFILE64
+struct dirent64
+{
+    __ino64_t d_ino;
+    __off64_t d_off;
+    unsigned short int d_reclen;
+    unsigned char d_type;
+    char d_name[256];		/* We must not include limits.h! */
+};
+//#endif
+
+#define d_fileno	d_ino	/* Backwards compatibility.  */
+
+#undef  _DIRENT_HAVE_D_NAMLEN
+#define _DIRENT_HAVE_D_RECLEN
+#define _DIRENT_HAVE_D_OFF
+#define _DIRENT_HAVE_D_TYPE
+
+#if defined __OFF_T_MATCHES_OFF64_T && defined __INO_T_MATCHES_INO64_T
+/* Inform libc code that these two types are effectively identical.  */
+# define _DIRENT_MATCHES_DIRENT64	1
+#else
+# define _DIRENT_MATCHES_DIRENT64	0
+#endif
+#endif

sgx/gbdt-sgx-test/edl/inc/dirent.h

@@ -0,0 +1,50 @@
+// Copyright (C) 2017-2019 Baidu, Inc. All Rights Reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+//  * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+//  * Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in
+//    the documentation and/or other materials provided with the
+//    distribution.
+//  * Neither the name of Baidu, Inc., nor the names of its
+//    contributors may be used to endorse or promote products derived
+//    from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef _EDL_DIRENT_H
+#define _EDL_DIRENT_H
+
+struct dirent_t
+{
+    uint64_t d_ino;
+    int64_t d_off;
+    unsigned short int d_reclen;
+    unsigned char d_type;
+    char d_name[256];
+};
+
+struct dirent64_t
+{
+    uint64_t d_ino;
+    int64_t d_off;
+    unsigned short int d_reclen;
+    unsigned char d_type;
+    char d_name[256];
+};
+
+#endif

sgx/gbdt-sgx-test/edl/sgx_env.edl

@@ -36,9 +36,9 @@ enclave {
     };
 
     untrusted {
-        char ** u_env_environ_ocall();
-        char * u_env_getenv_ocall([in, string] const char *name);
-    	int u_env_setenv_ocall([out] int *error, [in, string] const char *name, [in, string] const char *value, int overwrite);
-        int u_env_unsetenv_ocall([out] int *error, [in, string] const char *name);
+        char ** u_environ_ocall();
+        char * u_getenv_ocall([in, string] const char *name);
+        int u_setenv_ocall([out] int *error, [in, string] const char *name, [in, string] const char *value, int overwrite);
+        int u_unsetenv_ocall([out] int *error, [in, string] const char *name);
     };
 };

sgx/gbdt-sgx-test/edl/sgx_file.edl

@@ -32,6 +32,7 @@
 enclave {
 
     include "inc/stat.h"
+    include "inc/dirent.h"
 
     trusted {
         /* define ECALLs here. */
@@ -64,5 +65,12 @@ enclave {
         size_t u_readlink_ocall([out] int *error, [in, string] const char *path, [out, size=bufsz] char *buf, size_t bufsz);
         int u_symlink_ocall([out] int *error, [in, string] const char *path1, [in, string] const char *path2);
         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_opendir_ocall([out] int *error, [in, string] const char *pathname);
+        int u_readdir64_r_ocall([out] int *error, [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);
+        int u_dirfd_ocall([out] int *error, [user_check] void *dirp);
+        int u_fstatat64_ocall([out] int *error, int dirfd, [in, string] const char *pathname, [out] struct stat64_t *buf, int flags);
     };
 };

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

@@ -14,6 +14,6 @@ default = []
 gbdt_sgx = { path = "../../gbdt-sgx", default-features = false, features = ["mesalock_sgx", "input", "enable_training"] }
 
 [target.'cfg(not(target_env = "sgx"))'.dependencies]
-sgx_types = { rev = "v1.0.8", git = "https://github.com/baidu/rust-sgx-sdk.git" }
-sgx_tstd = { rev = "v1.0.8", git = "https://github.com/baidu/rust-sgx-sdk.git" }
-sgx_tunittest = { rev = "v1.0.8", git = "https://github.com/baidu/rust-sgx-sdk.git" }
+sgx_types = { rev = "v1.0.9", git = "https://github.com/baidu/rust-sgx-sdk.git" }
+sgx_tstd = { rev = "v1.0.9", git = "https://github.com/baidu/rust-sgx-sdk.git" }
+sgx_tunittest = { rev = "v1.0.9", git = "https://github.com/baidu/rust-sgx-sdk.git" }

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

@@ -1,12 +1,18 @@
 [dependencies]
 alloc = {}
-panic_unwind = {}
-panic_abort = {}
 
 [dependencies.sgx_types]
 git = "https://github.com/baidu/rust-sgx-sdk.git"
 stage = 1
 
+[dependencies.sgx_demangle]
+git = "https://github.com/baidu/rust-sgx-sdk.git"
+stage = 1
+
+[dependencies.panic_abort]
+git = "https://github.com/baidu/rust-sgx-sdk.git"
+stage = 1
+
 [dependencies.sgx_libc]
 git = "https://github.com/baidu/rust-sgx-sdk.git"
 stage = 2
@@ -31,6 +37,14 @@ stage = 2
 git = "https://github.com/baidu/rust-sgx-sdk.git"
 stage = 3
 
+[dependencies.sgx_backtrace_sys]
+git = "https://github.com/baidu/rust-sgx-sdk.git"
+stage = 3
+
+[dependencies.sgx_unwind]
+git = "https://github.com/baidu/rust-sgx-sdk.git"
+stage = 4
+
 [dependencies.sgx_tdh]
 git = "https://github.com/baidu/rust-sgx-sdk.git"
 stage = 4
@@ -39,30 +53,38 @@ stage = 4
 git = "https://github.com/baidu/rust-sgx-sdk.git"
 stage = 4
 
+[dependencies.sgx_tprotected_fs]
+git = "https://github.com/baidu/rust-sgx-sdk.git"
+stage = 4
+
 [dependencies.sgx_alloc]
 git = "https://github.com/baidu/rust-sgx-sdk.git"
 stage = 4
 
-[dependencies.std]
+[dependencies.panic_unwind]
 git = "https://github.com/baidu/rust-sgx-sdk.git"
-features = ["untrusted_fs"]
 stage = 5
 
-[dependencies.sgx_rand]
+[dependencies.std]
 git = "https://github.com/baidu/rust-sgx-sdk.git"
 stage = 6
 
+[dependencies.sgx_rand]
+git = "https://github.com/baidu/rust-sgx-sdk.git"
+stage = 7
+
 [dependencies.sgx_serialize]
 git = "https://github.com/baidu/rust-sgx-sdk.git"
-stage = 6
+stage = 7
 
 [dependencies.sgx_tunittest]
 git = "https://github.com/baidu/rust-sgx-sdk.git"
-stage = 6
+stage = 7
 
-[dependencies.sgx_tprotected_fs]
+[dependencies.sgx_backtrace]
 git = "https://github.com/baidu/rust-sgx-sdk.git"
-stage = 4
+stage = 8
 
-[patch.crates-io]
-libc = { git = "https://github.com/mesalock-linux/libc-sgx" }
+[dependencies.sgx_cov]
+git = "https://github.com/baidu/rust-sgx-sdk.git"
+stage = 8

sgx/gbdt-sgx/Cargo.toml

@@ -26,10 +26,10 @@ crate-type = ["rlib", "staticlib"]
 serde = { git = "https://github.com/mesalock-linux/serde-sgx.git" }
 serde_derive = { git = "https://github.com/mesalock-linux/serde-sgx.git" }
 serde_json = { git = "https://github.com/mesalock-linux/serde-json-sgx.git" }
-rand={ version = "0.6", optional = true, git = "https://github.com/mesalock-linux/rand-sgx.git", tag = "v0.6.5_sgx1.0.8" }
+rand={ version = "0.6", optional = true, git = "https://github.com/mesalock-linux/rand-sgx.git", tag = "v0.6.5_sgx1.0.9" }
 regex = { version = "1", git = "https://github.com/mesalock-linux/regex-sgx", optional = true }
 time = { version = "0.1", optional = true }
-sgx_tstd = { rev = "v1.0.8", git = "https://github.com/baidu/rust-sgx-sdk.git", optional = true }
+sgx_tstd = { rev = "v1.0.9", git = "https://github.com/baidu/rust-sgx-sdk.git", optional = true }
 cfg-if = "0.1"
 
 [dev-dependencies]