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

text

Browse source
This commit is contained in:
iceman1001 2025-07-01 16:43:42 +02:00
parent 4268fe3ce1
commit 95814cc5b8
4 changed files with 57 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

98
client/src/cmdhf.c
View file

@ -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;
}

2
client/src/cmdhfmf.c
View file

@ -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"
);

8
client/src/mifare/mifarehost.c
View file

@ -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;
}
}

5
doc/commands.json
View file

@ -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"
}
}