Merge #369

369: Switch to stable asm! r=raoulstrackx a=jethrogb

Once Rust 1.59 is released, this needs to be merged, minor versions need to be bumped where appropriate, and this should be released.

* [x] Wait for Rust 1.59
* [x] Switch CI to stable
* [x] Update documentation to stable

Co-authored-by: Jethro Beekman <[email protected]>

Author: bors[bot]

.travis.yml

@@ -26,36 +26,32 @@ matrix:
             - clang-11
             - musl-tools
       rust:
-        - nightly-2021-12-15
+        - stable
       env:
         - RUST_BACKTRACE=1
         - CFLAGS_x86_64_fortanix_unknown_sgx="-isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening"
         - CC_x86_64_fortanix_unknown_sgx=clang-11
       before_script:
         - rustup target add x86_64-fortanix-unknown-sgx x86_64-unknown-linux-musl
+        - rustup toolchain add nightly
+        - rustup target add x86_64-fortanix-unknown-sgx --toolchain nightly
       script:
         - cargo test --verbose --locked --all --exclude sgxs-loaders && [ "$(echo $(nm -D target/debug/sgx-detect|grep __vdso_sgx_enter_enclave))" = "w __vdso_sgx_enter_enclave" ]
-        - cargo test --verbose --locked -p sgx-isa --features sgxstd --target x86_64-fortanix-unknown-sgx --no-run
         - cargo test --verbose --locked -p sgxs-tools --features pe2sgxs --bin isgx-pe2sgx
         - cargo test --verbose --locked -p dcap-ql --features link
         - cargo test --verbose --locked -p dcap-ql --features verify
-        - cargo build --verbose --locked -p aesm-client --target=x86_64-fortanix-unknown-sgx
-        - cargo build --verbose --locked -p aesm-client --target=x86_64-fortanix-unknown-sgx --features sgx-isa/sgxstd
-        - cargo test --locked -p nitro-attestation-verify
+        # uses backtrace, which still requires nightly on SGX
+        - cargo +nightly build --verbose --locked -p aesm-client --target=x86_64-fortanix-unknown-sgx
+        # uses sgxstd feature
+        - cargo +nightly build --verbose --locked -p aesm-client --target=x86_64-fortanix-unknown-sgx --features sgx-isa/sgxstd
+        - cargo +nightly test --verbose --locked -p sgx-isa --features sgxstd --target x86_64-fortanix-unknown-sgx --no-run
         # Unfortunately running `faketime '2021-09-10 11:00:00 GMT' cargo test -p nitro-attestation-verify` causes a segmentation
         #  fault while compiling. We only execute `faketime` during the tests
-        - cargo test --locked -p nitro-attestation-verify --no-run && faketime '2021-09-08 11:00:00 GMT' $(find ./target/debug/deps -name "nitro_attestation_verify*" -executable)
-        - cargo test --locked -p nitro-attestation-verify --no-run && faketime '2021-09-10 11:00:00 GMT' $(find ./target/debug/deps -name "nitro_attestation_verify*" -executable)
+        #- cargo test --locked -p nitro-attestation-verify --no-run && faketime '2021-09-08 11:00:00 GMT' cargo test --locked -p nitro-attestation-verify --lib
+        - cargo test --locked -p nitro-attestation-verify --no-run && faketime '2021-09-10 11:00:00 GMT' cargo test --locked -p nitro-attestation-verify --lib
         # NOTE: linking glibc version of OpenSSL with musl binary.
         # Unlikely to produce a working binary, but at least the build succeeds.
         - mkdir -p /tmp/muslinclude && ln -sf /usr/include/x86_64-linux-gnu/openssl /tmp/muslinclude/openssl && PKG_CONFIG_ALLOW_CROSS=1 CFLAGS=-I/tmp/muslinclude cargo build --locked -p fortanix-sgx-tools --target x86_64-unknown-linux-musl
-        - cargo build --verbose --locked -p em-app --target=x86_64-fortanix-unknown-sgx
-        - cargo build --verbose --locked -p em-app --target=x86_64-unknown-linux-gnu
-        - cargo build --verbose --locked -p em-app --target=x86_64-unknown-linux-musl
-        - cargo build --verbose --locked -p get-certificate --target=x86_64-fortanix-unknown-sgx
-        - cargo build --verbose --locked -p get-certificate --target=x86_64-unknown-linux-gnu
-        - cargo build --verbose --locked -p get-certificate --target=x86_64-unknown-linux-musl
-        - cargo build --verbose --locked -p harmonize --target=x86_64-fortanix-unknown-sgx
-        - cargo build --verbose --locked -p harmonize --target=x86_64-unknown-linux-gnu
-        - cargo build --verbose --locked -p harmonize --target=x86_64-unknown-linux-musl
-        - ./doc/generate-api-docs.sh
+        - cargo build --verbose --locked -p em-app -p get-certificate -p harmonize --target=x86_64-unknown-linux-musl
+        - cargo build --verbose --locked -p em-app -p get-certificate -p harmonize --target=x86_64-fortanix-unknown-sgx
+        - ./doc/generate-api-docs.sh

