diff --git a/client/src/cmdhf.c b/client/src/cmdhf.c index fb9aae5b9..13c10d863 100644 --- a/client/src/cmdhf.c +++ b/client/src/cmdhf.c @@ -231,60 +231,60 @@ int CmdHFSearch(const char *Cmd) { } */ + DropField(); + PROMPT_CLEARLINE; if (res != PM3_SUCCESS) { PrintAndLogEx(WARNING, _RED_("No known/supported 13.56 MHz tags found")); - res = PM3_ESOFT; - } else { - - // no need to print 14A hints, since it will print itself - - if (success[THINFILM]) { - PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf thinfilm") "` commands\n"); - } - - if (success[LTO]) { - PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf lto") "` commands\n"); - } - - if (success[LEGIC]) { - PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf legic") "` commands\n"); - } - - if (success[TOPAZ]) { - PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf topaz") "` commands\n"); - } - - if (success[PROTO_TEXKOM]) { - PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf texkom") "` commands\n"); - } - - if (success[PROTO_XEROX]) { - PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf xerox") "` commands\n"); - } - - if (success[ISO_14443B]) { - PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf 14b") "` commands\n"); - } - - if (success[ISO_15693]) { - PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf 15") "` commands\n"); - } - - if (success[ICLASS]) { - PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf iclass") "` commands\n"); - } - - if (success[FELICA]) { - PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf felica") "` commands\n"); - } - - if (success[PROTO_CRYPTORF]) { - PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf cryptorf") "` commands\n"); - } + return res; + } + + // no need to print 14A hints, since it will print itself + + if (success[THINFILM]) { + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf thinfilm") "` commands\n"); + } + + if (success[LTO]) { + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf lto") "` commands\n"); + } + + if (success[LEGIC]) { + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf legic") "` commands\n"); + } + + if (success[TOPAZ]) { + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf topaz") "` commands\n"); + } + + if (success[PROTO_TEXKOM]) { + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf texkom") "` commands\n"); + } + + if (success[PROTO_XEROX]) { + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf xerox") "` commands\n"); + } + + if (success[ISO_14443B]) { + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf 14b") "` commands\n"); + } + + if (success[ISO_15693]) { + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf 15") "` commands\n"); + } + + if (success[ICLASS]) { + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf iclass") "` commands\n"); + } + + if (success[FELICA]) { + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf felica") "` commands\n"); + } + + if (success[PROTO_CRYPTORF]) { + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf cryptorf") "` commands\n"); } - DropField(); return res; } diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index f52f2ba19..29eefbf0e 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -4651,7 +4651,7 @@ static int CmdHF14AMfSim(const char *Cmd) { "hf mf sim --1k -u 11223344556677 --> MIFARE Classic 1k with 7b UID\n" "hf mf sim --1k -u 11223344 -i -x --> Perform reader attack in interactive mode\n" "hf mf sim --2k --> MIFARE 2k\n" - "hf mf sim --4k --> MIFARE 4k" + "hf mf sim --4k --> MIFARE 4k\n" "hf mf sim --1k -x -e --> Keep simulation running and populate with found reader keys\n" ); diff --git a/client/src/mifare/mifarehost.c b/client/src/mifare/mifarehost.c index bdac928d5..d3e6a902b 100644 --- a/client/src/mifare/mifarehost.c +++ b/client/src/mifare/mifarehost.c @@ -1481,19 +1481,19 @@ int detect_classic_nackbug(bool verbose) { return PM3_SUCCESS; } case 2: { - PrintAndLogEx(SUCCESS, "NACK test: " _GREEN_("always leak NACK")); + PrintAndLogEx(SUCCESS, "NACK test... " _GREEN_("always leak NACK")); return PM3_SUCCESS; } case 1: { - PrintAndLogEx(SUCCESS, "NACK test: " _GREEN_("detected")); + PrintAndLogEx(SUCCESS, "NACK test... " _GREEN_("detected")); return PM3_SUCCESS; } case 0: { - PrintAndLogEx(SUCCESS, "NACK test: " _GREEN_("no bug")); + PrintAndLogEx(SUCCESS, "NACK test... " _GREEN_("no bug")); return PM3_SUCCESS; } default: { - PrintAndLogEx(ERR, "errorcode from device " _RED_("[%i]"), ok); + PrintAndLogEx(ERR, "errorcode from device (" _RED_("%u") " )", ok); return PM3_EUNDEF; } } diff --git a/doc/commands.json b/doc/commands.json index 4ef2a2aa0..6853203b4 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -5490,7 +5490,8 @@ "hf mf sim --1k -u 11223344556677 -> MIFARE Classic 1k with 7b UID", "hf mf sim --1k -u 11223344 -i -x -> Perform reader attack in interactive mode", "hf mf sim --2k -> MIFARE 2k", - "hf mf sim --4k -> MIFARE 4khf mf sim --1k -x -e --> Keep simulation running and populate with found reader keys" + "hf mf sim --4k -> MIFARE 4k", + "hf mf sim --1k -x -e -> Keep simulation running and populate with found reader keys" ], "offline": false, "options": [ @@ -13375,6 +13376,6 @@ "metadata": { "commands_extracted": 768, "extracted_by": "PM3Help2JSON v1.00", - "extracted_on": "2025-06-22T18:30:29" + "extracted_on": "2025-07-01T14:12:39" } }