simulate prohibited instructions

Signed-off-by: Jun Kimura <[email protected]>

Author: bluele

Makefile

@@ -29,11 +29,27 @@ clippy:
 check: fmt-check clippy
 
 .PHONY: test
-test:
-	@echo "Building and running unit tests..."
+test: enclave-test untrusted-test
+	@echo "All tests completed successfully!"
+
+.PHONY: enclave-test
+enclave-test:
+	@echo "Building and running enclave unit tests..."
 	@cd unit-test && make clean all
 	@cd unit-test/bin && ./app
 
+.PHONY: untrusted-test
+untrusted-test:
+	@echo "Running untrusted crate tests..."
+	@echo "Testing sgx-types..."
+	@cd sgx-types && cargo test --features urts
+	@echo "Testing sgx-urts..."
+	@cd sgx-urts && cargo test --features simulate_utils
+	@echo "Testing sgx-build..."
+	@cd sgx-build && cargo test
+	@echo "Testing cargo-sgx..."
+	@cd cargo-sgx && cargo test
+
 .PHONY: toml-fmt
 toml-fmt:
 	@echo "Formatting TOML files..."

samples/hello-rust/app/src/main.rs

@@ -36,21 +36,15 @@ extern "C" {
 fn init_enclave() -> SgxResult<SgxEnclave> {
     let mut launch_token: sgx_launch_token_t = [0; 1024];
     let mut launch_token_updated: i32 = 0;
-    let debug = match env::var("SGX_DEBUG") {
-        Ok(val) => match val.as_str() {
-            "1" => 1,
-            _ => 0,
-        },
-        Err(_) => 0,
-    };
+    let debug = env::var("SGX_DEBUG").unwrap_or_default() == "1";
     let mut misc_attr = sgx_misc_attribute_t {
         secs_attr: sgx_attributes_t { flags: 0, xfrm: 0 },
         misc_select: 0,
     };
     // call sgx_create_enclave to initialize an enclave instance
     SgxEnclave::create(
         ENCLAVE_FILE,
-        debug,
+        debug.into(),
         &mut launch_token,
         &mut launch_token_updated,
         &mut misc_attr,

sgx-urts/Cargo.toml

@@ -1,21 +1,25 @@
 [package]
-name         = "sgx-urts"
-version      = "1.2.0"
-authors      = ["The Teaclave Authors", "The SGX-SDK-RS Authors"]
-repository   = "https://github.com/datachainlab/sgx-sdk-rs"
-license      = "Apache-2.0"
-description  = "Rust SGX SDK provides the ability to write Intel SGX applications in Rust Programming Language."
-edition      = "2021"
+name        = "sgx-urts"
+version     = "1.2.0"
+authors     = ["The Teaclave Authors", "The SGX-SDK-RS Authors"]
+repository  = "https://github.com/datachainlab/sgx-sdk-rs"
+license     = "Apache-2.0"
+description = "Rust SGX SDK provides the ability to write Intel SGX applications in Rust Programming Language."
+edition     = "2021"
 
 [lib]
 name       = "sgx_urts"
 crate-type = ["rlib"]
 
 [features]
-default     = []
-global_init = ["global_exit"]
-global_exit = ["global_init"]
+default        = []
+global_init    = ["global_exit"]
+global_exit    = ["global_init"]
+simulate_utils = ["tracing", "object", "iced-x86"]
 
 [dependencies]
+tracing   = { version = "0.1", optional = true }
 sgx-types = { path = "../sgx-types", default-features = false, features = ["urts"] }
-libc      = "0.2"
+libc      = { version = "0.2" }
+object    = { version = "0.37", optional = true }
+iced-x86  = { version = "1.21", optional = true }

sgx-urts/src/lib.rs

@@ -28,6 +28,8 @@ pub mod net;
 pub mod pipe;
 pub mod process;
 pub mod signal;
+#[cfg(feature = "simulate_utils")]
+pub mod simulate;
 pub mod socket;
 pub mod sys;
 pub mod thread;