From 96c1f39d0d231012393a0d4901fd759beb4e8c43 Mon Sep 17 00:00:00 2001 From: Gulshan Singh Date: Thu, 15 Feb 2024 17:14:37 -0800 Subject: [PATCH 1/2] Properly handle "hf mf dump" errors --- client/src/cmdhfmf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index bfb9398ca..61bd5705d 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -573,14 +573,14 @@ static int mfc_read_tag(iso14a_card_select_t *card, uint8_t *carddata, uint8_t n SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT, 0, 0, NULL, 0); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_ACK, &resp, 1500) == false) { - PrintAndLogEx(DEBUG, "iso14443a card select timeout"); + PrintAndLogEx(FAILED, "iso14443a card select timeout"); return PM3_ETIMEOUT; } uint64_t select_status = resp.oldarg[0]; if (select_status == 0) { - PrintAndLogEx(DEBUG, "iso14443a card select failed"); - return PM3_SUCCESS; + PrintAndLogEx(FAILED, "iso14443a card select failed"); + return PM3_ESOFT; } // store card info From 6dc308f220de4da1d39f985e8a0c4a6eddb2e77b Mon Sep 17 00:00:00 2001 From: Gulshan Singh Date: Fri, 16 Feb 2024 08:36:45 -0800 Subject: [PATCH 2/2] Change FAILED log messages back to DEBUG Signed-off-by: Gulshan Singh --- client/src/cmdhfmf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index 61bd5705d..10b16a2ac 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -573,13 +573,13 @@ static int mfc_read_tag(iso14a_card_select_t *card, uint8_t *carddata, uint8_t n SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT, 0, 0, NULL, 0); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_ACK, &resp, 1500) == false) { - PrintAndLogEx(FAILED, "iso14443a card select timeout"); + PrintAndLogEx(DEBUG, "iso14443a card select timeout"); return PM3_ETIMEOUT; } uint64_t select_status = resp.oldarg[0]; if (select_status == 0) { - PrintAndLogEx(FAILED, "iso14443a card select failed"); + PrintAndLogEx(DEBUG, "iso14443a card select failed"); return PM3_ESOFT; }