Merge pull request #284 from LedgerHQ/y333/c_sdk_printf

Weak function management

Author: yogh333

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.24.3"
+version = "1.24.4"
 authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
 edition = "2021"
 license.workspace = true
@@ -21,7 +21,7 @@ rand_core = { version = "0.6.3", default-features = false }
 zeroize = { version = "1.6.0", default-features = false }
 numtoa = "0.2.4"
 const-zero = "0.1.1"
-ledger_secure_sdk_sys = { path = "../ledger_secure_sdk_sys", version = "1.11.0" }
+ledger_secure_sdk_sys = { path = "../ledger_secure_sdk_sys", version = "1.11.1" }
 
 [features]
 debug = []

ledger_device_sdk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ledger_secure_sdk_sys"
-version = "1.11.0"
+version = "1.11.1"
 authors = ["yhql", "agrojean-ledger", "yogh333"]
 edition = "2021"
 license.workspace = true

ledger_secure_sdk_sys/Cargo.toml

@@ -15,13 +15,13 @@ const SDK_C_FILES: [&str; 13] = [
     "src/os.c",
     "src/svc_call.s",
     "src/svc_cx_call.s",
-    "src/syscalls.c",
     "src/os_printf.c",
     "protocol/src/ledger_protocol.c",
     "io/src/os_io.c",
     "io/src/os_io_default_apdu.c",
     "io/src/os_io_seph_cmd.c",
     "io/src/os_io_seph_ux.c",
+    "src/syscalls.c",
 ];
 
 #[derive(Debug, Default, PartialEq)]
@@ -504,7 +504,7 @@ impl SDKBuilder<'_> {
                 .join(format!("target/{}/include", self.device.name)),
         );
 
-        // Configure BLE and NBGL
+        // Configure BLE, NBGL, U2F
         for s in self.device.defines.iter() {
             if s.0 == "HAVE_IO_USB" {
                 configure_lib_usb(&mut command, &self.device.c_sdk);
@@ -521,6 +521,9 @@ impl SDKBuilder<'_> {
                     .include(&glyphs_path)
                     .file(glyphs_path.join("glyphs.c"));
             }
+            if s.0 == "HAVE_IO_U2F" {
+                configure_lib_u2f(&mut command, &self.device.c_sdk);
+            }
         }
 
         // Add the defines found in the Makefile.conf.cx to our build command.
@@ -726,6 +729,11 @@ fn main() {
 // Helper functions
 // --------------------------------------------------
 
+fn configure_lib_u2f(command: &mut cc::Build, c_sdk: &Path) {
+    command.file(c_sdk.join("lib_u2f/src/u2f_transport.c"));
+    command.include(c_sdk.join("lib_u2f/include"));
+}
+
 fn configure_lib_usb(command: &mut cc::Build, c_sdk: &Path) {
     command
         .file(c_sdk.join("lib_stusb/src/usbd_conf.c"))