Cargo.lock

@@ -30,8 +30,8 @@ uuid_sdkms = { package = "uuid", version = "0.7.4", features = ["v4", "serde"] }
 yasna = { version = "0.3", features = ["num-bigint", "bit-vec"] }
 
 [target.x86_64-fortanix-unknown-sgx.dependencies]
-sgx_pkix = { version = "0.1.0" }
-sgx-isa = { version="0.3", features=["sgxstd"], default-features=false }
+sgx_pkix = { version = "0.1.0", path = "../intel-sgx/sgx_pkix" }
+sgx-isa = { version = "0.3", path = "../intel-sgx/sgx-isa", default-features = false }
 
 [target.x86_64-unknown-linux-musl.dependencies]
 nsm-driver = { git = "https://github.com/aws/aws-nitro-enclaves-nsm-api", package = "nsm-driver", rev = "6745598d0e0e8af57e9b96ee2bf3d11b216fe649" }

em-app/Cargo.toml

@@ -1,4 +1,3 @@
-#![feature(io_error_uncategorized)]
 use std::io::{ErrorKind, Read, Write};
 use std::net::{IpAddr, Ipv4Addr, Shutdown, SocketAddr, TcpListener, TcpStream, ToSocketAddrs};
 use std::os::unix::io::{AsRawFd, FromRawFd};
