github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-11 07:46:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Complete WTX handling

Browse source
This commit is contained in:
pwpiwi 2017-11-15 07:47:18 +01:00 • committed by GitHub
parent aa264aba1d
commit db68bcdb06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
armsrc/iso14443a.c
View file

@ -81,6 +81,8 @@ typedef struct {
} tUart; } tUart;
static uint32_t iso14a_timeout; static uint32_t iso14a_timeout;
#define MAX_ISO14A_TIMEOUT 524288
int rsamples = 0; int rsamples = 0;
uint8_t trigger = 0; uint8_t trigger = 0;
// the block number for the ISO14443-4 PCB // the block number for the ISO14443-4 PCB
@ -1920,6 +1922,9 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data) {
} else{ } else{
// S-Block WTX // S-Block WTX
while((data_bytes[0] & 0xF2) == 0xF2) { while((data_bytes[0] & 0xF2) == 0xF2) {
uint32_t save_iso14a_timeout = iso14a_timeout;
// temporarily increase timeout
iso14a_timeout = MAX((data_bytes[1] & 0x3f) * iso14a_timeout, MAX_ISO14A_TIMEOUT);
// Transmit WTX back // Transmit WTX back
// byte1 - WTXM [1..59]. command FWT=FWT*WTXM // byte1 - WTXM [1..59]. command FWT=FWT*WTXM
data_bytes[1] = data_bytes[1] & 0x3f; // 2 high bits mandatory set to 0b data_bytes[1] = data_bytes[1] & 0x3f; // 2 high bits mandatory set to 0b
@ -1927,9 +1932,11 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data) {
AppendCrc14443a(data_bytes, len - 2); AppendCrc14443a(data_bytes, len - 2);
// transmit S-Block // transmit S-Block
ReaderTransmit(data_bytes, len, NULL); ReaderTransmit(data_bytes, len, NULL);
// retrieve the result again // retrieve the result again (with increased timeout)
len = ReaderReceive(data, parity); len = ReaderReceive(data, parity);
data_bytes = data; data_bytes = data;
// restore timeout
iso14a_timeout = save_iso14a_timeout;
} }
// if we received an I- or R(ACK)-Block with a block number equal to the // if we received an I- or R(ACK)-Block with a block number equal to the