address deps but rustc crashed -- potentially due to crates renaming …

…issue ini rust-lang/rust#64450
zaxguo · Jul 2, 2020 · b5be32f · b5be32f
1 parent 383e7e6
commit b5be32f
Show file tree

Hide file tree

Showing 9 changed files with 7,438 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/nibble/src/lib.rs b/common/nibble/src/lib.rs
@@ -5,6 +5,17 @@
 
 //! `Nibble` represents a four-bit unsigned integer.
 
+#![cfg_attr(all(feature = "mesalock_sgx", not(target_env = "sgx")), no_std)]
+#![cfg_attr(
+        all(target_env = "sgx", target_vendor = "mesalock"),
+            feature(rustc_private)
+)]
+
+#[cfg(all(feature = "mesalock_sgx", not(target_env = "sgx")))]
+#[macro_use]
+extern crate sgx_tstd as std;
+
+
 #[cfg(feature = "fuzzing")]
 use proptest::prelude::*;
 use serde::{Deserialize, Serialize};

diff --git a/consensus/enclave/Cargo.toml b/consensus/enclave/Cargo.toml
@@ -22,5 +22,6 @@ sgx_unwind = { rev = "v1.1.2", git = "https://github.com/apache/teaclave-sgx-sdk
 #libra-types = { path = "../../sgx-libs/types", version = "0.1.0", package = "libra-types-sgx"}
 lcs = { path = "../../sgx-deps/lcs", version = "0.1.0", package = "libra-canonical-serialization-sgx"}
 libra-crypto-derive = { path = "../../sgx-deps/crypto/crypto-derive", version = "0.1.0", package = "libra-crypto-derive-sgx"}
-#libra-crypto = { path = "../../sgx-deps/crypto/crypto/", version = "0.1.0", package = "libra-crypto-sgx"}
+libra-crypto = { path = "../../sgx-deps/crypto/crypto/", version = "0.1.0", package = "libra-crypto-sgx"}
+#hmac = "0.8.1"
 
diff --git a/consensus/enclave/Makefile b/consensus/enclave/Makefile
@@ -31,7 +31,7 @@ all: $(Rust_Enclave_Name)
 
 $(Rust_Enclave_Name): $(Rust_Enclave_Files)
 ifeq ($(XARGO_SGX), 1)
-	RUSTFLAGS="-Z force-unstable-if-unmarked" RUST_TARGET_PATH=$(Rust_Target_Path) xargo build --target x86_64-unknown-linux-sgx --release --verbose --color always 2>&1 | less -r
+	RUST_BACKTRACE=1 RUSTFLAGS="-Z force-unstable-if-unmarked" RUST_TARGET_PATH=$(Rust_Target_Path) xargo build --target x86_64-unknown-linux-sgx --release --verbose --color always 2>&1 | less -r
 	cp ./target/x86_64-unknown-linux-sgx/release/libhelloworldsampleenclave.a ../lib/libenclave.a
 else
 	cargo build --release --verbose

diff --git a/crypto/crypto-derive/src/lib.rs b/crypto/crypto-derive/src/lib.rs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #![forbid(unsafe_code)]
-
 //! # Derive macros for crypto operations
 //! This crate contains four types of derive macros:
 //!
@@ -97,6 +96,18 @@
 
 #![forbid(unsafe_code)]
 
+#![cfg_attr(all(feature = "mesalock_sgx", not(target_env = "sgx")), no_std)]
+#![cfg_attr(
+        all(target_env = "sgx", target_vendor = "mesalock"),
+            feature(rustc_private)
+)]
+
+#[cfg(all(feature = "mesalock_sgx", not(target_env = "sgx")))]
+#[macro_use]
+extern crate sgx_tstd as std;
+
+
+
 extern crate proc_macro;
 
 mod hasher;

diff --git a/crypto/crypto/src/lib.rs b/crypto/crypto/src/lib.rs
@@ -6,6 +6,17 @@
 
 //! A library supplying various cryptographic primitives
 
+#![cfg_attr(all(feature = "mesalock_sgx", not(target_env = "sgx")), no_std)]
+#![cfg_attr(
+        all(target_env = "sgx", target_vendor = "mesalock"),
+            feature(rustc_private)
+)]
+
+#[cfg(all(feature = "mesalock_sgx", not(target_env = "sgx")))]
+#[macro_use]
+extern crate sgx_tstd as std;
+
+
 pub mod ed25519;
 pub mod error;
 pub mod hash;