@@ -31,7 +30,7 @@ fn server_run<A: ToSocketAddrs>(addr: A) {
                 assert_eq!(stream.local_addr().unwrap().port(), 3400);
 
                 let no_stream = unsafe { TcpStream::from_raw_fd(666.into()) };
-                assert_eq!(no_stream.peer_addr().unwrap_err().kind(), ErrorKind::Uncategorized);
+                no_stream.peer_addr().unwrap_err();
 
                 println!("Connection {}: Connected", id);
                 let mut buff_in = [0u8; 4192];

fortanix-vme/tests/incoming_connection/src/main.rs

@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #![deny(warnings)]
-#![feature(asm)]
 #![doc(
     html_logo_url = "https://edp.fortanix.com/img/docs/edp-logo.svg",
     html_favicon_url = "https://edp.fortanix.com/favicon.ico",

intel-sgx/enclave-runner/src/lib.rs

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use std;
+use std::arch::asm;
 use std::cell::RefCell;
 use std::convert::{TryFrom, TryInto};
 use std::fmt;

intel-sgx/enclave-runner/src/tcs.rs

@@ -1226,7 +1226,7 @@ async fn trap_attached_debugger(tcs: usize, debug_buf: *const u8) {
     // Synchronized
     unsafe {
         let old = signal::sigaction(signal::SIGTRAP, &sig_action).unwrap();
-        asm!("
+        std::arch::asm!("
             xchg %rbx, {0}
             int3
             xchg {0}, %rbx

intel-sgx/enclave-runner/src/usercalls/mod.rs

@@ -27,4 +27,3 @@ serde = { version = "1.0.104", features = ["derive"], optional = true } # MIT/Ap
 [features]
 large_array_derive = []
 sgxstd = []
-nightly = []

intel-sgx/sgx-isa/Cargo.toml

@@ -4,6 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 use core::mem::MaybeUninit;
+use core::arch::asm;
 use super::Enclu;
 
 /// Wrapper struct to force 16-byte alignment.
@@ -24,13 +25,15 @@ pub fn egetkey(request: &Align512<[u8; 512]>) -> Result<Align16<[u8; 16]>, u32>
         let mut out = MaybeUninit::uninit();
         let error;
 
-        llvm_asm!(
-            "enclu"
-            : "={eax}"(error)
-            : "{eax}"(Enclu::EGetkey),
-              "{rbx}"(request),
-              "{rcx}"(out.as_mut_ptr())
-            : "flags"
+        asm!(
+            // rbx is reserved by LLVM
+            "xchg %rbx, {0}",
+            "enclu",
+            "mov {0}, %rbx",
+            inout(reg) request => _,
+            inlateout("eax") Enclu::EGetkey as u32 => error,
+            in("rcx") out.as_mut_ptr(),
+            options(att_syntax, nostack),
         );
 
         match error {
@@ -52,13 +55,16 @@ pub fn ereport(
     unsafe {
         let mut report = MaybeUninit::uninit();
 
-        llvm_asm!(
-            "enclu"
-            : /* no output registers */
-            : "{eax}"(Enclu::EReport),
-              "{rbx}"(targetinfo),
-              "{rcx}"(reportdata),
-              "{rdx}"(report.as_mut_ptr())
+        asm!(
+            // rbx is reserved by LLVM
+            "xchg %rbx, {0}",
+            "enclu",
+            "mov {0}, %rbx",
+            inout(reg) targetinfo => _,
+            in("eax") Enclu::EReport as u32,
+            in("rcx") reportdata,
+            in("rdx") report.as_mut_ptr(),
+            options(att_syntax, preserves_flags, nostack),
         );
 
         report.assume_init()

intel-sgx/sgx-isa/src/arch.rs

@@ -10,8 +10,6 @@
 //! convenient.
 //!
 //! [isdm]: https://www-ssl.intel.com/content/www/us/en/processors/architectures-software-developer-manuals.html
-#![cfg_attr(feature = "nightly", feature(llvm_asm))]
-
 #![no_std]
 #![doc(html_logo_url = "https://edp.fortanix.com/img/docs/edp-logo.svg",
        html_favicon_url = "https://edp.fortanix.com/favicon.ico",
@@ -30,9 +28,9 @@ extern crate serde;
 #[cfg(feature = "serde")]
 use serde::{Serialize, Deserialize};
 
-#[cfg(all(feature = "sgxstd", target_env = "sgx"))]
+#[cfg(all(target_env = "sgx", feature = "sgxstd"))]
 use std::os::fortanix_sgx::arch;
-#[cfg(all(feature = "nightly", target_env = "sgx", not(feature = "sgxstd")))]
+#[cfg(all(target_env = "sgx", not(feature = "sgxstd")))]
 mod arch;
 use core::{convert::TryFrom, num::TryFromIntError, slice};
 
@@ -225,9 +223,7 @@ macro_rules! struct_def {
     };
     (@align bytes $($other:tt)*) => {};
     (@align type $ty:ident name $name:ident) => {
-        #[cfg(all(feature = "sgxstd", target_env = "sgx"))]
-        /// **Note.** This implementation is only available on the SGX target
-        /// with the `sgxstd` feature.
+        #[cfg(target_env = "sgx")]
         impl AsRef<arch::$ty<[u8; $name::UNPADDED_SIZE]>> for $name {
             fn as_ref(&self) -> &arch::$ty<[u8; $name::UNPADDED_SIZE]> {
                 unsafe {
@@ -678,7 +674,7 @@ impl Report {
     ///
     /// let targetinfo_self = Targetinfo::from(Report::for_self());
     /// ```
-    #[cfg(all(feature = "sgxstd", target_env = "sgx"))]
+    #[cfg(target_env = "sgx")]
     pub fn for_self() -> Self {
         let reportdata = arch::Align128([0; 64]);
         let targetinfo = arch::Align512([0; 512]);
@@ -687,7 +683,7 @@ impl Report {
         Report::try_copy_from(&out.0).unwrap()
     }
 
-    #[cfg(all(feature = "sgxstd", target_env = "sgx"))]
+    #[cfg(target_env = "sgx")]
     pub fn for_target(targetinfo: &Targetinfo, reportdata: &[u8; 64]) -> Report {
         let reportdata = arch::Align128(*reportdata);
         let out = arch::ereport(targetinfo.as_ref(), &reportdata);
@@ -700,7 +696,7 @@ impl Report {
     ///
     /// Care should be taken that `check_mac` prevents timing attacks,
     /// in particular that the comparison happens in constant time. 
-    #[cfg(all(feature = "sgxstd", target_env = "sgx"))]
+    #[cfg(target_env = "sgx")]
     pub fn verify<F, R>(&self, check_mac: F) -> R
     where
         F: FnOnce(&[u8; 16], &[u8; Report::TRUNCATED_SIZE], &[u8; 16]) -> R,
@@ -781,7 +777,7 @@ pub struct Keyrequest {
 impl Keyrequest {
     pub const UNPADDED_SIZE: usize = 512;
 
-    #[cfg(all(feature = "sgxstd", target_env = "sgx"))]
+    #[cfg(target_env = "sgx")]
     pub fn egetkey(&self) -> Result<[u8; 16], ErrorCode> {
         match arch::egetkey(self.as_ref()) {
             Ok(k) => Ok(k.0),