Merge pull request #1176 from LedgerHQ/spo-api-level-24-backport

Spo api level 24 backport

Author: sportron-ledger

lib_ccid/include/ccid_types.h

@@ -149,8 +149,7 @@ typedef struct {
     uint16_t       tx_message_length;
     uint16_t       tx_message_offset;
 
-    uint8_t *tx_packet_buffer;
-    uint8_t  tx_packet_length;
+    uint8_t tx_packet_length;
 
     ccid_protocol_data_t0_t protocol_data;
 

lib_ccid/src/ccid_transport.c

@@ -150,7 +150,7 @@ void CCID_TRANSPORT_tx(ccid_transport_t *handle,
     // Fill header
     if (buffer) {
         tx_packet_buffer[0] = handle->bulk_msg_header.in.msg_type;
-        U4LE_ENCODE(handle->tx_packet_buffer, 1, handle->bulk_msg_header.in.length);
+        U4LE_ENCODE(tx_packet_buffer, 1, handle->bulk_msg_header.in.length);
         tx_packet_buffer[5] = handle->bulk_msg_header.in.slot_number;
         tx_packet_buffer[6] = handle->bulk_msg_header.in.seq_number;
         tx_packet_buffer[7] = handle->bulk_msg_header.in.status;

lib_stusb/src/usbd_ledger.c

@@ -674,6 +674,18 @@ void USBD_LEDGER_start(void)
         USBD_Start(&usbd_ledger_data.usbd_handle);
         usbd_ledger_data.state = USBD_LEDGER_STATE_RUNNING;
     }
+    else {
+        for (int index = 0; index < usbd_ledger_data.nb_of_class; index++) {
+            usbd_class_info_t *class_info = usbd_ledger_data.class[index];
+            if (class_info) {
+                if (class_info->init) {
+                    USBD_StatusTypeDef ret = ((usbd_class_init_t) PIC(class_info->init))(
+                        &usbd_ledger_data.usbd_handle, class_info->cookie);
+                    UNUSED(ret);
+                }
+            }
+        }
+    }
 }
 
 void USB_LEDGER_stop(void)

lib_stusb/src/usbd_ledger_hid_u2f.c

@@ -23,6 +23,9 @@
 #include "u2f_types.h"
 #include "usbd_ledger_hid_u2f.h"
 
+#ifdef HAVE_BOLOS
+#include "cx_crc_internal.h"
+#endif  // !HAVE_BOLOS
 
 /* Private enumerations ------------------------------------------------------*/
 enum ledger_hid_u2f_state_t {
@@ -607,9 +610,15 @@ int32_t USBD_LEDGER_HID_U2F_data_ready(USBD_HandleTypeDef *pdev,
                     // so no way to check the value
                 }
 
+#ifdef HAVE_BOLOS
+                uint16_t crc = cx_crc16_update_internal(0,
+                                                        handle->transport_data.rx_message_buffer,
+                                                        handle->transport_data.rx_message_length);
+#else   // !HAVE_BOLOS
                 uint16_t crc = cx_crc16_update(0,
                                                handle->transport_data.rx_message_buffer,
                                                handle->transport_data.rx_message_length);
+#endif  // !HAVE_BOLOS
                 if (!length_ok) {
                     error_msg[0] = 0x67;
                     error_msg[1] = 0x00;