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

remove missleading msg

Browse source
This commit is contained in:
iceman1001 2020-09-30 12:18:26 +02:00
commit 6d62eb88d0
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
client/src/cmdhf14b.c
View file

@ -164,7 +164,6 @@ static bool waitCmd14b(bool verbose) {
(crc) ? _GREEN_("ok") : _RED_("fail") (crc) ? _GREEN_("ok") : _RED_("fail")
); );
} else if (len == 0) { } else if (len == 0) {
PrintAndLogEx(SUCCESS, "received SOF only (maybe iCLASS/Picopass)");
} else { } else {
PrintAndLogEx(SUCCESS, "len %u | %s", len, sprint_hex(data, len)); PrintAndLogEx(SUCCESS, "len %u | %s", len, sprint_hex(data, len));
} }
@ -779,18 +778,17 @@ static bool HF14B_Std_Reader(bool verbose) {
PacketResponseNG resp; PacketResponseNG resp;
SendCommandMIX(CMD_HF_ISO14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0, NULL, 0); SendCommandMIX(CMD_HF_ISO14443B_COMMAND, ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0, NULL, 0);
if (!WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, TIMEOUT)) { if (WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, TIMEOUT) == false) {
if (verbose) PrintAndLogEx(WARNING, "command execution timeout"); if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
return false; return false;
} }
iso14b_card_select_t card;
memcpy(&card, (iso14b_card_select_t *)resp.data.asBytes, sizeof(iso14b_card_select_t));
int status = resp.oldarg[0]; int status = resp.oldarg[0];
switch (status) { switch (status) {
case 0: case 0: {
iso14b_card_select_t card;
memcpy(&card, (iso14b_card_select_t *)resp.data.asBytes, sizeof(iso14b_card_select_t));
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(SUCCESS, " UID : " _GREEN_("%s"), sprint_hex(card.uid, card.uidlen)); PrintAndLogEx(SUCCESS, " UID : " _GREEN_("%s"), sprint_hex(card.uid, card.uidlen));
PrintAndLogEx(SUCCESS, " ATQB : %s", sprint_hex(card.atqb, sizeof(card.atqb))); PrintAndLogEx(SUCCESS, " ATQB : %s", sprint_hex(card.atqb, sizeof(card.atqb)));
@ -798,16 +796,20 @@ static bool HF14B_Std_Reader(bool verbose) {
print_atqb_resp(card.atqb, card.cid); print_atqb_resp(card.atqb, card.cid);
is_success = true; is_success = true;
break; break;
case -1: }
case -1: {
if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail"); if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail");
break; break;
case -2: }
case -2: {
if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 CRC fail"); if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 CRC fail");
break; break;
default: }
default: {
if (verbose) PrintAndLogEx(FAILED, "ISO 14443-b card select failed"); if (verbose) PrintAndLogEx(FAILED, "ISO 14443-b card select failed");
break; break;
} }
}
return is_success; return is_success;
} }