Skip to content

Commit

Permalink
fix nfc oob write
Browse files Browse the repository at this point in the history
  • Loading branch information
jmartins-ledger authored and tjoly-ledger committed Sep 27, 2023
1 parent fe88759 commit 79cfbb7
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions src/os_io_seproxyhal.c
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,13 @@ void io_seproxyhal_handle_capdu_event(void)
#ifdef HAVE_NFC
void io_seproxyhal_handle_nfc_recv_event(void)
{
size_t max = MIN(sizeof(G_io_apdu_buffer), sizeof(G_io_seproxyhal_spi_buffer) - 3);
size_t size = U2BE(G_io_seproxyhal_spi_buffer, 1);

G_io_app.apdu_media = IO_APDU_MEDIA_NFC;
G_io_app.apdu_state = APDU_NFC;
G_io_app.apdu_length = ((G_io_seproxyhal_spi_buffer[1] << 8) & 0xFF00)
| (G_io_seproxyhal_spi_buffer[2] & 0x00FF);
G_io_app.apdu_length = MIN(size, max);

memcpy(G_io_apdu_buffer, &G_io_seproxyhal_spi_buffer[3], G_io_app.apdu_length);
}
#endif
Expand Down Expand Up @@ -1002,7 +1005,7 @@ void io_seproxyhal_setup_ticker(unsigned int interval_ms)
buffer[1] = 0;
buffer[2] = 2;
buffer[3] = (interval_ms >> 8) & 0xff;
buffer[4] = (interval_ms) &0xff;
buffer[4] = (interval_ms) & 0xff;
io_seproxyhal_spi_send(buffer, 5);
}

Expand Down Expand Up @@ -1553,7 +1556,7 @@ unsigned short io_exchange(unsigned char channel, unsigned short tx_len)
&& os_global_pin_is_validated() != BOLOS_TRUE) {
tx_len = 0;
G_io_apdu_buffer[(tx_len)++] = (SWO_SEC_PIN_15 >> 8) & 0xFF;
G_io_apdu_buffer[(tx_len)++] = (SWO_SEC_PIN_15) &0xFF;
G_io_apdu_buffer[(tx_len)++] = (SWO_SEC_PIN_15) & 0xFF;
channel &= ~IO_FLAGS;
goto reply_apdu;
}
Expand Down

0 comments on commit 79cfbb7

Please sign in to comment.