Make mbedtls compile on windows

fortanix · Mar 20, 2023 · 745c2a4 · 745c2a4
1 parent 4029adb
commit 745c2a4
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 24 deletions.
diff --git a/mbedtls-sys/Cargo.toml b/mbedtls-sys/Cargo.toml
@@ -26,6 +26,9 @@ libc = { version = "0.2.0", optional = true }
 [target.'cfg(unix)'.dependencies]
 libc = { version = "0.2.0" }
 
+[target.'cfg(windows)'.dependencies]
+libc = { version = "0.2.0" }
+
 [build-dependencies]
 bindgen = "0.58.0"
 cmake = "0.1.17"

diff --git a/mbedtls-sys/build/bindgen.rs b/mbedtls-sys/build/bindgen.rs
@@ -88,12 +88,13 @@ impl super::BuildConfig {
         }
 
         let mut cc = cc::Build::new();
-        cc.include(&self.mbedtls_include)
-        .flag(&format!(
-            "-DMBEDTLS_CONFIG_FILE=\"{}\"",
-            self.config_h.to_str().expect("config.h UTF-8 error")
-        ));
-
+        if cc.get_compiler().is_like_msvc() {
+            cc.flag("--driver-mode=cl");
+        }
+        cc.include(&self.mbedtls_include).define(
+            "MBEDTLS_CONFIG_FILE",
+            Some(format!(r#""{}""#, self.config_h.to_str().expect("config.h UTF-8 error")).as_str()),
+        );
         for cflag in &self.cflags {
             cc.flag(cflag);
         }
@@ -125,6 +126,8 @@ impl super::BuildConfig {
             .allowlist_var("^(?i)mbedtls_.*")
             .allowlist_recursively(false)
             .blocklist_type("^mbedtls_time_t$")
+            .blocklist_function("^mbedtls_platform_set_vsnprintf$")
+            .blocklist_item("^mbedtls_vsnprintf$")
             .use_core()
             .ctypes_prefix("::types::raw_types")
             .parse_callbacks(Box::new(MbedtlsParseCallbacks))

diff --git a/mbedtls-sys/build/cmake.rs b/mbedtls-sys/build/cmake.rs
@@ -17,7 +17,7 @@ impl super::BuildConfig {
         ))
         .define("ENABLE_PROGRAMS", "OFF")
         .define("ENABLE_TESTING", "OFF")
-        .build_target("lib");
+        .build_target("install");
         for cflag in &self.cflags {
             cmk.cflag(cflag);
         }
@@ -40,16 +40,7 @@ impl super::BuildConfig {
 
         let mut dst = cmk.build();
 
-        dst.push("build");
-        dst.push("library");
-        println!(
-            "cargo:rustc-link-search=native={}",
-            dst.to_str().expect("link-search UTF-8 error")
-        );
-
-        assert!(dst.pop());
-        dst.push("crypto");
-        dst.push("library");
+        dst.push("lib");
         println!(
             "cargo:rustc-link-search=native={}",
             dst.to_str().expect("link-search UTF-8 error")

diff --git a/mbedtls-sys/build/features.rs b/mbedtls-sys/build/features.rs
@@ -45,14 +45,14 @@ impl Features {
             }
         }
         if let Some(components) = self.with_feature("std") {
-            if env_have_target_cfg("family", "unix") {
+            if env_have_target_cfg("family", "unix") || env_have_target_cfg("family", "windows") {
                 components.insert("net");
                 components.insert("fs");
                 components.insert("entropy");
             }
         }
         if let Some(components) = self.with_feature("time") {
-            if !have_custom_gmtime_r && env_have_target_cfg("family", "unix") {
+            if !have_custom_gmtime_r && (env_have_target_cfg("family", "unix") || env_have_target_cfg("family", "windows")) {
                 components.insert("libc");
             } else {
                 components.insert("custom");

diff --git a/mbedtls-sys/src/types.rs b/mbedtls-sys/src/types.rs
@@ -76,7 +76,7 @@ pub mod raw_types {
     }
 }
 
-#[cfg(unix)]
+#[cfg(any(unix, windows))]
 extern crate libc;
 
 #[cfg(std_component = "fs")]

diff --git a/mbedtls/src/pk/mod.rs b/mbedtls/src/pk/mod.rs
@@ -10,6 +10,7 @@
 use crate::alloc_prelude::*;
 use mbedtls_sys::*;
 
+pub use mbedtls_sys::ecp_group_id;
 use mbedtls_sys::types::raw_types::c_void;
 
 use core::ptr;
@@ -41,9 +42,9 @@ pub use crate::ecp::EcGroup;
 pub use dhparam::Dhm;
 
 // SHA-256("Fortanix")[:4]
-const CUSTOM_PK_TYPE: pk_type_t = 0x8b205408 as pk_type_t;
+const CUSTOM_PK_TYPE: pk_type_t = 0x8b205408u32 as pk_type_t;
 
-const RAW_RSA_DECRYPT : i32 = 1040451858;
+const RAW_RSA_DECRYPT: i32 = 1040451858;
 
 define!(
     #[c_ty(pk_type_t)]
@@ -116,7 +117,7 @@ unsafe extern "C" fn free_custom_pk_ctx(p: *mut c_void) {
     let _ = Box::from_raw(p as *mut CustomPkContext);
 }
 
-extern "C" fn custom_pk_can_do(_t: u32) -> i32 {
+extern "C" fn custom_pk_can_do(_t: pk_type_t) -> i32 {
     0
 }
 

diff --git a/mbedtls/src/rust_printf.c b/mbedtls/src/rust_printf.c
@@ -8,6 +8,12 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#ifdef _WIN32
+#define alloca _alloca
+#include <malloc.h>
+#else
+#include <alloca.h>
+#endif
 
 extern void mbedtls_log(const char* msg);
 
@@ -22,7 +28,7 @@ extern int mbedtls_printf(const char *fmt, ...) {
        return -1;
 
     n++;
-    char p[n];
+    char *p = alloca(n);
 
     va_start(ap,fmt);
     n=vsnprintf(p,n,fmt,ap);