Port to sgx 1.1.0

mesalock-linux · Dec 17, 2019 · 34a83e2 · 34a83e2
1 parent d9d2357
commit 34a83e2
Show file tree

Hide file tree

Showing 85 changed files with 6,757 additions and 21 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -0,0 +1,237 @@
+kind: pipeline
+name: num-traits-sgx-xargo-1604-sw
+
+steps:
+- name: sim-compile
+  image: baiduxlab/sgx-rust:1604-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - . /root/.cargo/env
+  - cd sgx && SGX_MODE=SW XARGO_SGX=1 make -C num-traits-sgx-test
+
+- name: sim-test
+  image: baiduxlab/sgx-rust:1604-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - cd sgx/num-traits-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
+
+node:
+  instance: sgx
+
+---
+
+kind: pipeline
+name: num-traits-sgx-xargo-1604-hw
+
+steps:
+- name: hw-compile
+  image: baiduxlab/sgx-rust:1604-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - . /root/.cargo/env
+  - cd sgx && XARGO_SGX=1 make -C num-traits-sgx-test
+
+- name: hw-test
+  image: baiduxlab/sgx-rust:1604-1.1.0
+  privileged: true
+  volumes:
+  - name: isgx
+    path: /dev/isgx
+  - name: aesmd
+    path: /var/run/aesmd/aesm.socket
+  commands:
+  - . /opt/sgxsdk/environment
+  - ls -l /dev/isgx
+  - ls -l /var/run/aesmd/aesm.socket
+  - cd sgx/num-traits-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
+
+volumes:
+- name: isgx
+  host:
+    path: /dev/isgx
+- name: aesmd
+  host:
+    path: /var/run/aesmd/aesm.socket
+
+node:
+  instance: sgx
+
+---
+
+kind: pipeline
+name: num-traits-sgx-xargo-1804-sw
+
+steps:
+- name: sim-compile
+  image: baiduxlab/sgx-rust:1804-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - . /root/.cargo/env
+  - cd sgx && SGX_MODE=SW XARGO_SGX=1 make -C num-traits-sgx-test
+
+- name: sim-test
+  image: baiduxlab/sgx-rust:1804-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - cd sgx/num-traits-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
+
+node:
+  instance: sgx
+
+---
+
+kind: pipeline
+name: num-traits-sgx-xargo-1804-hw
+
+steps:
+- name: hw-compile
+  image: baiduxlab/sgx-rust:1804-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - . /root/.cargo/env
+  - cd sgx && XARGO_SGX=1 make -C num-traits-sgx-test
+
+- name: hw-test
+  image: baiduxlab/sgx-rust:1804-1.1.0
+  privileged: true
+  volumes:
+  - name: isgx
+    path: /dev/isgx
+  - name: aesmd
+    path: /var/run/aesmd/aesm.socket
+  commands:
+  - . /opt/sgxsdk/environment
+  - ls -l /dev/isgx
+  - ls -l /var/run/aesmd/aesm.socket
+  - cd sgx/num-traits-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
+
+volumes:
+- name: isgx
+  host:
+    path: /dev/isgx
+- name: aesmd
+  host:
+    path: /var/run/aesmd/aesm.socket
+
+node:
+  instance: sgx
+
+---
+
+kind: pipeline
+name: num-traits-sgx-1604-sw
+
+steps:
+- name: sim-compile
+  image: baiduxlab/sgx-rust:1604-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - . /root/.cargo/env
+  - SGX_MODE=SW make -C sgx/num-traits-sgx-test
+
+- name: sim-test
+  image: baiduxlab/sgx-rust:1604-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - cd sgx/num-traits-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
+
+node:
+  instance: sgx
+
+---
+
+kind: pipeline
+name: num-traits-sgx-1604-hw
+
+steps:
+- name: hw-compile
+  image: baiduxlab/sgx-rust:1604-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - . /root/.cargo/env
+  - make -C sgx/num-traits-sgx-test
+
+- name: hw-test
+  image: baiduxlab/sgx-rust:1604-1.1.0
+  privileged: true
+  volumes:
+  - name: isgx
+    path: /dev/isgx
+  - name: aesmd
+    path: /var/run/aesmd/aesm.socket
+  commands:
+  - . /opt/sgxsdk/environment
+  - ls -l /dev/isgx
+  - ls -l /var/run/aesmd/aesm.socket
+  - cd sgx/num-traits-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
+
+volumes:
+- name: isgx
+  host:
+    path: /dev/isgx
+- name: aesmd
+  host:
+    path: /var/run/aesmd/aesm.socket
+
+node:
+  instance: sgx
+
+---
+
+kind: pipeline
+name: num-traits-sgx-1804-sw
+
+steps:
+- name: sim-compile
+  image: baiduxlab/sgx-rust:1804-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - . /root/.cargo/env
+  - SGX_MODE=SW make -C sgx/num-traits-sgx-test
+
+- name: sim-test
+  image: baiduxlab/sgx-rust:1804-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - cd sgx/num-traits-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
+
+node:
+  instance: sgx
+
+---
+
+kind: pipeline
+name: num-traits-sgx-1804-hw
+
+steps:
+- name: hw-compile
+  image: baiduxlab/sgx-rust:1804-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - . /root/.cargo/env
+  - make -C sgx/num-traits-sgx-test
+
+- name: hw-test
+  image: baiduxlab/sgx-rust:1804-1.1.0
+  privileged: true
+  volumes:
+  - name: isgx
+    path: /dev/isgx
+  - name: aesmd
+    path: /var/run/aesmd/aesm.socket
+  commands:
+  - . /opt/sgxsdk/environment
+  - ls -l /dev/isgx
+  - ls -l /var/run/aesmd/aesm.socket
+  - cd sgx/num-traits-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
+
+volumes:
+- name: isgx
+  host:
+    path: /dev/isgx
+- name: aesmd
+  host:
+    path: /var/run/aesmd/aesm.socket
+
+node:
+  instance: sgx
diff --git a/.github/pull.yml b/.github/pull.yml
@@ -0,0 +1,5 @@
+version: "1"
+rules:
+  - base: master
+    upstream: rust-num:master
+    mergeMethod: none
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,17 +11,19 @@ name = "num-traits"
 version = "0.2.10"
 readme = "README.md"
 build = "build.rs"
