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

fix: error enum rename

Browse source
This commit is contained in:
Chris 2018-10-14 12:02:26 +02:00
commit 2be56183c0
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/cmdhf14a.c
View file

@ -679,7 +679,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}}; UsbCommand ca = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
SendCommand(&ca); SendCommand(&ca);
if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
PrintAndLogEx(ERROR, "Proxmark connection timeout."); PrintAndLogEx(ERR, "Proxmark connection timeout.");
return 1; return 1;
} }
@ -690,7 +690,7 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
} }
if (resp.arg[0] != 1 && resp.arg[0] != 2) { if (resp.arg[0] != 1 && resp.arg[0] != 2) {
PrintAndLogEx(ERROR, "Card not in iso14443-4. res=%d.", resp.arg[0]); PrintAndLogEx(ERR, "Card not in iso14443-4. res=%d.", resp.arg[0]);
return 1; return 1;
} }
@ -701,12 +701,12 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
memcpy(cr.d.asBytes, rats, 2); memcpy(cr.d.asBytes, rats, 2);
SendCommand(&cr); SendCommand(&cr);
if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
PrintAndLogEx(ERROR, "Proxmark connection timeout."); PrintAndLogEx(ERR, "Proxmark connection timeout.");
return 1; return 1;
} }
if (resp.arg[0] <= 0) { // ats_len if (resp.arg[0] <= 0) { // ats_len
PrintAndLogEx(ERROR, "Can't get ATS."); PrintAndLogEx(ERR, "Can't get ATS.");
return 1; return 1;
} }
} }
@ -731,26 +731,26 @@ int ExchangeRAW14a(uint8_t *datain, int datainlen, bool activateField, bool leav
*dataoutlen = 0; *dataoutlen = 0;
if (maxdataoutlen && *dataoutlen > maxdataoutlen) { if (maxdataoutlen && *dataoutlen > maxdataoutlen) {
PrintAndLogEx(ERROR, "Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen); PrintAndLogEx(ERR, "Buffer too small(%d). Needs %d bytes", *dataoutlen, maxdataoutlen);
return 2; return 2;
} }
memcpy(dataout, recv, *dataoutlen); memcpy(dataout, recv, *dataoutlen);
if(!iLen) { if(!iLen) {
PrintAndLogEx(ERROR, "No card response."); PrintAndLogEx(ERR, "No card response.");
return 1; return 1;
} }
// CRC Check // CRC Check
if (iLen == -1) { if (iLen == -1) {
PrintAndLogEx(ERROR, "ISO 14443A CRC error."); PrintAndLogEx(ERR, "ISO 14443A CRC error.");
return 3; return 3;
} }
} else { } else {
PrintAndLogEx(ERROR, "Reply timeout."); PrintAndLogEx(ERR, "Reply timeout.");
return 4; return 4;
} }