Merge branch 'maint/cargo-cc-werror'

Author: NickeZ

.github/workflows/ci-common.yml

@@ -10,6 +10,9 @@ on:
       container-version:
         required: true
         type: string
+env:
+  RUSTFLAGS: "-Dwarnings"
+  CFLAGS: "-Werror"
 
 jobs:
   check-sigs:
@@ -54,8 +57,6 @@ jobs:
     runs-on: ubuntu-22.04
     container:
       image: ${{ inputs.container-repo }}:${{ inputs.container-version }}
-      env:
-        RUSTFLAGS: "-Dwarnings"
     steps:
       - name: Clone the repo
         uses: actions/checkout@v4
@@ -81,8 +82,6 @@ jobs:
     runs-on: ubuntu-22.04
     container:
       image: ${{ inputs.container-repo }}:${{ inputs.container-version }}
-      env:
-        RUSTFLAGS: "-Dwarnings"
     steps:
       - name: Clone the repo
         uses: actions/checkout@v4
@@ -170,8 +169,6 @@ jobs:
     runs-on: ubuntu-22.04
     container:
       image: ${{ inputs.container-repo }}:${{ inputs.container-version }}
-      env:
-        RUSTFLAGS: "-Dwarnings"
     steps:
       - name: Clone the repo
         uses: actions/checkout@v4

CMakeLists.txt

@@ -243,6 +243,10 @@ set(CMAKE_C_FLAGS_RELEASE "-Os -DNDEBUG")
 set(CMAKE_C_FLAGS_DEBUG "-Os -ggdb")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Os -ggdb -DNDEBUG")
 
+if(DEFINED ENV{RUSTFLAGS})
+    set(RUSTFLAGS $ENV{RUSTFLAGS})
+endif()
+
 #-----------------------------------------------------------------------------
 # Print system information and build options
 
@@ -270,6 +274,7 @@ message(STATUS "Compiler cache:         ${CMAKE_C_COMPILER_LAUNCHER}")
 message(STATUS "Linker:                 ${CMAKE_LINKER}")
 message(STATUS "Archiver:               ${CMAKE_AR}")
 message(STATUS "Default CFLAGS:         ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}")
+message(STATUS "Default RUSTFLAGS:      ${RUSTFLAGS}")
 message(STATUS "Default EXE LDFLAGS:    ${CMAKE_EXE_LINKER_FLAGS}")
 message(STATUS "            - Options -")
 message(STATUS "Build type:             ${CMAKE_BUILD_TYPE}")

src/CMakeLists.txt

@@ -230,12 +230,12 @@ else()
   set(RUST_PROFILE "release")
   set(RUST_CARGO_FLAGS "--release")
   # For binary reproducibility, strip path prefixes that can be different depending on environment (e.g. /home/<user>, etc.).
-  set(RUSTFLAGS "--remap-path-prefix=${CMAKE_CURRENT_SOURCE_DIR}/rust=src --remap-path-prefix=$ENV{HOME}=")
+  string(APPEND RUSTFLAGS " --remap-path-prefix=${CMAKE_CURRENT_SOURCE_DIR}/rust=src --remap-path-prefix=$ENV{HOME}=")
 endif()
 
 # Use libsecp256k1 that we link ourselves.
 # See https://github.com/rust-bitcoin/rust-secp256k1/tree/7c8270a8506e31731e540fab7ee1abde1f48314e/secp256k1-sys#linking-to-external-symbols
-set(RUSTFLAGS "${RUSTFLAGS} --cfg=rust_secp_no_symbol_renaming")
+string(APPEND RUSTFLAGS " --cfg=rust_secp_no_symbol_renaming")
 
 if(CMAKE_CROSSCOMPILING)
   set(RUST_TARGET_ARCH thumbv7em-none-eabi)

src/rust/bitbox02-sys/build.rs

@@ -270,7 +270,7 @@ pub fn main() -> Result<(), &'static str> {
     let arm_sysroot = env::var("CMAKE_SYSROOT").unwrap_or("/usr/local/arm-none-eabi".to_string());
     let arm_sysroot = format!("--sysroot={arm_sysroot}");
 
-    let extra_flags = if cross_compiling {
+    let mut extra_flags = if cross_compiling {
         vec![
             "-D__SAMD51J20A__",
             "--target=thumbv7em-none-eabi",
@@ -284,6 +284,15 @@ pub fn main() -> Result<(), &'static str> {
         vec!["-DTESTING", "-D_UNIT_TEST_", "-DPRODUCT_BITBOX_MULTI=1"]
     };
 
+    // If user enables -Dwarnings for rust we also want to enable -Werror for C.
+    if let Ok(rustflags) = std::env::var("CARGO_ENCODED_RUSTFLAGS") {
+        for flag in rustflags.split('\x1f') {
+            if flag == "-Dwarnings" {
+                extra_flags.push("-Werror");
+            }
+        }
+    }
+
     let mut includes = vec![
         // $INCLUDES
         "../..",

test/hardware-fakes/include/fake_memory.h

@@ -28,6 +28,7 @@ void memory_read_chunk_fake(uint32_t chunk_num, uint8_t* chunk_out);
 // Size: `FLASH_SHARED_DATA_LEN`.
 void memory_read_shared_bootdata_fake(uint8_t* chunk_out);
 void fake_memory_set_salt_root(const uint8_t* salt_root);
+const uint8_t* fake_memory_get_salt_root(void);
 void memory_bootloader_hash_fake(uint8_t* hash_out);
 void memory_set_bootloader_hash_fake(const uint8_t* fake_hash);
 #endif

test/hardware-fakes/src/fake_memory.c

@@ -225,14 +225,14 @@ static uint8_t _salt_root[32] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
     0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33,
 };
+
 void fake_memory_set_salt_root(const uint8_t* salt_root)
 {
     memcpy(_salt_root, salt_root, 32);
 }
-bool __wrap_memory_get_salt_root(uint8_t* salt_root_out)
+const uint8_t* fake_memory_get_salt_root(void)
 {
-    memcpy(salt_root_out, _salt_root, 32);
-    return true;
+    return _salt_root;
 }
 
 // Arbitrary value.

test/unit-test/framework/src/mock_memory.c

@@ -18,6 +18,7 @@
 #include <stddef.h>
 #include <cmocka.h>
 
+#include <fake_memory.h>
 #include <flags.h>
 #include <memory/memory.h>
 #include <stdio.h>
@@ -67,3 +68,9 @@ bool __wrap_memory_set_mnemonic_passphrase_enabled(bool enabled)
     check_expected(enabled);
     return mock();
 }
+
+bool __wrap_memory_get_salt_root(uint8_t* salt_root_out)
+{
+    memcpy(salt_root_out, fake_memory_get_salt_root(), 32);
+    return true;
+}