[io] fix some issues

Author: sportron-ledger

ledger_device_sdk/src/io.rs

@@ -267,7 +267,7 @@ impl Comm {
             self.event_pending = false;
 
             // Reject incomplete APDUs
-            if self.rx_length < 6 {
+            if self.rx_length < 5 {
                 self.reply(StatusWords::BadLen);
                 return None;
             }
@@ -443,7 +443,7 @@ impl Comm {
                 }
                 self.apdu_type = packet_type;
                 self.rx_length = length as usize;
-                self.rx = self.rx_length;
+                self.rx = self.rx_length-1;
                 self.event_pending = true;
                 return self.check_event();
             }
@@ -462,7 +462,7 @@ impl Comm {
         match self.decode_event::<T>(length) {
             Some(Event::Command(_)) => {
                 self.rx_length = length as usize;
-                self.rx = self.rx_length;
+                self.rx = self.rx_length-1;
                 self.event_pending = true;
                 return true;
             }
@@ -560,7 +560,7 @@ impl Comm {
     }
 
     pub fn get_data(&self) -> Result<&[u8], StatusWords> {
-        if self.rx_length == 6 {
+        if self.rx_length == 5 {
             Ok(&[]) // Conforming zero-data APDU
         } else {
             let first_len_byte = self.io_buffer[5] as usize;

ledger_device_sdk/src/uxapp.rs

@@ -27,7 +27,7 @@ pub enum UxEvent {
 
 impl UxEvent {
     #[allow(unused)]
-    pub fn request(&self, comm: &mut Comm) -> u32 {
+    pub fn request(&self) -> u32 {
         unsafe {
             //let mut params = bolos_ux_params_t::default();
             G_ux_params.ux_id = match self {
@@ -55,20 +55,21 @@ impl UxEvent {
             os_ux(&raw mut G_ux_params as *mut bolos_ux_params_t);
 
             match self {
-                Self::ValidatePIN => Self::block(comm),
+                Self::ValidatePIN => Self::block(),
                 _ => os_sched_last_status(TASK_BOLOS_UX as u32) as u32,
             }
         }
     }
 
-    pub fn block(comm: &mut Comm) -> u32 {
+    pub fn block() -> u32 {
         let mut ret = unsafe { os_sched_last_status(TASK_BOLOS_UX as u32) } as u32;
         while ret == BOLOS_UX_IGNORE || ret == BOLOS_UX_CONTINUE {
             if unsafe { os_sched_is_running(TASK_SUBTASKS_START as u32) }
                 != BOLOS_TRUE.try_into().unwrap()
             {
-                sys_seph::io_rx(&mut comm.io_buffer, true);
-                UxEvent::Event.request(comm);
+                let mut spi_buffer = [0u8; 256];
+                sys_seph::io_rx(&mut spi_buffer, true);
+                UxEvent::Event.request();
             } else {
                 unsafe { os_sched_yield(BOLOS_UX_OK as u8) };
             }
@@ -93,7 +94,7 @@ impl UxEvent {
                     event = comm.decode_event(status)
                 }
 
-                UxEvent::Event.request(comm);
+                UxEvent::Event.request();
 
                 if let Option::Some(Event::Command(_)) = event {
                     return (ret, event);