Port to sgx 1.1.0

.drone.yml

@@ -0,0 +1,237 @@
+kind: pipeline
+name: stream-ciphers-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 stream-ciphers-sgx-test
+
+- name: sim-test
+  image: baiduxlab/sgx-rust:1604-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - cd sgx/stream-ciphers-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
+
+node:
+  instance: sgx
+
+---
+
+kind: pipeline
+name: stream-ciphers-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 stream-ciphers-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/stream-ciphers-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: stream-ciphers-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 stream-ciphers-sgx-test
+
+- name: sim-test
+  image: baiduxlab/sgx-rust:1804-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - cd sgx/stream-ciphers-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
+
+node:
+  instance: sgx
+
+---
+
+kind: pipeline
+name: stream-ciphers-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 stream-ciphers-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/stream-ciphers-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: stream-ciphers-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/stream-ciphers-sgx-test
+
+- name: sim-test
+  image: baiduxlab/sgx-rust:1604-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - cd sgx/stream-ciphers-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
+
+node:
+  instance: sgx
+
+---
+
+kind: pipeline
+name: stream-ciphers-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/stream-ciphers-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/stream-ciphers-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: stream-ciphers-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/stream-ciphers-sgx-test
+
+- name: sim-test
+  image: baiduxlab/sgx-rust:1804-1.1.0
+  commands:
+  - . /opt/sgxsdk/environment
+  - cd sgx/stream-ciphers-sgx-test/bin && ./app | tee result.txt && grep " 0 failed" result.txt
+
+node:
+  instance: sgx
+
+---
+
+kind: pipeline
+name: stream-ciphers-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/stream-ciphers-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/stream-ciphers-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

.github/pull.yml

@@ -0,0 +1,5 @@
+version: "1"
+rules:
+  - base: master
+    upstream: RustCrypto:master
+    mergeMethod: none

aes-ctr/Cargo.toml

@@ -10,17 +10,17 @@ keywords = ["crypto", "stream-cipher", "trait"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-stream-cipher = "0.3"
+stream-cipher = { git = "https://github.com/mesalock-linux/rustcrypto-traits-sgx" }
 
-[target.'cfg(not(all(target_feature = "aes", target_feature = "sse2", target_feature = "ssse3", any(target_arch = "x86_64", target_arch = "x86"))))'.dependencies]
-ctr = "0.3"
-aes-soft = "0.3"
+#[target.'cfg(not(all(target_feature = "aes", target_feature = "sse2", target_feature = "ssse3", any(target_arch = "x86_64", target_arch = "x86"))))'.dependencies]
+#ctr = "0.3"
+#aes-soft = "0.3"
 
-[target.'cfg(all(target_feature = "aes", target_feature = "sse2", target_feature = "ssse3", any(target_arch = "x86_64", target_arch = "x86")))'.dependencies]
-aesni = "0.6"
+#[target.'cfg(all(target_feature = "aes", target_feature = "sse2", target_feature = "ssse3", any(target_arch = "x86_64", target_arch = "x86")))'.dependencies]
+aesni = { git = "https://github.com/mesalock-linux/rustcrypto-block-ciphers-sgx" }
 
 [dev-dependencies]
-stream-cipher = { version = "0.3", features = ["dev"] }
+#stream-cipher = { version = "0.3", features = ["dev"] }
 
 [badges]
 travis-ci = { repository = "RustCrypto/stream-ciphers" }

aes-ctr/src/lib.rs

@@ -38,44 +38,44 @@
 //! ```
 #![no_std]
 #![deny(missing_docs)]
-#[cfg(not(all(
-    target_feature = "aes",
-    target_feature = "sse2",
-    target_feature = "ssse3",
-    any(target_arch = "x86_64", target_arch = "x86"),
-)))]
-extern crate aes_soft;
-#[cfg(not(all(
-    target_feature = "aes",
-    target_feature = "sse2",
-    target_feature = "ssse3",
-    any(target_arch = "x86_64", target_arch = "x86"),
-)))]
-extern crate ctr;
+//#[cfg(not(all(
+//    target_feature = "aes",
+//    target_feature = "sse2",
+//    target_feature = "ssse3",
+//    any(target_arch = "x86_64", target_arch = "x86"),
+//)))]
+//extern crate aes_soft;
+//#[cfg(not(all(
+//    target_feature = "aes",
+//    target_feature = "sse2",
+//    target_feature = "ssse3",
+//    any(target_arch = "x86_64", target_arch = "x86"),
+//)))]
+//extern crate ctr;
 pub extern crate stream_cipher;
 
-#[cfg(not(all(
-    target_feature = "aes",
-    target_feature = "sse2",
-    target_feature = "ssse3",
-    any(target_arch = "x86_64", target_arch = "x86"),
-)))]
-mod dummy;
+//#[cfg(not(all(
+//    target_feature = "aes",
+//    target_feature = "sse2",
+//    target_feature = "ssse3",
+//    any(target_arch = "x86_64", target_arch = "x86"),
+//)))]
+//mod dummy;
 
-#[cfg(all(
-    target_feature = "aes",
-    target_feature = "sse2",
-    target_feature = "ssse3",
-    any(target_arch = "x86_64", target_arch = "x86"),
-))]
+//#[cfg(all(
+//    target_feature = "aes",
+//    target_feature = "sse2",
+//    target_feature = "ssse3",
+//    any(target_arch = "x86_64", target_arch = "x86"),
+//))]
 extern crate aesni;
 
-#[cfg(all(
-    target_feature = "aes",
-    target_feature = "sse2",
-    target_feature = "ssse3",
-    any(target_arch = "x86_64", target_arch = "x86"),
-))]
+//#[cfg(all(
+//    target_feature = "aes",
+//    target_feature = "sse2",
+//    target_feature = "ssse3",
+//    any(target_arch = "x86_64", target_arch = "x86"),
+//))]
 use aesni as dummy;
 
 pub use dummy::{Aes128Ctr, Aes192Ctr, Aes256Ctr};

aes-ctr/tests/mod.rs

@@ -1,7 +1,7 @@
-#![no_std]
-extern crate aes_ctr;
-#[macro_use]
-extern crate stream_cipher;
+//#![no_std]
+//extern crate aes_ctr;
+//#[macro_use]
+//extern crate stream_cipher;
 
 use aes_ctr::{Aes128Ctr, Aes256Ctr};
 

cfb-mode/Cargo.toml

@@ -10,13 +10,13 @@ keywords = ["crypto", "stream-cipher", "block-mode"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-stream-cipher = "0.3"
-block-cipher-trait = "0.6"
+stream-cipher = { git = "https://github.com/mesalock-linux/rustcrypto-traits-sgx" }
+block-cipher-trait = { git = "https://github.com/mesalock-linux/rustcrypto-traits-sgx" }
 
 [dev-dependencies]
-aes = "0.3"
-stream-cipher = { version = "0.3", features = ["dev"] }
-hex-literal = "0.1"
+#aes = "0.3"
+#stream-cipher = { version = "0.3", features = ["dev"] }
+#hex-literal = "0.1"
 
 [badges]
 travis-ci = { repository = "RustCrypto/stream-ciphers" }

cfb-mode/tests/mod.rs

@@ -1,7 +1,7 @@
-extern crate aes;
-extern crate cfb_mode;
-#[macro_use]
-extern crate stream_cipher;
+//extern crate aes;
+//extern crate cfb_mode;
+//#[macro_use]
+//extern crate stream_cipher;
 
 use cfb_mode::Cfb;