public/simtrace2
1
0 Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-11-08 17:55:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

simtrace2-cardem-pcsc: use new API osmo_apdu_segment_in2() to fix GP GET DATA

Browse Source 
The old osmo_apdu_segment_in() could not parse GP GET DATA correctly
and will fail when parsing a GP GET DATA case 2 with an Le != 0.

Related: SYS#8147
Change-Id: Id5642cb76da4fcbcdd318d41691415781bf0bc50
This commit is contained in:
Alexander Couzens committed 2026-08-20 16:51:09 +02:00
1 parent bed4704377
commit f5eead56eb
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
host/src/simtrace2-cardem-pcsc.c
+3 -3
View File
@@ -159,7 +159,7 @@ static int process_do_pts(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int len
/*! \brief Process a RX-DATA indication message from the SIMtrace2 */ /*! \brief Process a RX-DATA indication message from the SIMtrace2 */
static int process_do_rx_da(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int len) static int process_do_rx_da(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int len)
{ {
static struct osmo_apdu_context ac; static struct osmo_apdu_context ac, prev_ac;
struct cardemu_usb_msg_rx_data *data; struct cardemu_usb_msg_rx_data *data;
int rc; int rc;
@@ -168,8 +168,8 @@ static int process_do_rx_da(struct osmo_st2_cardem_inst *ci, uint8_t *buf, int l
LOGCI(ci, LOGL_INFO, "=> DATA: flags=0x%02x (%s), %s\n ", data->flags, LOGCI(ci, LOGL_INFO, "=> DATA: flags=0x%02x (%s), %s\n ", data->flags,
cemu_data_flags2str(data->flags), osmo_hexdump(data->data, data->data_len)); cemu_data_flags2str(data->flags), osmo_hexdump(data->data, data->data_len));
rc = osmo_apdu_segment_in(&ac, data->data, data->data_len, rc = osmo_apdu_segment_in2(&ac, &prev_ac, data->data, data->data_len,
data->flags & CEMU_DATA_F_TPDU_HDR); data->flags & CEMU_DATA_F_TPDU_HDR);
if (rc < 0) { if (rc < 0) {
/* At this point the communication is broken. We cannot keep running, as we /* At this point the communication is broken. We cannot keep running, as we
* don't know if we should continue transmitting or receiving. Only a successful * don't know if we should continue transmitting or receiving. Only a successful