github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-22 06:13:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplify logic

Browse source
This commit is contained in:
iceman1001 2025-03-19 09:08:15 +01:00
commit 94a7d87b9d
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
armsrc/iso14443a.c
View file

@ -3113,10 +3113,12 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
size_t len = ReaderReceive(data, data_len, parity_array); size_t len = ReaderReceive(data, data_len, parity_array);
uint8_t *data_bytes = (uint8_t *) data; uint8_t *data_bytes = (uint8_t *) data;
if (!len) { if (len == 0) {
BigBuf_free(); BigBuf_free();
return 0; // DATA LINK ERROR return 0; // DATA LINK ERROR
} else { }
// S-Block WTX // S-Block WTX
while (len && ((data_bytes[0] & 0xF2) == 0xF2)) { while (len && ((data_bytes[0] & 0xF2) == 0xF2)) {
uint32_t save_iso14a_timeout = iso14a_get_timeout(); uint32_t save_iso14a_timeout = iso14a_get_timeout();
@ -3130,6 +3132,7 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
// transmit S-Block // transmit S-Block
ReaderTransmit(data_bytes, len, NULL); ReaderTransmit(data_bytes, len, NULL);
// retrieve the result again (with increased timeout) // retrieve the result again (with increased timeout)
data_bytes[0] = 0x00;
len = ReaderReceive(data, data_len, parity_array); len = ReaderReceive(data, data_len, parity_array);
data_bytes = data; data_bytes = data;
// restore timeout // restore timeout
@ -3156,8 +3159,6 @@ int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, bool send_chaining, void *data, u
return -1; return -1;
} }
}
if (len) { if (len) {
// cut frame byte // cut frame byte
len -= 1; len -= 1;