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

unify text

Browse source
This commit is contained in:
iceman1001 2022-02-24 17:38:01 +01:00
commit 2879b23a1c
14 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/src/cmdhfcipurse.c
View file

@ -377,12 +377,13 @@ static int SelectCommandEx(bool selectDefaultFile, bool useAID, uint8_t *aid, si
res = CIPURSESelectFileEx(true, true, fileId, buf, bufSize, len, sw); res = CIPURSESelectFileEx(true, true, fileId, buf, bufSize, len, sw);
if (res != 0 || *sw != 0x9000) { if (res != 0 || *sw != 0x9000) {
if (verbose) { if (verbose) {
PrintAndLogEx(ERR, "Cipurse select file 0x%04x " _RED_("error") ". Card returns 0x%04x", fileId, *sw); PrintAndLogEx(ERR, "Cipurse select file 0x%04x " _RED_("error"));
PrintAndLogEx(ERR, "Card returns 0x%04x", fileId, *sw);
} }
return PM3_ESOFT; return PM3_ESOFT;
} }
if (verbose) { if (verbose) {
PrintAndLogEx(INFO, "Cipurse select file " _CYAN_("0x%04x ") _GREEN_("OK"), fileId); PrintAndLogEx(INFO, "Cipurse select file " _YELLOW_("0x%04X ") " ( " _GREEN_("ok") " )", fileId);
} }
} else if (selectDefaultFile) { } else if (selectDefaultFile) {

6
client/src/cmdlfem4x50.c
View file

@ -359,9 +359,9 @@ int CmdEM4x50Login(const char *Cmd) {
// print response // print response
if (resp.status == PM3_SUCCESS) if (resp.status == PM3_SUCCESS)
PrintAndLogEx(SUCCESS, "Login " _GREEN_("ok")); PrintAndLogEx(SUCCESS, "Login ( " _GREEN_("ok") " )");
else else
PrintAndLogEx(FAILED, "Login " _RED_("failed")); PrintAndLogEx(FAILED, "Login ( " _RED_("failed") " )");
return resp.status; return resp.status;
} }
@ -1017,7 +1017,7 @@ int CmdEM4x50Wipe(const char *Cmd) {
if (resp.status == PM3_SUCCESS) { if (resp.status == PM3_SUCCESS) {
PrintAndLogEx(SUCCESS, "Resetting password to 00000000 ( " _GREEN_("ok") " )"); PrintAndLogEx(SUCCESS, "Resetting password to 00000000 ( " _GREEN_("ok") " )");
} else { } else {
PrintAndLogEx(FAILED, "Resetting password " _RED_("failed")); PrintAndLogEx(FAILED, "Resetting password ( " _RED_("failed") " )");
return PM3_ESOFT; return PM3_ESOFT;
} }

6
client/src/cmdlfnexwatch.c
View file

@ -237,12 +237,12 @@ int demodNexWatch(bool verbose) {
if (parity == calc_parity) { if (parity == calc_parity) {
PrintAndLogEx(DEBUG, " parity : %s (0x%X)", _GREEN_("ok"), parity); PrintAndLogEx(DEBUG, " parity : ( %s ) 0x%X", _GREEN_("ok"), parity);
} else { } else {
PrintAndLogEx(DEBUG, " parity : %s (0x%X != 0x%X)", _RED_("fail"), parity, calc_parity); PrintAndLogEx(DEBUG, " parity : ( %s ) 0x%X != 0x%X", _RED_("fail"), parity, calc_parity);
} }
PrintAndLogEx(DEBUG, " checksum : %s (0x%02X)", (m_idx < ARRAYLEN(items)) ? _GREEN_("ok") : _RED_("fail"), chk); PrintAndLogEx(DEBUG, " checksum : ( %s ) 0x%02X", (m_idx < ARRAYLEN(items)) ? _GREEN_("ok") : _RED_("fail"), chk);
PrintAndLogEx(INFO, " Raw : " _YELLOW_("%08"PRIX32"%08"PRIX32"%08"PRIX32), raw1, raw2, raw3); PrintAndLogEx(INFO, " Raw : " _YELLOW_("%08"PRIX32"%08"PRIX32"%08"PRIX32), raw1, raw2, raw3);
return PM3_SUCCESS; return PM3_SUCCESS;

2
client/src/cmdlfpyramid.c
View file

@ -170,7 +170,7 @@ int demodPyramid(bool verbose) {
PrintAndLogEx(SUCCESS, "Pyramid - len: " _GREEN_("%d") " -unknown- Card: " _GREEN_("%d") ", Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo); PrintAndLogEx(SUCCESS, "Pyramid - len: " _GREEN_("%d") " -unknown- Card: " _GREEN_("%d") ", Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
} }
PrintAndLogEx(DEBUG, "DEBUG: Pyramid: checksum : 0x%02X - 0x%02X - %s" PrintAndLogEx(DEBUG, "DEBUG: Pyramid: checksum : 0x%02X - 0x%02X ( %s )"
, checksum , checksum
, checkCS , checkCS
, (checksum == checkCS) ? _GREEN_("ok") : _RED_("fail") , (checksum == checkCS) ? _GREEN_("ok") : _RED_("fail")

2
client/src/emv/emvjson.c
View file

@ -331,7 +331,7 @@ bool ParamLoadFromJson(struct tlvdb *tlv) {
return false; return false;
} }
PrintAndLogEx(SUCCESS, "Load params: json(%zu) (%s)", json_array_size(root), _GREEN_("OK")); PrintAndLogEx(SUCCESS, "Load params: json(%zu) ( %s )", json_array_size(root), _GREEN_("ok"));
for (int i = 0; i < json_array_size(root); i++) { for (int i = 0; i < json_array_size(root); i++) {
json_t *data, *jtag, *jlength, *jvalue; json_t *data, *jtag, *jlength, *jvalue;

2
client/src/flash.c
View file

@ -608,7 +608,7 @@ int flash_write(flash_file_t *ctx) {
} }
fflush(stdout); fflush(stdout);
} }
PrintAndLogEx(NORMAL, " " _GREEN_("OK")); PrintAndLogEx(NORMAL, " " _GREEN_("ok"));
fflush(stdout); fflush(stdout);
} }
return PM3_SUCCESS; return PM3_SUCCESS;