Rename sys crates to ffi

The `mc-sgx-???-sys` crates have been renamed to `mc-sgx-???-ffi`. This renaming is to allow for a more amenable API with a `sys` feature to utilize the system version of the SGX SDK.
mobilecoinfoundation · Jul 28, 2022 · d8ac511 · d8ac511
1 parent 22af30e
commit d8ac511
Show file tree

Hide file tree

Showing 33 changed files with 58 additions and 58 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,18 +1,18 @@
 [workspace]
 resolver = "2"
 members = [
-    "core/sys/types",
+    "core/ffi/types",
     "core/build",
-    "crypto/sys/types",
-    "crypto/sys",
+    "crypto/ffi/types",
+    "crypto/ffi",
     "panic/abort",
     "quote_verify",
-    "service/sys",
-    "service/sys/types",
-    "trts/sys",
+    "service/ffi",
+    "service/ffi/types",
+    "trts/ffi",
     "urts",
-    "urts/sys",
-    "urts/sys/types",
+    "urts/ffi",
+    "urts/ffi/types",
 ]
 exclude = [
     "test_enclave",

diff --git a/core/sys/types/Cargo.toml → core/ffi/types/Cargo.toml b/core/sys/types/Cargo.toml → core/ffi/types/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "mc-sgx-core-sys-types"
+name = "mc-sgx-core-ffi-types"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/core/sys/types/build.rs → core/ffi/types/build.rs b/core/sys/types/build.rs → core/ffi/types/build.rs
diff --git a/core/sys/types/src/lib.rs → core/ffi/types/src/lib.rs b/core/sys/types/src/lib.rs → core/ffi/types/src/lib.rs
diff --git a/crypto/sys/Cargo.toml → crypto/ffi/Cargo.toml b/crypto/sys/Cargo.toml → crypto/ffi/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "mc-sgx-crypto-sys"
+name = "mc-sgx-crypto-ffi"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-mc-sgx-core-sys-types = { path = "../../core/sys/types" }
-mc-sgx-crypto-sys-types = { path = "types" }
+mc-sgx-core-ffi-types = { path = "../../core/ffi/types" }
+mc-sgx-crypto-ffi-types = { path = "types" }
 
 [dev-dependencies]
 sha2 = "0.10.2"

diff --git a/crypto/sys/build.rs → crypto/ffi/build.rs b/crypto/sys/build.rs → crypto/ffi/build.rs
diff --git a/crypto/sys/src/lib.rs → crypto/ffi/src/lib.rs b/crypto/sys/src/lib.rs → crypto/ffi/src/lib.rs
@@ -6,9 +6,9 @@
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case)]
 
 pub use core::ffi::c_size_t as size_t;
-pub use mc_sgx_core_sys_types::sgx_status_t;
+pub use mc_sgx_core_ffi_types::sgx_status_t;
 
