github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-22 14:23:50 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

textual

Browse source
This commit is contained in:
iceman1001 2021-09-10 20:40:26 +02:00
commit e930d49aa5
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/src/cmdhfmf.c
View file

@ -4526,7 +4526,7 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
return PM3_EFILE; return PM3_EFILE;
} }
PrintAndLogEx(SUCCESS, "Card loaded %d blocks from file", blockno); PrintAndLogEx(SUCCESS, "Card loaded " _YELLOW_("%d") " blocks from file", blockno);
PrintAndLogEx(INFO, "Done!"); PrintAndLogEx(INFO, "Done!");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -4757,13 +4757,13 @@ static int CmdHF14AMfCSave(const char *Cmd) {
g_conn.block_after_ACK = false; g_conn.block_after_ACK = false;
} }
if (mfEmlSetMem(dump + (i * MFBLOCK_SIZE), i, 5) != PM3_SUCCESS) { if (mfEmlSetMem(dump + (i * MFBLOCK_SIZE), i, 5) != PM3_SUCCESS) {
PrintAndLogEx(WARNING, "Can't set emul block: %d", i); PrintAndLogEx(WARNING, "Can't set emul block: " _YELLOW_("%d"), i);
} }
PrintAndLogEx(NORMAL, "." NOLF); PrintAndLogEx(NORMAL, "." NOLF);
fflush(stdout); fflush(stdout);
} }
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(SUCCESS, "uploaded %d bytes to emulator memory", bytes); PrintAndLogEx(SUCCESS, "uploaded " _YELLOW_("%d") " bytes to emulator memory", bytes);
} }
// user supplied filename? // user supplied filename?
@ -4879,7 +4879,7 @@ static int CmdHF14AMfCView(const char *Cmd) {
} }
if (mfCGetBlock(i, dump + (i * MFBLOCK_SIZE), flags)) { if (mfCGetBlock(i, dump + (i * MFBLOCK_SIZE), flags)) {
PrintAndLogEx(WARNING, "Can't get magic card block: %u", i); PrintAndLogEx(WARNING, "Can't get magic card block: " _YELLOW_("%u"), i);
PrintAndLogEx(HINT, "Verify your card size, and try again or try another tag position"); PrintAndLogEx(HINT, "Verify your card size, and try again or try another tag position");
free(dump); free(dump);
return PM3_ESOFT; return PM3_ESOFT;

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

@ -306,7 +306,7 @@ int mfCheckKeys_file(uint8_t *destfn, uint64_t *key) {
retry--; retry--;
if (retry == 0) { if (retry == 0) {
PrintAndLogEx(WARNING, "Chk keys file, time out"); PrintAndLogEx(WARNING, "Chk keys file, command execution time out");
SendCommandNG(CMD_BREAK_LOOP, NULL, 0); SendCommandNG(CMD_BREAK_LOOP, NULL, 0);
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }