github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

chg; no more crash when getting partial usb packages.

Browse source
This commit is contained in:
iceman1001 2016-04-25 23:15:12 +02:00
commit a420e5c163
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
client/cmdhf14b.c
View file

@ -848,24 +848,28 @@ bool waitCmd(bool verbose) {
if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) { if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
status = (resp.arg[0] & 0xFFFF); status = (resp.arg[0] & 0xFF);
if ( status > 0 ) return FALSE; if ( status > 0 ) return FALSE;
len = (resp.arg[1] & 0xFFFF); len = (resp.arg[1] & 0xFFFF);
memcpy(data, resp.d.asBytes, len); memcpy(data, resp.d.asBytes, len);
if (verbose) { if (verbose) {
if ( len >= 3 ) {
ComputeCrc14443(CRC_14443_B, data, len-2, &b1, &b2); ComputeCrc14443(CRC_14443_B, data, len-2, &b1, &b2);
crc = ( data[len-2] == b1 && data[len-1] == b2); crc = ( data[len-2] == b1 && data[len-1] == b2);
PrintAndLog("[LEN %u] %s[%02X %02X] %s", PrintAndLog("[LEN %u] %s[%02X %02X] %s",
len, len,
sprint_hex(data, len-2), sprint_hex(data, len-2),
data[len-2], data[len-2],
data[len-1], data[len-1],
(crc) ? "OK" : "FAIL" (crc) ? "OK" : "FAIL"
); );
} else {
PrintAndLog("[LEN %u] %s", len, sprint_hex(data, len) );
}
} }
return TRUE; return TRUE;
} else { } else {