-pub use mc_sgx_crypto_sys_types::{
+pub use mc_sgx_crypto_ffi_types::{
     sgx_aes_ctr_128bit_key_t, sgx_aes_gcm_128bit_key_t, sgx_aes_gcm_128bit_tag_t,
     sgx_aes_state_handle_t, sgx_cmac_128bit_key_t, sgx_cmac_128bit_tag_t, sgx_cmac_state_handle_t,
     sgx_ec256_dh_shared_t, sgx_ec256_private_t, sgx_ec256_public_t, sgx_ec256_signature_t,

diff --git a/crypto/sys/types/Cargo.toml → crypto/ffi/types/Cargo.toml b/crypto/sys/types/Cargo.toml → crypto/ffi/types/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "mc-sgx-crypto-sys-types"
+name = "mc-sgx-crypto-ffi-types"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/crypto/sys/types/build.rs → crypto/ffi/types/build.rs b/crypto/sys/types/build.rs → crypto/ffi/types/build.rs
diff --git a/crypto/sys/types/src/lib.rs → crypto/ffi/types/src/lib.rs b/crypto/sys/types/src/lib.rs → crypto/ffi/types/src/lib.rs
diff --git a/service/sys/Cargo.toml → service/ffi/Cargo.toml b/service/sys/Cargo.toml → service/ffi/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "mc-sgx-service-sys"
+name = "mc-sgx-service-ffi"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-mc-sgx-service-sys-types = { path = "types" }
-mc-sgx-core-sys-types = { path = "../../core/sys/types" }
+mc-sgx-service-ffi-types = { path = "types" }
+mc-sgx-core-ffi-types = { path = "../../core/ffi/types" }
 
 [build-dependencies]
 bindgen = "0.60.1"

diff --git a/service/sys/build.rs → service/ffi/build.rs b/service/sys/build.rs → service/ffi/build.rs
diff --git a/service/sys/src/lib.rs → service/ffi/src/lib.rs b/service/sys/src/lib.rs → service/ffi/src/lib.rs
@@ -4,11 +4,11 @@
 #![no_std]
 #![allow(non_camel_case_types, non_snake_case, non_upper_case_globals)]
 
-use mc_sgx_core_sys_types::{
+use mc_sgx_core_ffi_types::{
     sgx_attributes_t, sgx_key_128bit_t, sgx_key_request_t, sgx_misc_select_t, sgx_report_data_t,
     sgx_report_t, sgx_status_t, sgx_target_info_t,
 };
-use mc_sgx_service_sys_types::{
+use mc_sgx_service_ffi_types::{
     sgx_dh_msg1_t, sgx_dh_msg2_t, sgx_dh_msg3_t, sgx_dh_session_enclave_identity_t,
     sgx_dh_session_role_t, sgx_dh_session_t, sgx_report2_mac_struct_t, sgx_sealed_data_t,
 };

diff --git a/service/sys/types/Cargo.toml → service/ffi/types/Cargo.toml b/service/sys/types/Cargo.toml → service/ffi/types/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
-name = "mc-sgx-service-sys-types"
+name = "mc-sgx-service-ffi-types"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-mc-sgx-core-sys-types = { path = "../../../core/sys/types" }
+mc-sgx-core-ffi-types = { path = "../../../core/ffi/types" }
 
 [build-dependencies]
 bindgen = "0.60.1"

diff --git a/service/sys/types/build.rs → service/ffi/types/build.rs b/service/sys/types/build.rs → service/ffi/types/build.rs
diff --git a/service/sys/types/src/lib.rs → service/ffi/types/src/lib.rs b/service/sys/types/src/lib.rs → service/ffi/types/src/lib.rs
@@ -12,7 +12,7 @@
 )]
 
 mod bindings {
-    use mc_sgx_core_sys_types::{
+    use mc_sgx_core_ffi_types::{
         sgx_attributes_t, sgx_config_id_t, sgx_config_svn_t, sgx_isv_svn_t, sgx_isvext_prod_id_t,
         sgx_isvfamily_id_t, sgx_key_request_t, sgx_mac_t, sgx_misc_select_t, sgx_prod_id_t,
         sgx_report_body_t, sgx_report_t, sgx_target_info_t,

diff --git a/test_enclave/Cargo.toml b/test_enclave/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-mc-sgx-urts-sys-types = { path = "../urts/sys/types" }
-mc-sgx-core-sys-types = { path = "../core/sys/types" }
+mc-sgx-urts-ffi-types = { path = "../urts/ffi/types" }
+mc-sgx-core-ffi-types = { path = "../core/ffi/types" }
 
 [features]
 hw = []

diff --git a/test_enclave/src/lib.rs b/test_enclave/src/lib.rs
@@ -5,6 +5,6 @@
 pub static ENCLAVE: &'static [u8] =
     include_bytes!(concat!(env!("OUT_DIR"), "/libenclave.signed.so"));
 
-use mc_sgx_core_sys_types::sgx_status_t;
-use mc_sgx_urts_sys_types::sgx_enclave_id_t;
+use mc_sgx_core_ffi_types::sgx_status_t;
+use mc_sgx_urts_ffi_types::sgx_enclave_id_t;
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
diff --git a/trts/sys/Cargo.toml → trts/ffi/Cargo.toml b/trts/sys/Cargo.toml → trts/ffi/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "mc-sgx-trts-sys"
+name = "mc-sgx-trts-ffi"
 version = "0.1.0"
 edition = "2021"
 
@@ -12,7 +12,7 @@ default = []
 hw = []
 
 [dependencies]
-mc-sgx-core-sys-types = { path = "../../core/sys/types" }
+mc-sgx-core-ffi-types = { path = "../../core/ffi/types" }
 
 [build-dependencies]
 bindgen = "0.60.1"

diff --git a/trts/sys/README.md → trts/ffi/README.md b/trts/sys/README.md → trts/ffi/README.md
diff --git a/trts/sys/build.rs → trts/ffi/build.rs b/trts/sys/build.rs → trts/ffi/build.rs
diff --git a/trts/sys/src/lib.rs → trts/ffi/src/lib.rs b/trts/sys/src/lib.rs → trts/ffi/src/lib.rs
@@ -6,6 +6,6 @@
 #![allow(non_upper_case_globals, non_camel_case_types, non_snake_case)]
 
 pub use core::ffi::c_size_t as size_t;
-pub use mc_sgx_core_sys_types::sgx_status_t;
+pub use mc_sgx_core_ffi_types::sgx_status_t;
 
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
diff --git a/urts/Cargo.toml b/urts/Cargo.toml
@@ -4,10 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-mc-sgx-urts-sys = { path = "sys", default-features = false }
+mc-sgx-urts-ffi = { path = "ffi", default-features = false }
 
 [features]
-hw = ["mc-sgx-urts-sys/hw"]
+hw = ["mc-sgx-urts-ffi/hw"]
 default = []
 
 [dev-dependencies]

diff --git a/urts/sys/Cargo.toml → urts/ffi/Cargo.toml b/urts/sys/Cargo.toml → urts/ffi/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "mc-sgx-urts-sys"
+name = "mc-sgx-urts-ffi"
 version = "0.1.0"
 edition = "2021"
 
@@ -8,8 +8,8 @@ hw = []
 default = []
 
 [dependencies]
-mc-sgx-urts-sys-types = { path = "types" }
-mc-sgx-core-sys-types = { path = "../../core/sys/types" }
+mc-sgx-urts-ffi-types = { path = "types" }
+mc-sgx-core-ffi-types = { path = "../../core/ffi/types" }
 
 [build-dependencies]
 bindgen = "0.60.1"

diff --git a/urts/sys/README.md → urts/ffi/README.md b/urts/sys/README.md → urts/ffi/README.md
diff --git a/urts/sys/build.rs → urts/ffi/build.rs b/urts/sys/build.rs → urts/ffi/build.rs
diff --git a/urts/sys/src/lib.rs → urts/ffi/src/lib.rs b/urts/sys/src/lib.rs → urts/ffi/src/lib.rs
@@ -5,8 +5,8 @@
 #![allow(non_camel_case_types, non_snake_case, non_upper_case_globals)]
 
 pub use core::ffi::c_size_t as size_t;
-pub use mc_sgx_core_sys_types::{sgx_status_t, sgx_target_info_t};
-pub use mc_sgx_urts_sys_types::{sgx_enclave_id_t, sgx_launch_token_t, sgx_misc_attribute_t};
+pub use mc_sgx_core_ffi_types::{sgx_status_t, sgx_target_info_t};
+pub use mc_sgx_urts_ffi_types::{sgx_enclave_id_t, sgx_launch_token_t, sgx_misc_attribute_t};
 
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 

diff --git a/urts/sys/types/Cargo.toml → urts/ffi/types/Cargo.toml b/urts/sys/types/Cargo.toml → urts/ffi/types/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "mc-sgx-urts-sys-types"
+name = "mc-sgx-urts-ffi-types"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/urts/sys/types/README.md → urts/ffi/types/README.md b/urts/sys/types/README.md → urts/ffi/types/README.md
diff --git a/urts/sys/types/build.rs → urts/ffi/types/build.rs b/urts/sys/types/build.rs → urts/ffi/types/build.rs
diff --git a/urts/sys/types/src/lib.rs → urts/ffi/types/src/lib.rs b/urts/sys/types/src/lib.rs → urts/ffi/types/src/lib.rs
diff --git a/urts/src/lib.rs b/urts/src/lib.rs
@@ -2,7 +2,7 @@
 //! Provides rust wrappers for the SGX untrusted runtime system (uRTS)
 //! functionality
 
-use mc_sgx_urts_sys::{
+use mc_sgx_urts_ffi::{
     sgx_create_enclave_from_buffer_ex, sgx_destroy_enclave, sgx_enclave_id_t, sgx_status_t,
 };
 use std::{ops::Deref, os::raw::c_int, ptr};