-exclude = ["/ci/*", "/.travis.yml", "/bors.toml"]
+exclude = ["/ci/*", "/.travis.yml", "/bors.toml", "/sgx/*"]
 
 [package.metadata.docs.rs]
 features = ["std"]
 
 [dependencies]
-libm = { version = "0.2.0", optional = true }
+#libm = { version = "0.2.0", optional = true }
+sgx_tstd = { rev = "v1.1.0", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
 
 [features]
-default = ["std"]
-std = []
+default = ["mesalock_sgx", "std", "i128"]
+mesalock_sgx = ["sgx_tstd"]
+std = ["mesalock_sgx"]
 i128 = []
 
 [build-dependencies]

diff --git a/build.rs b/build.rs
@@ -1,14 +1,15 @@
-extern crate autocfg;
+//extern crate autocfg;
 
-use std::env;
+//use std::env;
 
 fn main() {
-    let ac = autocfg::new();
-    if ac.probe_type("i128") {
-        println!("cargo:rustc-cfg=has_i128");
-    } else if env::var_os("CARGO_FEATURE_I128").is_some() {
-        panic!("i128 support was not detected!");
-    }
+    //let ac = autocfg::new();
+    //if ac.probe_type("i128") {
+    //    println!("cargo:rustc-cfg=has_i128");
+    //} else if env::var_os("CARGO_FEATURE_I128").is_some() {
+    //    panic!("i128 support was not detected!");
+    //}
+    println!("cargo:rustc-cfg=has_i128");
 
     autocfg::rerun_path("build.rs");
 }