mirror of https://gerrit.osmocom.org/simtrace2
sniff: add TPDU parsing (TPDUs become APDUs on the upper layer)
Change-Id: I09d050d95bd2ab140fe6b4926a37278eb08cc347
This commit is contained in:
parent
f40c10d2f2
commit
15a3384e9a
|
@ -54,8 +54,8 @@ enum iso7816_3_sniff_state {
|
||||||
ISO7816_S_RESET, /*!< in Reset */
|
ISO7816_S_RESET, /*!< in Reset */
|
||||||
ISO7816_S_WAIT_ATR, /*!< waiting for ATR to start */
|
ISO7816_S_WAIT_ATR, /*!< waiting for ATR to start */
|
||||||
ISO7816_S_IN_ATR, /*!< while we are receiving the ATR */
|
ISO7816_S_IN_ATR, /*!< while we are receiving the ATR */
|
||||||
ISO7816_S_WAIT_APDU, /*!< waiting for start of new APDU */
|
ISO7816_S_WAIT_TPDU, /*!< waiting for start of new TPDU */
|
||||||
ISO7816_S_IN_APDU, /*!< inside a single APDU */
|
ISO7816_S_IN_TPDU, /*!< inside a single TPDU */
|
||||||
ISO7816_S_IN_PPS_REQ, /*!< while we are inside the PPS request */
|
ISO7816_S_IN_PPS_REQ, /*!< while we are inside the PPS request */
|
||||||
ISO7816_S_WAIT_PPS_RSP, /*!< waiting for start of the PPS response */
|
ISO7816_S_WAIT_PPS_RSP, /*!< waiting for start of the PPS response */
|
||||||
ISO7816_S_IN_PPS_RSP, /*!< while we are inside the PPS request */
|
ISO7816_S_IN_PPS_RSP, /*!< while we are inside the PPS request */
|
||||||
|
@ -87,6 +87,23 @@ enum pps_sniff_state {
|
||||||
PPS_S_WAIT_PCK, /*!< check byte */
|
PPS_S_WAIT_PCK, /*!< check byte */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*! Transport Protocol Data Unit (TPDU) sub-states of ISO7816_S_IN_TPDU
|
||||||
|
* @note defined in ISO/IEC 7816-3:2006(E) section 10 and 12
|
||||||
|
* @remark APDUs are formed by one or more command+response TPDUs
|
||||||
|
*/
|
||||||
|
enum tpdu_sniff_state {
|
||||||
|
TPDU_S_CLA, /*!< class byte */
|
||||||
|
TPDU_S_INS, /*!< instruction byte */
|
||||||
|
TPDU_S_P1, /*!< first parameter byte for the instruction */
|
||||||
|
TPDU_S_P2, /*!< second parameter byte for the instruction */
|
||||||
|
TPDU_S_P3, /*!< third parameter byte encoding the data length */
|
||||||
|
TPDU_S_PROCEDURE, /*!< procedure byte (could also be SW1) */
|
||||||
|
TPDU_S_DATA_REMAINING, /*!< remaining data bytes */
|
||||||
|
TPDU_S_DATA_SINGLE, /*!< single data byte */
|
||||||
|
TPDU_S_SW1, /*!< first status word */
|
||||||
|
TPDU_S_SW2, /*!< second status word */
|
||||||
|
};
|
||||||
|
|
||||||
/*------------------------------------------------------------------------------
|
/*------------------------------------------------------------------------------
|
||||||
* Internal variables
|
* Internal variables
|
||||||
*------------------------------------------------------------------------------*/
|
*------------------------------------------------------------------------------*/
|
||||||
|
@ -141,6 +158,15 @@ enum pps_sniff_state pps_state;
|
||||||
uint8_t pps_req[MAX_PPS_SIZE];
|
uint8_t pps_req[MAX_PPS_SIZE];
|
||||||
/*! PPS response data */
|
/*! PPS response data */
|
||||||
uint8_t pps_rsp[MAX_PPS_SIZE];
|
uint8_t pps_rsp[MAX_PPS_SIZE];
|
||||||
|
/*! TPDU state */
|
||||||
|
enum tpdu_sniff_state tpdu_state;
|
||||||
|
/*! Final TPDU packet
|
||||||
|
* @note this is the complete command+response TPDU, including header, data, and status words
|
||||||
|
* @remark this does not include the procedure bytes
|
||||||
|
*/
|
||||||
|
uint8_t tpdu_packet[5+256+2];
|
||||||
|
/*! Current index in TPDU packet */
|
||||||
|
uint8_t tpdu_packet_i = 0;
|
||||||
|
|
||||||
/*------------------------------------------------------------------------------
|
/*------------------------------------------------------------------------------
|
||||||
* Internal functions
|
* Internal functions
|
||||||
|
@ -183,6 +209,10 @@ static void change_state(enum iso7816_3_sniff_state iso_state_new)
|
||||||
case ISO7816_S_IN_PPS_RSP:
|
case ISO7816_S_IN_PPS_RSP:
|
||||||
pps_state = PPS_S_WAIT_PPSS;
|
pps_state = PPS_S_WAIT_PPSS;
|
||||||
break;
|
break;
|
||||||
|
case ISO7816_S_WAIT_TPDU:
|
||||||
|
tpdu_state = TPDU_S_CLA;
|
||||||
|
tpdu_packet_i = 0;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -351,7 +381,7 @@ static void process_byte_pps(uint8_t byte)
|
||||||
pps_state = PPS_S_WAIT_PPS0; /* go to next state */
|
pps_state = PPS_S_WAIT_PPS0; /* go to next state */
|
||||||
} else {
|
} else {
|
||||||
TRACE_INFO("Invalid PPSS received\n\r");
|
TRACE_INFO("Invalid PPSS received\n\r");
|
||||||
change_state(ISO7816_S_WAIT_APDU); /* go back to APDU state */
|
change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case PPS_S_WAIT_PPS0: /*!< format byte */
|
case PPS_S_WAIT_PPS0: /*!< format byte */
|
||||||
|
@ -397,7 +427,7 @@ static void process_byte_pps(uint8_t byte)
|
||||||
if (0==check) { /* checksum is valid */
|
if (0==check) { /* checksum is valid */
|
||||||
change_state(ISO7816_S_WAIT_PPS_RSP); /* go to next state */
|
change_state(ISO7816_S_WAIT_PPS_RSP); /* go to next state */
|
||||||
} else { /* checksum is invalid */
|
} else { /* checksum is invalid */
|
||||||
change_state(ISO7816_S_WAIT_APDU); /* go to next state */
|
change_state(ISO7816_S_WAIT_TPDU); /* go to next state */
|
||||||
}
|
}
|
||||||
} else if (ISO7816_S_IN_PPS_RSP==iso_state) {
|
} else if (ISO7816_S_IN_PPS_RSP==iso_state) {
|
||||||
if (0==check) { /* checksum is valid */
|
if (0==check) { /* checksum is valid */
|
||||||
|
@ -415,7 +445,7 @@ static void process_byte_pps(uint8_t byte)
|
||||||
} else { /* checksum is invalid */
|
} else { /* checksum is invalid */
|
||||||
TRACE_INFO("PPS negotiation failed\n\r");
|
TRACE_INFO("PPS negotiation failed\n\r");
|
||||||
}
|
}
|
||||||
change_state(ISO7816_S_WAIT_APDU); /* co to next state */
|
change_state(ISO7816_S_WAIT_TPDU); /* go to next state */
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -423,8 +453,107 @@ static void process_byte_pps(uint8_t byte)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void process_byte_apdu(uint8_t byte)
|
/*! Print current TPDU */
|
||||||
|
static void print_tpdu(void)
|
||||||
{
|
{
|
||||||
|
if (ISO7816_S_IN_TPDU!=iso_state) {
|
||||||
|
TRACE_WARNING("Can't print TPDU in ISO 7816-3 state %u\n\r", iso_state);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
led_blink(LED_GREEN, BLINK_2O_F);
|
||||||
|
printf("TPDU: ");
|
||||||
|
for (uint8_t i=0; i<tpdu_packet_i && i<ARRAY_SIZE(tpdu_packet); i++) {
|
||||||
|
printf("%02x ", tpdu_packet[i]);
|
||||||
|
}
|
||||||
|
printf("\n\r");
|
||||||
|
}
|
||||||
|
|
||||||
|
static void process_byte_tpdu(uint8_t byte)
|
||||||
|
{
|
||||||
|
/* sanity check */
|
||||||
|
if (ISO7816_S_IN_TPDU!=iso_state) {
|
||||||
|
TRACE_ERROR("Processing TPDU data in wrong ISO 7816-3 state %u\n\r", iso_state);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (tpdu_packet_i>=ARRAY_SIZE(tpdu_packet)) {
|
||||||
|
TRACE_ERROR("TPDU data overflow\n\r");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* handle TPDU byte depending on current state */
|
||||||
|
switch (tpdu_state) {
|
||||||
|
case TPDU_S_CLA:
|
||||||
|
if (0xff==byte) {
|
||||||
|
TRACE_WARNING("0xff is not a valid class byte\n\r");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
tpdu_packet_i = 0;
|
||||||
|
tpdu_packet[tpdu_packet_i++] = byte;
|
||||||
|
tpdu_state = TPDU_S_INS;
|
||||||
|
break;
|
||||||
|
case TPDU_S_INS:
|
||||||
|
tpdu_packet_i = 1;
|
||||||
|
tpdu_packet[tpdu_packet_i++] = byte;
|
||||||
|
tpdu_state = TPDU_S_P1;
|
||||||
|
break;
|
||||||
|
case TPDU_S_P1:
|
||||||
|
tpdu_packet_i = 2;
|
||||||
|
tpdu_packet[tpdu_packet_i++] = byte;
|
||||||
|
tpdu_state = TPDU_S_P2;
|
||||||
|
break;
|
||||||
|
case TPDU_S_P2:
|
||||||
|
tpdu_packet_i = 3;
|
||||||
|
tpdu_packet[tpdu_packet_i++] = byte;
|
||||||
|
tpdu_state = TPDU_S_P3;
|
||||||
|
break;
|
||||||
|
case TPDU_S_P3:
|
||||||
|
tpdu_packet_i = 4;
|
||||||
|
tpdu_packet[tpdu_packet_i++] = byte;
|
||||||
|
tpdu_state = TPDU_S_PROCEDURE;
|
||||||
|
break;
|
||||||
|
case TPDU_S_PROCEDURE:
|
||||||
|
if (0x60==byte) { /* wait for next procedure byte */
|
||||||
|
break;
|
||||||
|
} else if (tpdu_packet[1]==byte) { /* get all remaining data bytes */
|
||||||
|
tpdu_state = TPDU_S_DATA_REMAINING;
|
||||||
|
break;
|
||||||
|
} else if ((~tpdu_packet[1])==byte) { /* get single data byte */
|
||||||
|
tpdu_state = TPDU_S_DATA_SINGLE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case TPDU_S_SW1:
|
||||||
|
if ((0x60==(byte&0xf0)) || (0x90==(byte&0xf0))) { /* this procedure byte is SW1 */
|
||||||
|
tpdu_packet[tpdu_packet_i++] = byte;
|
||||||
|
tpdu_state = TPDU_S_SW2;
|
||||||
|
} else {
|
||||||
|
TRACE_WARNING("invalid SW1 0x%02x\n\r", byte);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case TPDU_S_SW2:
|
||||||
|
tpdu_packet[tpdu_packet_i++] = byte;
|
||||||
|
print_tpdu(); /* print TPDU for info */
|
||||||
|
change_state(ISO7816_S_WAIT_TPDU); /* this is the end of the TPDU */
|
||||||
|
break;
|
||||||
|
case TPDU_S_DATA_SINGLE:
|
||||||
|
case TPDU_S_DATA_REMAINING:
|
||||||
|
tpdu_packet[tpdu_packet_i++] = byte;
|
||||||
|
if (0==tpdu_packet[4]) {
|
||||||
|
if (5+256<=tpdu_packet_i) {
|
||||||
|
tpdu_state = TPDU_S_SW1;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (5+tpdu_packet[4]<=tpdu_packet_i) {
|
||||||
|
tpdu_state = TPDU_S_SW1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (TPDU_S_DATA_SINGLE==tpdu_state) {
|
||||||
|
tpdu_state = TPDU_S_PROCEDURE;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
TRACE_ERROR("unhandled TPDU state %u\n\r", tpdu_state);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void check_sniffed_data(void)
|
static void check_sniffed_data(void)
|
||||||
|
@ -441,7 +570,7 @@ static void check_sniffed_data(void)
|
||||||
case ISO7816_S_IN_ATR: /* More ATR data incoming */
|
case ISO7816_S_IN_ATR: /* More ATR data incoming */
|
||||||
process_byte_atr(byte);
|
process_byte_atr(byte);
|
||||||
break;
|
break;
|
||||||
case ISO7816_S_WAIT_APDU: /* After the ATR we expect APDU or PPS data */
|
case ISO7816_S_WAIT_TPDU: /* After the ATR we expect TPDU or PPS data */
|
||||||
case ISO7816_S_WAIT_PPS_RSP:
|
case ISO7816_S_WAIT_PPS_RSP:
|
||||||
if (byte == 0xff) {
|
if (byte == 0xff) {
|
||||||
if (ISO7816_S_WAIT_PPS_RSP==iso_state) {
|
if (ISO7816_S_WAIT_PPS_RSP==iso_state) {
|
||||||
|
@ -452,8 +581,11 @@ static void check_sniffed_data(void)
|
||||||
process_byte_pps(byte);
|
process_byte_pps(byte);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ISO7816_S_IN_APDU: /* More APDU data incoming */
|
case ISO7816_S_IN_TPDU: /* More TPDU data incoming */
|
||||||
process_byte_apdu(byte);
|
if (ISO7816_S_WAIT_TPDU==iso_state) {
|
||||||
|
change_state(ISO7816_S_IN_TPDU);
|
||||||
|
}
|
||||||
|
process_byte_tpdu(byte);
|
||||||
break;
|
break;
|
||||||
case ISO7816_S_IN_PPS_REQ:
|
case ISO7816_S_IN_PPS_REQ:
|
||||||
case ISO7816_S_IN_PPS_RSP:
|
case ISO7816_S_IN_PPS_RSP:
|
||||||
|
|
Loading…
Reference in New Issue