catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-18 14:18:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

card_emu: Fix PTS checksum verification

Browse Source 
If the checksum doesn't match, the card should not apply any Fi/Di
changes, not respond anything and simply expect the next TPDU.
This commit is contained in:
Harald Welte
2016-02-26 09:48:57 +01:00
parent 4ba66d0098
commit 17db2f1112
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
firmware/src_simtrace/card_emu.c
View File

@@ -184,6 +184,22 @@ static int serialize_pts(uint8_t *out, const uint8_t *in)
return i; return i;
} }
static uint8_t csum_pts(const uint8_t *in)
{
uint8_t out[6];
int len = serialize_pts(out, in);
uint8_t csum = 0;
int i;
/* we don't include the PCK byte in the checksumming process */
len -= 1;
for (i = 0; i < len; i++)
csum = csum ^ out[i];
return csum;
}
static void flush_pts(struct card_handle *ch) static void flush_pts(struct card_handle *ch)
{ {
struct req_ctx *rctx; struct req_ctx *rctx;
@@ -348,7 +364,12 @@ process_byte_pts(struct card_handle *ch, uint8_t byte)
break; break;
case PTS_S_WAIT_REQ_PCK: case PTS_S_WAIT_REQ_PCK:
ch->pts.req[_PCK] = byte; ch->pts.req[_PCK] = byte;
/* FIXME: check PCK */ if (ch->pts.req[_PCK] != csum_pts(ch->pts.req)) {
TRACE_DEBUG("Error in PTS Checksum!\n");
/* Wait for the next TPDU */
set_pts_state(ch, PTS_S_WAIT_REQ_PTSS);
return ISO_S_WAIT_TPDU;
}
/* FIXME: check if proposal matches capabilities in ATR */ /* FIXME: check if proposal matches capabilities in ATR */
memcpy(ch->pts.resp, ch->pts.req, sizeof(ch->pts.resp)); memcpy(ch->pts.resp, ch->pts.req, sizeof(ch->pts.resp));
break; break;