Skip to content

Commit

Permalink
feat: patch mbedtls to compile for baremetal targets
Browse files Browse the repository at this point in the history
  • Loading branch information
geonnave committed Nov 29, 2023
1 parent 4d51c5d commit e2a6872
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 1 deletion.
16 changes: 15 additions & 1 deletion psa-crypto-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@ mod common {
use std::env;
use std::io::{Error, ErrorKind, Result};
use std::path::{Path, PathBuf};
use std::process::Command;

pub fn configure_mbed_crypto() -> Result<()> {
let mbedtls_dir = String::from("./vendor");
let mbedtls_config = mbedtls_dir + "/scripts/config.py";
let mbedtls_config = mbedtls_dir.clone() + "/scripts/config.py";

println!("cargo:rerun-if-changed=src/c/shim.c");
println!("cargo:rerun-if-changed=src/c/shim.h");
Expand All @@ -87,6 +88,19 @@ mod common {
"crypto"
};

if mbedtls_mode == "crypto_baremetal" {
// Apply patch to MbedTLS
let patch_path = Path::new("../patches/0001-Update-config-for-baremetal-targets.patch"); // relative to ./vendor folder
let status = Command::new("git")
.current_dir(&mbedtls_dir)
.args(&["apply", patch_path.to_str().unwrap()])
.status()?;

if !status.success() {
println!("cargo:warning=Could not apply patch to mbedtls: {:?}", patch_path);
}
}

// Configure the MbedTLS build for making Mbed Crypto
if !::std::process::Command::new(mbedtls_config)
.arg("--write")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
From 035aca2948c136e76ec7acfa739e4f0264d55c39 Mon Sep 17 00:00:00 2001
From: Geovane Fedrecheski <[email protected]>
Date: Wed, 29 Nov 2023 11:09:44 +0100
Subject: [PATCH] Update config for baremetal targets

Signed-off-by: Geovane Fedrecheski <[email protected]>
---
scripts/config.py | 15 +++++++++++++++
1 file changed, 15 insertions(+)

diff --git a/scripts/config.py b/scripts/config.py
index 6d5edc7c0..36312df04 100755
--- a/scripts/config.py
+++ b/scripts/config.py
@@ -241,6 +241,7 @@ def full_adapter(name, active, section):
# need to be repeated here.
EXCLUDE_FROM_BAREMETAL = frozenset([
#pylint: disable=line-too-long
+ 'MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS',
'MBEDTLS_ENTROPY_NV_SEED', # requires a filesystem and FS_IO or alternate NV seed hooks
'MBEDTLS_FS_IO', # requires a filesystem
'MBEDTLS_HAVE_TIME', # requires a clock
@@ -270,6 +271,20 @@ def baremetal_adapter(name, active, section):
if name == 'MBEDTLS_NO_PLATFORM_ENTROPY':
# No OS-provided entropy source
return True
+ if name == 'MBEDTLS_ENTROPY_HARDWARE_ALT':
+ # Custom entropy source provided
+ return True
+ if name == 'MBEDTLS_ENTROPY_FORCE_SHA256':
+ # Force SHA-256 accumulator
+ return True
+ if name == 'MBEDTLS_MEMORY_BUFFER_ALLOC_C':
+ return True
+ if name == 'MBEDTLS_PLATFORM_C':
+ return True
+ if name == 'MBEDTLS_PLATFORM_MEMORY':
+ return True
+ if name == 'MBEDTLS_PLATFORM_NO_STD_FUNCTIONS':
+ return True
return include_in_full(name) and keep_in_baremetal(name)

def include_in_crypto(name):
--
2.34.1

0 comments on commit e2a6872

Please sign in to comment.