feat: add no-std and baremetal features

Manual copy of changes done in: https://github.com/malishav/rust-psa-crypto/tree/baremetal Signed-off-by: Geovane Fedrecheski <[email protected]>
parallaxsecond · Nov 28, 2023 · 2e08c80 · 2e08c80
1 parent da081a5
commit 2e08c80
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/psa-crypto-sys/Cargo.toml b/psa-crypto-sys/Cargo.toml
@@ -24,3 +24,5 @@ static = []
 interface = ["bindgen"]
 operations = ["interface"]
 prefix = []
+no-std = []
+baremetal = ["no-std"]
diff --git a/psa-crypto-sys/build.rs b/psa-crypto-sys/build.rs
@@ -81,11 +81,17 @@ mod common {
             ));
         }
 
+        let mbedtls_mode = if cfg!(feature = "baremetal") {
+            "crypto_baremetal"
+        } else {
+            "crypto"
+        };
+
         // Configure the MbedTLS build for making Mbed Crypto
         if !::std::process::Command::new(mbedtls_config)
             .arg("--write")
             .arg(&(out_dir + "/config.h"))
-            .arg("crypto")
+            .arg(mbedtls_mode)
             .status()
             .map_err(|_| Error::new(ErrorKind::Other, "configuring mbedtls failed"))?
             .success()
@@ -136,6 +142,8 @@ mod common {
             .blocklist_type("max_align_t")
             .generate_comments(false)
             .size_t_is_usize(true)
+            .use_core()
+            .ctypes_prefix("::core::ffi")
             .generate()
             .map_err(|_| {
                 Error::new(
@@ -251,12 +259,17 @@ mod operations {
         }
 
         // Build the MbedTLS libraries
-        let mbed_build_path = Config::new(&mbedtls_dir)
+        let mut mbed_build = Config::new(&mbedtls_dir);
+        let mbed_build = mbed_build
             .cflag(format!("-I{}", out_dir))
             .cflag("-DMBEDTLS_CONFIG_FILE='<config.h>'")
             .define("ENABLE_PROGRAMS", "OFF")
-            .define("ENABLE_TESTING", "OFF")
-            .build();
+            .define("ENABLE_TESTING", "OFF");
+
+        #[cfg(feature = "baremetal")]
+        let mbed_build = mbed_build.define("CMAKE_TRY_COMPILE_TARGET_TYPE", "STATIC_LIBRARY");
+
+        let mbed_build_path = mbed_build.build();
 
         Ok(mbed_build_path)
     }

diff --git a/psa-crypto/Cargo.toml b/psa-crypto/Cargo.toml
@@ -28,3 +28,5 @@ operations = ["psa-crypto-sys/operations", "interface"]
 interface = ["psa-crypto-sys/interface"]
 prefix = ["psa-crypto-sys/prefix"]
 std = []
+no-std = ["psa-crypto-sys/no-std"]
+baremetal = ["no-std", "psa-crypto-sys/baremetal"]
diff --git a/psa-crypto/src/lib.rs b/psa-crypto/src/lib.rs
@@ -9,6 +9,7 @@
 //! for a more complete description of operations and types.
 //! This abstraction is built on top of the `psa-crypto-sys` crate.
 
+#![cfg_attr(feature = "no-std", no_std)]
 #![cfg_attr(not(feature = "std"), no_std)]
 #![allow(renamed_and_removed_lints, unknown_lints)]
 #![deny(