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

hf 14a raw - adapt return codes

Browse source
This commit is contained in:
iceman1001 2020-11-14 15:25:27 +01:00
commit 596a97a886
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
client/src/cmdhf14a.c
View file

@ -33,7 +33,7 @@
bool APDUInFramingEnable = true; bool APDUInFramingEnable = true;
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
static int waitCmd(uint8_t iSelect, uint32_t timeout); static int waitCmd(bool i_select, uint32_t timeout);
static const manufactureName manufactureMapping[] = { static const manufactureName manufactureMapping[] = {
// ID, "Vendor Country" // ID, "Vendor Country"
@ -1314,19 +1314,19 @@ static int CmdHF14ACmdRaw(const char *Cmd) {
if (reply) { if (reply) {
int res = 0; int res = 0;
if (active_select) if (active_select)
res = waitCmd(1, timeout); res = waitCmd(true, timeout);
if (!res && datalen > 0) if (res == PM3_SUCCESS && datalen > 0)
waitCmd(0, timeout); waitCmd(false, timeout);
} }
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int waitCmd(uint8_t iSelect, uint32_t timeout) { static int waitCmd(bool i_select, uint32_t timeout) {
PacketResponseNG resp; PacketResponseNG resp;
if (WaitForResponseTimeout(CMD_ACK, &resp, timeout + 1500)) { if (WaitForResponseTimeout(CMD_ACK, &resp, timeout + 1500)) {
uint16_t len = (resp.oldarg[0] & 0xFFFF); uint16_t len = (resp.oldarg[0] & 0xFFFF);
if (iSelect) { if (i_select) {
len = (resp.oldarg[1] & 0xFFFF); len = (resp.oldarg[1] & 0xFFFF);
if (len) { if (len) {
PrintAndLogEx(SUCCESS, "Card selected. UID[%u]:", len); PrintAndLogEx(SUCCESS, "Card selected. UID[%u]:", len);
@ -1338,11 +1338,11 @@ static int waitCmd(uint8_t iSelect, uint32_t timeout) {
} }
if (!len) if (!len)
return 1; return PM3_ESOFT;
uint8_t *data = resp.data.asBytes; uint8_t *data = resp.data.asBytes;
if (iSelect == 0 && len >= 3) { if (i_select == false && len >= 3) {
bool crc = check_crc(CRC_14443_A, data, len); bool crc = check_crc(CRC_14443_A, data, len);
char s[16]; char s[16];
@ -1359,9 +1359,9 @@ static int waitCmd(uint8_t iSelect, uint32_t timeout) {
} else { } else {
PrintAndLogEx(WARNING, "timeout while waiting for reply."); PrintAndLogEx(WARNING, "timeout while waiting for reply.");
return 3; return PM3_ETIMEOUT;
} }
return 0; return PM3_SUCCESS;
} }
static int CmdHF14AAntiFuzz(const char *Cmd) { static int CmdHF14AAntiFuzz(const char *Cmd) {