Merge pull request #241 from LedgerHQ/y333/nbgl_support_for_nanos

Y333/nbgl support for nanos

Author: yogh333

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-ledger"
-version = "1.6.0"
+version = "1.7.0"
 authors = ["yhql", "agrojean-ledger", "y333"]
 description = "Build and sideload Ledger devices apps"
 categories = ["development-tools::cargo-plugins"]

cargo-ledger/Cargo.toml

@@ -1,19 +1,39 @@
 use std::path::Path;
 use std::process::Command;
+use std::str::from_utf8;
 
 pub fn install_targets() {
-    println!("[ ] Checking for installed custom targets...");
+    println!("[ ] Install custom targets...");
     // Check if target files are installed
+    let mut args: Vec<String> = vec![];
+    match std::env::var("RUST_NIGHTLY") {
+        Ok(version) => {
+            println!(
+                "Install custom targets for nightly toolchain: {}",
+                version
+            );
+            args.push(format!("+{}", version));
+        }
+        Err(_) => {
+            let rustup_cmd =
+                Command::new("rustup").arg("default").output().unwrap();
+            println!(
+                "Install custom targets for default toolchain {}",
+                from_utf8(rustup_cmd.stdout.as_slice()).unwrap()
+            );
+        }
+    }
+    args.push(String::from("--print"));
+    args.push(String::from("sysroot"));
     let sysroot_cmd = Command::new("rustc")
-        .arg("--print")
-        .arg("sysroot")
+        .args(&args)
         .output()
         .expect("failed to call rustc")
         .stdout;
     let sysroot_cmd = std::str::from_utf8(&sysroot_cmd).unwrap().trim();
 
     let target_files_url = Path::new(
-        "https://raw.githubusercontent.com/LedgerHQ/ledger-device-rust-sdk/a7fb841160df34b8de268b136704c8b2ed8f9973/ledger_device_sdk/"
+        "https://raw.githubusercontent.com/LedgerHQ/ledger-device-rust-sdk/refs/tags/ledger_secure_sdk_sys%401.7.0/ledger_secure_sdk_sys"
     );
     let sysroot = Path::new(sysroot_cmd).join("lib").join("rustlib");
 

cargo-ledger/src/setup.rs

@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.20.4"
+version = "1.21.0"
 authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
 edition = "2021"
 license.workspace = true
@@ -21,13 +21,13 @@ 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.6.7" }
+ledger_secure_sdk_sys = { path = "../ledger_secure_sdk_sys", version = "1.7.0" }
 
 [features]
 debug = []
 speculos = []
-ccid = []
 heap = [ "ledger_secure_sdk_sys/heap" ]
+nbgl = [ "ledger_secure_sdk_sys/nbgl" ]
 
 default = [ "heap" ]
 

ledger_device_sdk/Cargo.toml

@@ -5,8 +5,6 @@ use ledger_secure_sdk_sys::buttons::{get_button_event, ButtonEvent, ButtonsState
 use ledger_secure_sdk_sys::seph as sys_seph;
 use ledger_secure_sdk_sys::*;
 
-#[cfg(feature = "ccid")]
-use crate::ccid;
 use crate::seph;
 use core::convert::{Infallible, TryFrom};
 use core::ops::{Index, IndexMut};
@@ -193,10 +191,6 @@ impl Comm {
                 sys_seph::seph_send(&[sys_seph::SephTags::RawAPDU as u8, len[0], len[1]]);
                 sys_seph::seph_send(&self.apdu_buffer[..self.tx]);
             }
-            #[cfg(feature = "ccid")]
-            APDU_USB_CCID => {
-                ccid::send(&self.apdu_buffer[..self.tx]);
-            }
             #[cfg(any(target_os = "nanox", target_os = "stax", target_os = "flex"))]
             APDU_BLE => {
                 ble::send(&self.apdu_buffer[..self.tx]);
@@ -378,6 +372,10 @@ impl Comm {
         match seph::Events::from(tag) {
             #[cfg(not(any(target_os = "stax", target_os = "flex")))]
             seph::Events::ButtonPush => {
+                #[cfg(feature = "nbgl")]
+                unsafe {
+                    ux_process_button_event(spi_buffer.as_mut_ptr());
+                }
                 let button_info = spi_buffer[3] >> 1;
                 if let Some(btn_evt) = get_button_event(&mut self.buttons, button_info) {
                     return Some(Event::Button(btn_evt));

ledger_device_sdk/build.rs

@@ -10,8 +10,6 @@
 #[cfg(any(target_os = "nanox", target_os = "stax", target_os = "flex"))]
 pub mod ble;
 
-#[cfg(feature = "ccid")]
-pub mod ccid;
 pub mod ecc;
 pub mod hash;
 pub mod hmac;
@@ -24,9 +22,9 @@ pub mod seph;
 
 pub mod testing;
 
-#[cfg(any(target_os = "stax", target_os = "flex"))]
+#[cfg(any(target_os = "stax", target_os = "flex", feature = "nbgl"))]
 pub mod nbgl;
-#[cfg(not(any(target_os = "stax", target_os = "flex")))]
+#[cfg(not(any(target_os = "stax", target_os = "flex", feature = "nbgl")))]
 pub mod ui;
 
 pub mod uxapp;

ledger_device_sdk/src/ccid.rs

@@ -10,6 +10,7 @@ use ledger_secure_sdk_sys::*;
 
 pub mod nbgl_address_review;
 pub mod nbgl_choice;
+#[cfg(any(target_os = "stax", target_os = "flex"))]
 pub mod nbgl_generic_review;
 pub mod nbgl_home_and_settings;
 pub mod nbgl_review;
@@ -20,6 +21,7 @@ pub mod nbgl_streaming_review;
 
 pub use nbgl_address_review::*;
 pub use nbgl_choice::*;
+#[cfg(any(target_os = "stax", target_os = "flex"))]
 pub use nbgl_generic_review::*;
 pub use nbgl_home_and_settings::*;
 pub use nbgl_review::*;
@@ -105,6 +107,7 @@ unsafe extern "C" fn quit_callback() {
     G_ENDED = true;
 }
 
+#[cfg(any(target_os = "stax", target_os = "flex"))]
 unsafe extern "C" fn rejected_callback() {
     G_RET = SyncNbgl::UxSyncRetRejected.into();
     G_ENDED = true;
@@ -274,6 +277,7 @@ pub enum TuneIndex {
 // Direct translation of the C original. This was done to
 // avoid compiling `os_io_seproxyhal.c` which includes many other things
 #[no_mangle]
+#[cfg(any(target_os = "stax", target_os = "flex"))]
 extern "C" fn io_seproxyhal_play_tune(tune_index: u8) {
     let mut buffer = [0u8; 4];
     let mut spi_buffer = [0u8; 128];

ledger_device_sdk/src/io.rs

@@ -173,7 +173,10 @@ impl<'a> NbglHomeAndSettings {
                     };
                     SWITCH_ARRAY[i].initState = state;
                     SWITCH_ARRAY[i].token = (FIRST_USER_TOKEN + i as u32) as u8;
-                    SWITCH_ARRAY[i].tuneId = TuneIndex::TapCasual as u8;
+                    #[cfg(any(target_os = "stax", target_os = "flex"))]
+                    {
+                        SWITCH_ARRAY[i].tuneId = TuneIndex::TapCasual as u8;
+                    }
                 }
 
                 self.content = nbgl_content_t {
@@ -257,7 +260,10 @@ impl<'a> NbglHomeAndSettings {
                 };
                 SWITCH_ARRAY[i].initState = state;
                 SWITCH_ARRAY[i].token = (FIRST_USER_TOKEN + i as u32) as u8;
-                SWITCH_ARRAY[i].tuneId = TuneIndex::TapCasual as u8;
+                #[cfg(any(target_os = "stax", target_os = "flex"))]
+                {
+                    SWITCH_ARRAY[i].tuneId = TuneIndex::TapCasual as u8;
+                }
             }
 
             self.content = nbgl_content_t {