Merge pull request #254 from LedgerHQ/y333/delay_lock_from_app

Y333/delay lock from app

Author: yogh333

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.22.1"
+version = "1.22.2"
 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.8.0" }
+ledger_secure_sdk_sys = { path = "../ledger_secure_sdk_sys", version = "1.8.1" }
 
 [features]
 debug = []

ledger_device_sdk/Cargo.toml

@@ -397,7 +397,7 @@ impl Comm {
             seph::Events::BleReceive => ble::receive(&mut self.apdu_buffer, spi_buffer),
 
             seph::Events::TickerEvent => {
-                #[cfg(any(target_os = "stax", target_os = "flex"))]
+                #[cfg(any(target_os = "stax", target_os = "flex", feature = "nano_nbgl"))]
                 unsafe {
                     ux_process_ticker_event();
                 }

ledger_device_sdk/src/io.rs

@@ -201,7 +201,12 @@ pub fn handle_event(apdu_buffer: &mut [u8], spi_buffer: &[u8]) {
         #[cfg(any(target_os = "nanox", target_os = "stax", target_os = "flex"))]
         Events::BleReceive => ble::receive(apdu_buffer, spi_buffer),
         Events::CAPDUEvent => handle_capdu_event(apdu_buffer, spi_buffer),
-        Events::TickerEvent => { /* unsafe{ G_io_app.ms += 100; } */ }
+        Events::TickerEvent => {
+            #[cfg(any(target_os = "stax", target_os = "flex", feature = "nano_nbgl"))]
+            unsafe {
+                ux_process_ticker_event();
+            }
+        }
         _ => (),
     }
 }

ledger_device_sdk/src/seph.rs

@@ -11,8 +11,8 @@ pub use ledger_secure_sdk_sys::BOLOS_UX_IGNORE;
 pub use ledger_secure_sdk_sys::BOLOS_UX_OK;
 pub use ledger_secure_sdk_sys::BOLOS_UX_REDRAW;
 
-fn os_ux_rs(params: &bolos_ux_params_t) {
-    unsafe { os_ux(params as *const bolos_ux_params_t as *mut bolos_ux_params_t) };
+unsafe extern "C" {
+    pub unsafe static mut G_ux_params: bolos_ux_params_t;
 }
 
 #[repr(u8)]
@@ -21,31 +21,43 @@ pub enum UxEvent {
     Keyboard = BOLOS_UX_KEYBOARD,
     WakeUp = BOLOS_UX_WAKE_UP,
     ValidatePIN = BOLOS_UX_VALIDATE_PIN,
-    LastID = BOLOS_UX_VALIDATE_PIN + 1,
+    DelayLock = BOLOS_UX_DELAY_LOCK,
+    LastID = BOLOS_UX_DELAY_LOCK + 1,
 }
 
 impl UxEvent {
+    #[allow(unused)]
     pub fn request(&self) -> u32 {
-        let mut params = bolos_ux_params_t::default();
-        params.ux_id = match self {
-            Self::Event => Self::Event as u8,
-            Self::Keyboard => Self::Keyboard as u8,
-            Self::WakeUp => Self::WakeUp as u8,
-            Self::ValidatePIN => {
-                // Perform pre-wake up
-                params.ux_id = Self::WakeUp as u8;
-                os_ux_rs(&params);
+        unsafe {
+            //let mut params = bolos_ux_params_t::default();
+            G_ux_params.ux_id = match self {
+                Self::Event => Self::Event as u8,
+                Self::Keyboard => Self::Keyboard as u8,
+                Self::WakeUp => Self::WakeUp as u8,
+                Self::ValidatePIN => {
+                    // Perform pre-wake up
+                    G_ux_params.ux_id = Self::WakeUp as u8;
+                    os_ux(&raw mut G_ux_params as *mut bolos_ux_params_t);
 
-                Self::ValidatePIN as u8
-            }
-            Self::LastID => panic!("Unknown UX Event"),
-        };
+                    Self::ValidatePIN as u8
+                }
+                Self::DelayLock => {
+                    #[cfg(any(target_os = "stax", target_os = "flex", feature = "nano_nbgl"))]
+                    {
+                        G_ux_params.u.lock_delay.delay_ms = 10000;
+                    }
 
-        os_ux_rs(&params);
+                    Self::DelayLock as u8
+                }
+                Self::LastID => panic!("Unknown UX Event"),
+            };
 
-        match self {
-            Self::ValidatePIN => Self::block(),
-            _ => unsafe { os_sched_last_status(TASK_BOLOS_UX as u32) as u32 },
+            os_ux(&raw mut G_ux_params as *mut bolos_ux_params_t);
+
+            match self {
+                Self::ValidatePIN => Self::block(),
+                _ => os_sched_last_status(TASK_BOLOS_UX as u32) as u32,
+            }
         }
     }
 

ledger_device_sdk/src/uxapp.rs

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

ledger_secure_sdk_sys/Cargo.toml

@@ -251,7 +251,7 @@ void c_reset_bss() {
   memset(bss, 0, bss_len);
 }
 
-bolos_ux_params_t G_ux_params;
+bolos_ux_params_t G_ux_params = {0};
 
 void c_boot_std() {
     // below is a 'manual' implementation of `io_seproxyhal_init`