diff --git a/sgx-deps/crypto/crypto/Cargo.toml b/sgx-deps/crypto/crypto/Cargo.toml
@@ -14,12 +14,12 @@ name = "libra_crypto_sgx"
 path = "../../../crypto/crypto/src/lib.rs"
 
 [dependencies]
-#curve25519-dalek = { git = "https://github.com/zaxguo/curve25519-dalek.git", branch = "fiat2", default-features = false }
-curve25519-dalek = { git = "https://github.com/novifinancial/curve25519-dalek.git", branch = "fiat2", default-features = false }
-#ed25519-dalek = { git = "https://github.com/zaxguo/ed25519-dalek.git", branch = "fiat2", features = ["serde"], default-features = false }
-ed25519-dalek = { git = "https://github.com/novifinancial/ed25519-dalek.git", branch = "fiat2", features = ["serde"], default-features = false }
-#x25519-dalek = { git = "https://github.com/zaxguo/x25519-dalek.git", branch = "fiat2", default-features = false }
-x25519-dalek = { git = "https://github.com/novifinancial/x25519-dalek.git", branch = "fiat2", default-features = false }
+curve25519-dalek = { git = "https://github.com/zaxguo/curve25519-dalek.git", branch = "fiat2", default-features = false }
+#curve25519-dalek = { git = "https://github.com/novifinancial/curve25519-dalek.git", branch = "fiat2", default-features = false }
+ed25519-dalek = { git = "https://github.com/zaxguo/ed25519-dalek.git", branch = "fiat2", features = ["serde"], default-features = false }
+#ed25519-dalek = { git = "https://github.com/novifinancial/ed25519-dalek.git", branch = "fiat2", features = ["serde"], default-features = false }
+x25519-dalek = { git = "https://github.com/zaxguo/x25519-dalek.git", branch = "fiat2", default-features = false }
+#x25519-dalek = { git = "https://github.com/novifinancial/x25519-dalek.git", branch = "fiat2", default-features = false }
 anyhow = { git = "https://github.com/mesalock-linux/anyhow-sgx.git", tag = "sgx_1.1.2" }
 bytes = { git = "https://github.com/mesalock-linux/bytes-sgx.git", tag = "sgx_1.1.2" }
 digest = "0.9.0"
@@ -33,7 +33,7 @@ rand = {git = "https://github.com/mesalock-linux/rand-sgx.git", tag = "sgx_1.1.2
 rand_core = {git = "https://github.com/mesalock-linux/rand-sgx.git", tag = "sgx_1.1.2"}
 serde = {git = "https://github.com/mesalock-linux/serde-sgx.git", tag = "sgx_1.1.2", features = ["derive"]}
 serde_bytes = {git = "https://github.com/mesalock-linux/serde-bytes-sgx.git", tag = "sgx_1.1.2"}
-serde-name = "0.1.0"
+#serde-name = "0.1.0"
 sha2 = "0.9.1"
 static_assertions = { version = "1.1.0", optional = true }
 thiserror = { git = "https://github.com/mesalock-linux/thiserror-sgx.git", tag = "sgx_1.1.2" }

diff --git a/sgx-deps/nibble/Cargo.toml b/sgx-deps/nibble/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 
 [lib]
 name = "libra_nibble_sgx"
-path = "../../common/nibble"
+path = "../../common/nibble/src/lib.rs"
 
 [dependencies]
 proptest = { version = "0.10.0", optional = true }

diff --git a/types/src/lib.rs b/types/src/lib.rs
@@ -2,6 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #![forbid(unsafe_code)]
+#![cfg_attr(all(feature = "mesalock_sgx", not(target_env = "sgx")), no_std)]
+#![cfg_attr(
+        all(target_env = "sgx", target_vendor = "mesalock"),
+            feature(rustc_private)
+)]
+
+#[cfg(all(feature = "mesalock_sgx", not(target_env = "sgx")))]
+#[macro_use]
+extern crate sgx_tstd as std;
 
 pub mod access_path;
 pub mod account_address;