diff --git a/client/src/cmdanalyse.c b/client/src/cmdanalyse.c index 561491169..161287fc7 100644 --- a/client/src/cmdanalyse.c +++ b/client/src/cmdanalyse.c @@ -927,7 +927,7 @@ static int CmdAnalyseDemodBuffer(const char *Cmd) { PrintAndLogEx(NORMAL, ""); g_DemodBufferLen = len; free(data); - PrintAndLogEx(HINT, "Use `" _YELLOW_("data print") "` to view DemodBuffer"); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("data print") "` to view DemodBuffer"); return PM3_SUCCESS; } diff --git a/client/src/cmddata.c b/client/src/cmddata.c index ebbc7d3e9..ba62c8f2d 100644 --- a/client/src/cmddata.c +++ b/client/src/cmddata.c @@ -914,7 +914,7 @@ int AutoCorrelate(const int *in, int *out, size_t len, size_t window, bool SaveG PrintAndLogEx(SUCCESS, "Possible correlation at "_YELLOW_("%4d") " samples", distance); } } else { - PrintAndLogEx(HINT, "No repeating pattern found, try increasing window size"); + PrintAndLogEx(HINT, "Hint: No repeating pattern found, try increasing window size"); // return value -1, indication to increase window size return -1; } @@ -953,7 +953,7 @@ static int CmdAutoCorr(const char *Cmd) { if (g_GraphTraceLen == 0) { PrintAndLogEx(WARNING, "GraphBuffer is empty"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("lf read") "` to collect samples"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf read") "` to collect samples"); return PM3_ESOFT; } diff --git a/client/src/cmdflashmemspiffs.c b/client/src/cmdflashmemspiffs.c index 4f8cf90d6..9159eee0e 100644 --- a/client/src/cmdflashmemspiffs.c +++ b/client/src/cmdflashmemspiffs.c @@ -314,7 +314,7 @@ static int CmdFlashMemSpiFFSRename(const char *Cmd) { PrintAndLogEx(INFO, "Done!"); } - PrintAndLogEx(HINT, "Try `" _YELLOW_("mem spiffs tree") "` to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("mem spiffs tree") "` to verify"); return PM3_SUCCESS; } @@ -363,7 +363,7 @@ static int CmdFlashMemSpiFFSCopy(const char *Cmd) { PrintAndLogEx(INFO, "Done!"); } - PrintAndLogEx(HINT, "Try `" _YELLOW_("mem spiffs tree") "` to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("mem spiffs tree") "` to verify"); return PM3_SUCCESS; } @@ -428,7 +428,7 @@ static int CmdFlashMemSpiFFSDump(const char *Cmd) { free(dump); return PM3_EMALLOC; } - PrintAndLogEx(HINT, "Use 'trace list -1 -t ...' to view, 'trace save -f ...' to save"); + PrintAndLogEx(HINT, "Hint: Use 'trace list -1 -t ...' to view, 'trace save -f ...' to save"); } @@ -480,7 +480,7 @@ static int CmdFlashMemSpiFFSWipe(const char *Cmd) { PrintAndLogEx(INFO, "Done!"); } - PrintAndLogEx(HINT, "Try `" _YELLOW_("mem spiffs tree") "` to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("mem spiffs tree") "` to verify"); return PM3_SUCCESS; } @@ -528,7 +528,7 @@ static int CmdFlashMemSpiFFSUpload(const char *Cmd) { if (res == PM3_SUCCESS) PrintAndLogEx(SUCCESS, "Wrote "_GREEN_("%zu") " bytes to file "_GREEN_("%s"), datalen, dest); - PrintAndLogEx(HINT, "Try `" _YELLOW_("mem spiffs tree") "` to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("mem spiffs tree") "` to verify"); return res; } diff --git a/client/src/cmdhf.c b/client/src/cmdhf.c index 360a3a25c..c12999600 100644 --- a/client/src/cmdhf.c +++ b/client/src/cmdhf.c @@ -240,47 +240,47 @@ int CmdHFSearch(const char *Cmd) { // no need to print 14A hints, since it will print itself if (success[THINFILM]) { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf thinfilm`") " commands\n"); + PrintAndLogEx(HINT, "Hint: try `" _YELLOW_("hf thinfilm") "` commands\n"); } if (success[LTO]) { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf lto`") " commands\n"); + PrintAndLogEx(HINT, "Hint: try `" _YELLOW_("hf lto") "` commands\n"); } if (success[LEGIC]) { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf legic`") " commands\n"); + PrintAndLogEx(HINT, "Hint: try `" _YELLOW_("hf legic") "` commands\n"); } if (success[TOPAZ]) { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf topaz`") " commands\n"); + PrintAndLogEx(HINT, "Hint: try `" _YELLOW_("hf topaz") "` commands\n"); } if (success[PROTO_TEXKOM]) { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf texkom`") " commands\n"); + PrintAndLogEx(HINT, "Hint: try `" _YELLOW_("hf texkom") "` commands\n"); } if (success[PROTO_XEROX]) { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf xerox`") " commands\n"); + PrintAndLogEx(HINT, "Hint: try `" _YELLOW_("hf xerox") "` commands\n"); } if (success[ISO_14443B]) { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf 14b`") " commands\n"); + PrintAndLogEx(HINT, "Hint: try `" _YELLOW_("hf 14b") "` commands\n"); } if (success[ISO_15693]) { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf 15`") " commands\n"); + PrintAndLogEx(HINT, "Hint: try `" _YELLOW_("hf 15") "` commands\n"); } if (success[ICLASS]) { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf iclass`") " commands\n"); + PrintAndLogEx(HINT, "Hint: try `" _YELLOW_("hf iclass") "` commands\n"); } if (success[FELICA]) { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf felica`") " commands\n"); + PrintAndLogEx(HINT, "Hint: try `" _YELLOW_("hf felica") "` commands\n"); } if (success[PROTO_CRYPTORF]) { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf cryptorf`") " commands\n"); + PrintAndLogEx(HINT, "Hint: try `" _YELLOW_("hf cryptorf") "` commands\n"); } } @@ -498,9 +498,9 @@ int CmdHFSniff(const char *Cmd) { PrintAndLogEx(INFO, "HF sniff (%u samples)", retval->len); - PrintAndLogEx(HINT, "Use `" _YELLOW_("data hpf") "` to remove offset"); - PrintAndLogEx(HINT, "Use `" _YELLOW_("data plot") "` to view"); - PrintAndLogEx(HINT, "Use `" _YELLOW_("data save") "` to save"); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("data hpf") "` to remove offset"); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("data plot") "` to view"); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("data save") "` to save"); // download bigbuf_malloc:d. // it reserve memory from the higher end. diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index dd6aeae79..efeec4885 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -987,8 +987,8 @@ int CmdHF14ASniff(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_HF_ISO14443A_SNIFF, &resp); PrintAndLogEx(INFO, "Done!"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf 14a list")"` to view captured tracelog"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("trace save -h") "` to save tracelog for later analysing"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf 14a list")"` to view captured tracelog"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("trace save -h") "` to save tracelog for later analysing"); } return PM3_SUCCESS; } @@ -2764,30 +2764,30 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) { if (isMifareClassic || isMifareMini) { if (((isMagic & MAGIC_FLAG_GEN_1A) == MAGIC_FLAG_GEN_1A) || ((isMagic & MAGIC_FLAG_GEN_1B) == MAGIC_FLAG_GEN_1B)) { - PrintAndLogEx(HINT, "Hint: use `" _YELLOW_("hf mf c*") "` magic commands"); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("hf mf c*") "` magic commands"); // if GEN4 GDM in Gen1a more, hint about it if (((isMagic & MAGIC_FLAG_GDM_WUP_40) == MAGIC_FLAG_GDM_WUP_40) || ((isMagic & MAGIC_FLAG_GDM_WUP_40_ZUID) == MAGIC_FLAG_GDM_WUP_40_ZUID)) { - PrintAndLogEx(HINT, "Hint: use `" _YELLOW_("hf mf gdm* --gen1a") "` magic commands"); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("hf mf gdm* --gen1a") "` magic commands"); } } if ((isMagic & MAGIC_FLAG_GEN_3) == MAGIC_FLAG_GEN_3) { - PrintAndLogEx(HINT, "Hint: use `" _YELLOW_("hf mf gen3*") "` magic commands"); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("hf mf gen3*") "` magic commands"); } if ((isMagic & MAGIC_FLAG_GEN_4GTU) == MAGIC_FLAG_GEN_4GTU) { - PrintAndLogEx(HINT, "Hint: use `" _YELLOW_("hf mf g*") "` magic commands"); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("hf mf g*") "` magic commands"); } if ((isMagic & MAGIC_FLAG_GDM_AUTH) == MAGIC_FLAG_GDM_AUTH) { - PrintAndLogEx(HINT, "Hint: use `" _YELLOW_("hf mf gdm*") "` magic commands"); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("hf mf gdm*") "` magic commands"); } if ((isMagic & MAGIC_FLAG_GEN_2) == MAGIC_FLAG_GEN_2) { - PrintAndLogEx(HINT, "Hint: use `" _YELLOW_("hf mf") "` commands"); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("hf mf") "` commands"); } else { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf mf info`")); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf mf info`")); } } @@ -2834,11 +2834,11 @@ int infoHF14A4Applications(bool verbose) { } if (found >= ARRAYLEN(hintAIDList) - 1) { - PrintAndLogEx(HINT, "Hint: card answers to all AID. It maybe the latest revision of plus/desfire/ultralight card."); + PrintAndLogEx(HINT, "Hint: Card answers to all AID. It maybe the latest revision of plus/desfire/ultralight card."); } else { for (int i = 0; i < ARRAYLEN(hintAIDList); i++) { if (cardFound[i] && strlen(hintAIDList[i].hint)) - PrintAndLogEx(HINT, "Hint: try `" _YELLOW_("%s") "` commands", hintAIDList[i].hint); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("%s") "` commands", hintAIDList[i].hint); } } } @@ -3286,10 +3286,10 @@ int CmdHF14ANdefRead(const char *Cmd) { pm3_save_dump(filename, ndef_file, ndef_size, jsfNDEF); if (verbose == false) { - PrintAndLogEx(HINT, "Try " _YELLOW_("`hf 14a ndefread -v`") " for more details"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf 14a ndefread -v`") " for more details"); } else { if (verbose2 == false) { - PrintAndLogEx(HINT, "Try " _YELLOW_("`hf 14a ndefread -vv`") " for more details"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf 14a ndefread -vv`") " for more details"); } } @@ -3890,8 +3890,8 @@ int CmdHF14AAIDSim(const char *Cmd) { PrintAndLogEx(INFO, "Done!"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("trace list -t 14a")"` to view captured tracelog"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("trace save -h") "` to save tracelog for later analysing"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("trace list -t 14a")"` to view captured tracelog"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("trace save -h") "` to save tracelog for later analysing"); return PM3_SUCCESS; } diff --git a/client/src/cmdhf14b.c b/client/src/cmdhf14b.c index 189b1f15b..e1e9ba741 100644 --- a/client/src/cmdhf14b.c +++ b/client/src/cmdhf14b.c @@ -925,8 +925,8 @@ static int CmdHF14BSniff(const char *Cmd) { clearCommandBuffer(); SendCommandNG(CMD_HF_ISO14443B_SNIFF, NULL, 0); WaitForResponse(CMD_HF_ISO14443B_SNIFF, &resp); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf 14b list") "` to view captured tracelog"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("trace save -h") "` to save tracelog for later analysing"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf 14b list") "` to view captured tracelog"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("trace save -h") "` to save tracelog for later analysing"); return PM3_SUCCESS; } @@ -2969,7 +2969,7 @@ static int CmdHF14BSetUID(const char *Cmd) { if (memcmp(card->uid, uid, uidlen) == 0) { PrintAndLogEx(SUCCESS, "Setting new UID ( " _GREEN_("ok") " )"); - PrintAndLogEx(HINT, "try `" _YELLOW_("hf 14b reader") "` to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf 14b reader") "` to verify"); PrintAndLogEx(NORMAL, ""); return PM3_SUCCESS;; } diff --git a/client/src/cmdhf15.c b/client/src/cmdhf15.c index 7a3875e00..961607e9c 100644 --- a/client/src/cmdhf15.c +++ b/client/src/cmdhf15.c @@ -534,7 +534,7 @@ static int CmdHF15Demod(const char *Cmd) { if (g_GraphTraceLen < 1000) { PrintAndLogEx(FAILED, "Too few samples in GraphBuffer"); - PrintAndLogEx(HINT, "Run " _YELLOW_("`hf 15 samples`") " to collect and download data"); + PrintAndLogEx(HINT, "Hint: Run `" _YELLOW_("hf 15 samples") "` to collect and download data"); return PM3_ESOFT; } @@ -659,7 +659,7 @@ static int CmdHF15Samples(const char *Cmd) { getSamples(0, true); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf 15 demod") "` to decode signal"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf 15 demod") "` to decode signal"); PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } @@ -1148,8 +1148,8 @@ static int CmdHF15Sniff(const char *Cmd) { WaitForResponse(CMD_HF_ISO15693_SNIFF, &resp); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf 15 list") "` to view captured tracelog"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("trace save -h") "` to save tracelog for later analysing"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf 15 list") "` to view captured tracelog"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("trace save -h") "` to save tracelog for later analysing"); PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } @@ -1293,7 +1293,7 @@ static int CmdHF15ELoad(const char *Cmd) { PrintAndLogEx(NORMAL, ""); PrintAndLogEx(SUCCESS, "uploaded " _YELLOW_("%zu") " bytes to emulator memory", offset); - PrintAndLogEx(HINT, "You are ready to simulate. See " _YELLOW_("`hf 15 sim -h`")); + PrintAndLogEx(HINT, "Hint: You are ready to simulate. See `" _YELLOW_("hf 15 sim -h") "`"); PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } @@ -2778,7 +2778,7 @@ static int CmdHF15Restore(const char *Cmd) { DropField(); PrintAndLogEx(NORMAL, ""); - PrintAndLogEx(HINT, "try `" _YELLOW_("hf 15 dump --ns") "` to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf 15 dump --ns") "` to verify"); PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } diff --git a/client/src/cmdhfcryptorf.c b/client/src/cmdhfcryptorf.c index 05524a6a0..8b105c705 100644 --- a/client/src/cmdhfcryptorf.c +++ b/client/src/cmdhfcryptorf.c @@ -96,8 +96,8 @@ static int CmdHFCryptoRFSniff(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_HF_ISO14443B_SNIFF, &resp); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf cryptorf list") "` to view captured tracelog"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("trace save -f hf_cryptorf_mytrace") "` to save tracelog for later analysing"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf cryptorf list") "` to view captured tracelog"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("trace save -f hf_cryptorf_mytrace") "` to save tracelog for later analysing"); return PM3_SUCCESS; } diff --git a/client/src/cmdhfemrtd.c b/client/src/cmdhfemrtd.c index 2160c9b06..b21435a35 100644 --- a/client/src/cmdhfemrtd.c +++ b/client/src/cmdhfemrtd.c @@ -1077,7 +1077,7 @@ static bool emrtd_do_auth(char *documentnumber, char *dob, char *expiry, bool BA // If BAC isn't available, exit out and warn user. if (BAC_available == false) { PrintAndLogEx(ERR, "This eMRTD enforces authentication, but you didn't supply MRZ data. Cannot proceed."); - PrintAndLogEx(HINT, "Check out `hf emrtd info/dump --h`, supply data with `-n` `-d` and `-e`"); + PrintAndLogEx(HINT, "Hint: Check out `" _YELLOW_("hf emrtd info/dump --h") "`, supply data with `-n` `-d` and `-e`"); return false; } @@ -1105,7 +1105,7 @@ int dumpHF_EMRTD(char *documentnumber, char *dob, char *expiry, bool BAC_availab // Dump EF_CardAccess (if available) if (emrtd_dump_file(ks_enc, ks_mac, ssc, dg_table[EF_CardAccess].fileid, dg_table[EF_CardAccess].filename, BAC, path) == false) { PrintAndLogEx(INFO, "Couldn't dump EF_CardAccess, card does not support PACE"); - PrintAndLogEx(HINT, "This is expected behavior for cards without PACE, and isn't something to be worried about"); + PrintAndLogEx(HINT, "Hint: This is expected behavior for cards without PACE and isn't something to be worried about"); } // Authenticate with the eMRTD @@ -1389,7 +1389,7 @@ static void emrtd_print_unknown_timestamp_5f85(uint8_t *data, size_t datalen) { ); PrintAndLogEx(SUCCESS, "Unknown timestamp 5F85... " _YELLOW_("%s"), final_date); - PrintAndLogEx(HINT, "This is very likely the personalization timestamp, but it is using an undocumented tag."); + PrintAndLogEx(HINT, "Hint: This is very likely the personalization timestamp but it is using an undocumented tag."); } static int emrtd_print_ef_com_info(uint8_t *data, size_t datalen) { @@ -1999,7 +1999,7 @@ int infoHF_EMRTD(char *documentnumber, char *dob, char *expiry, bool BAC_availab // Read EF_CardAccess if (emrtd_select_and_read(response, &resplen, dg_table[EF_CardAccess].fileid, ks_enc, ks_mac, ssc, BAC) == false) { PACE_available = false; - PrintAndLogEx(HINT, "The error above this is normal. It just means that your eMRTD lacks PACE."); + PrintAndLogEx(HINT, "Hint: The error above this is normal. It just means that your eMRTD lacks PACE."); } // Select and authenticate with the eMRTD @@ -2140,7 +2140,7 @@ int infoHF_EMRTD_offline(const char *path) { emrtd_print_ef_cardaccess_info(data, datalen); free(data); } else { - PrintAndLogEx(HINT, "The error above this is normal. It just means that your eMRTD lacks PACE"); + PrintAndLogEx(HINT, "Hint: The error above this is normal. It just means that your eMRTD lacks PACE"); } strcpy(filepath, path); @@ -2261,7 +2261,7 @@ static int CmdHFeMRTDDump(const char *Cmd) { } else { if (!validate_date(dob, slen)) { PrintAndLogEx(ERR, "Date of birth date format is incorrect, cannot continue."); - PrintAndLogEx(HINT, "Use the format YYMMDD."); + PrintAndLogEx(HINT, "Hint: Use the format YYMMDD."); error = true; } } @@ -2271,7 +2271,7 @@ static int CmdHFeMRTDDump(const char *Cmd) { } else { if (!validate_date(expiry, slen)) { PrintAndLogEx(ERR, "Expiry date format is incorrect, cannot continue."); - PrintAndLogEx(HINT, "Use the format YYMMDD."); + PrintAndLogEx(HINT, "Hint: Use the format YYMMDD."); error = true; } } @@ -2289,12 +2289,12 @@ static int CmdHFeMRTDDump(const char *Cmd) { // TODO check MRZ checksums? if (!validate_date(dob, 6)) { PrintAndLogEx(ERR, "Date of birth date format is incorrect, cannot continue."); - PrintAndLogEx(HINT, "Use the format YYMMDD."); + PrintAndLogEx(HINT, "Hint: Use the format YYMMDD."); error = true; } if (!validate_date(expiry, 6)) { PrintAndLogEx(ERR, "Expiry date format is incorrect, cannot continue."); - PrintAndLogEx(HINT, "Use the format YYMMDD."); + PrintAndLogEx(HINT, "Hint: Use the format YYMMDD."); error = true; } } @@ -2368,7 +2368,7 @@ static int CmdHFeMRTDInfo(const char *Cmd) { } else { if (!validate_date(dob, slen)) { PrintAndLogEx(ERR, "Date of birth date format is incorrect, cannot continue."); - PrintAndLogEx(HINT, "Use the format YYMMDD."); + PrintAndLogEx(HINT, "Hint: Use the format YYMMDD."); error = true; } } @@ -2378,7 +2378,7 @@ static int CmdHFeMRTDInfo(const char *Cmd) { } else { if (!validate_date(expiry, slen)) { PrintAndLogEx(ERR, "Expiry date format is incorrect, cannot continue."); - PrintAndLogEx(HINT, "Use the format YYMMDD."); + PrintAndLogEx(HINT, "Hint: Use the format YYMMDD."); error = true; } } @@ -2396,12 +2396,12 @@ static int CmdHFeMRTDInfo(const char *Cmd) { // TODO check MRZ checksums? if (!validate_date(dob, 6)) { PrintAndLogEx(ERR, "Date of birth date format is incorrect, cannot continue."); - PrintAndLogEx(HINT, "Use the format YYMMDD."); + PrintAndLogEx(HINT, "Hint: Use the format YYMMDD."); error = true; } if (!validate_date(expiry, 6)) { PrintAndLogEx(ERR, "Expiry date format is incorrect, cannot continue."); - PrintAndLogEx(HINT, "Use the format YYMMDD."); + PrintAndLogEx(HINT, "Hint: Use the format YYMMDD."); error = true; } } diff --git a/client/src/cmdhffelica.c b/client/src/cmdhffelica.c index 22cf5eb41..4336ed100 100644 --- a/client/src/cmdhffelica.c +++ b/client/src/cmdhffelica.c @@ -1816,7 +1816,7 @@ static int CmdHFFelicaSniff(const char *Cmd) { } } - PrintAndLogEx(HINT, "try `" _YELLOW_("hf felica list") "` to view"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf felica list") "` to view"); PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } diff --git a/client/src/cmdhffudan.c b/client/src/cmdhffudan.c index beedac04a..4a8e59bcc 100644 --- a/client/src/cmdhffudan.c +++ b/client/src/cmdhffudan.c @@ -411,7 +411,7 @@ static int CmdHFFudanWrBl(const char *Cmd) { uint8_t isok = resp.oldarg[0] & 0xff; if (isok) { PrintAndLogEx(SUCCESS, "Write ( " _GREEN_("ok") " )"); - PrintAndLogEx(HINT, "try `" _YELLOW_("hf fudan rdbl") "` to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf fudan rdbl") "` to verify"); } else { PrintAndLogEx(FAILED, "Write ( " _RED_("fail") " )"); } diff --git a/client/src/cmdhfgallagher.c b/client/src/cmdhfgallagher.c index be27c72fe..ec66bb5e6 100644 --- a/client/src/cmdhfgallagher.c +++ b/client/src/cmdhfgallagher.c @@ -1089,7 +1089,7 @@ static int CmdGallagherClone(const char *cmd) { } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf gallagher reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf gallagher reader") "` to verify"); return PM3_SUCCESS; } @@ -1170,7 +1170,7 @@ static int CmdGallagherDelete(const char *cmd) { } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf gallagher reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf gallagher reader") "` to verify"); return PM3_SUCCESS; } @@ -1245,7 +1245,7 @@ static int CmdGallagherDiversify(const char *cmd) { PrintAndLogEx(SUCCESS, "Successfully diversified key: " _GREEN_("%s"), key_str); if (IfPm3Iso14443()) { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf mfdes auth --aid %06X --keyno %d --algo AES --key %s`") " to verify", + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf mfdes auth --aid %06X --keyno %d --algo AES --key %s") "` to verify", aid, key_num, key_str diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c index 302f9d9ce..a49911ee7 100644 --- a/client/src/cmdhficlass.c +++ b/client/src/cmdhficlass.c @@ -563,8 +563,8 @@ static int generate_config_card(const iclass_config_card_item_t *o, uint8_t *ke PrintAndLogEx(NORMAL, ""); PrintAndLogEx(SUCCESS, "sent " _YELLOW_("%u") " bytes of data to device emulator memory", bytes_sent); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf iclass eview") "` to view dump file"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf iclass sim -t 3") "` to start simulating config card"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf iclass eview") "` to view dump file"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf iclass sim -t 3") "` to start simulating config card"); return PM3_SUCCESS; } @@ -825,10 +825,10 @@ static int CmdHFiClassSniff(const char *Cmd) { WaitForResponse(CMD_HF_ICLASS_SNIFF, &resp); PrintAndLogEx(NORMAL, ""); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf iclass list") "` to view captured tracelog"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("trace save -f hf_iclass_mytrace") "` to save tracelog for later analysing"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf iclass list") "` to view captured tracelog"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("trace save -f hf_iclass_mytrace") "` to save tracelog for later analysing"); if (jam_epurse_update) { - PrintAndLogEx(HINT, "Verify if the jam worked by comparing value in trace and block 2"); + PrintAndLogEx(HINT, "Hint: Verify if the jam worked by comparing value in trace and block 2"); } PrintAndLogEx(NORMAL, ""); return PM3_SUCCESS; @@ -955,7 +955,7 @@ static int CmdHFiClassSim(const char *Cmd) { saveFile("iclass_mac_attack", ".bin", dump, datalen); free(dump); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf iclass loclass -f iclass_mac_attack.bin") "` to recover elite key"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf iclass loclass -f iclass_mac_attack.bin") "` to recover elite key"); break; } case ICLASS_SIM_MODE_READER_ATTACK_KEYROLL: { @@ -1019,8 +1019,8 @@ static int CmdHFiClassSim(const char *Cmd) { saveFile("iclass_mac_attack_keyroll_B", ".bin", dump, datalen); free(dump); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf iclass loclass -f iclass_mac_attack_keyroll_A.bin") "` to recover elite key"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf iclass loclass -f iclass_mac_attack_keyroll_B.bin") "` to recover elite key"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf iclass loclass -f iclass_mac_attack_keyroll_A.bin") "` to recover elite key"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf iclass loclass -f iclass_mac_attack_keyroll_B.bin") "` to recover elite key"); break; } case ICLASS_SIM_MODE_CSN: @@ -1034,7 +1034,7 @@ static int CmdHFiClassSim(const char *Cmd) { SendCommandMIX(CMD_HF_ICLASS_SIMULATE, sim_type, numberOfCSNs, 1, csn, 8); if (sim_type == ICLASS_SIM_MODE_FULL) - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf iclass esave -h") "` to save the emulator memory to file"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf iclass esave -h") "` to save the emulator memory to file"); break; } } @@ -1227,7 +1227,7 @@ static int CmdHFiClassELoad(const char *Cmd) { iclass_upload_emul(dump, bytes_read, 0, &bytes_sent); free(dump); PrintAndLogEx(SUCCESS, "uploaded " _YELLOW_("%d") " bytes to emulator memory", bytes_sent); - PrintAndLogEx(HINT, "You are ready to simulate. See " _YELLOW_("`hf iclass sim -h`")); + PrintAndLogEx(HINT, "Hint: You are ready to simulate. See `" _YELLOW_("hf iclass sim -h") "`"); PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } @@ -1284,7 +1284,7 @@ static int CmdHFiClassESave(const char *Cmd) { pm3_save_dump(filename, dump, bytes, jsfIclass); free(dump); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf iclass view -f") "` to view dump file"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf iclass view -f") "` to view dump file"); return PM3_SUCCESS; } @@ -2242,8 +2242,8 @@ write_dump: pm3_save_dump(filename, tag_data, bytes_got, jsfIclass); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf iclass decrypt -f") "` to decrypt dump file"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf iclass view -f") "` to view dump file"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf iclass decrypt -f") "` to decrypt dump file"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf iclass view -f") "` to view dump file"); PrintAndLogEx(NORMAL, ""); return PM3_SUCCESS; } @@ -2688,7 +2688,7 @@ static int CmdHFiClassRestore(const char *Cmd) { if (resp.status == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "iCLASS restore " _GREEN_("successful")); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf iclass rdbl") "` to verify data on card"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf iclass rdbl") "` to verify data on card"); } else { PrintAndLogEx(WARNING, "iCLASS restore " _RED_("failed")); } @@ -3847,7 +3847,7 @@ static void add_key(uint8_t *key) { if (i == ICLASS_KEYS_MAX) { PrintAndLogEx(INFO, "Couldn't find an empty keyslot"); } else { - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf iclass managekeys -p") "` to view keys"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf iclass managekeys -p") "` to view keys"); } } @@ -5248,7 +5248,7 @@ static int CmdHFiClassEncode(const char *Cmd) { uint16_t byte_sent = 0; iclass_upload_emul(credential, sizeof(credential), 6 * PICOPASS_BLOCK_SIZE, &byte_sent); PrintAndLogEx(SUCCESS, "uploaded " _YELLOW_("%d") " bytes to emulator memory", byte_sent); - PrintAndLogEx(HINT, "You are now ready to simulate. See " _YELLOW_("`hf iclass sim -h`")); + PrintAndLogEx(HINT, "Hint: You are now ready to simulate. See `" _YELLOW_("hf iclass sim -h") "`"); } else { for (uint8_t i = 0; i < 4; i++) { isok = iclass_write_block(6 + i, credential + (i * 8), NULL, key, use_credit_key, elite, rawkey, false, false, auth, shallow_mod); diff --git a/client/src/cmdhfjooki.c b/client/src/cmdhfjooki.c index b0cc1363e..bdd1606ac 100644 --- a/client/src/cmdhfjooki.c +++ b/client/src/cmdhfjooki.c @@ -591,7 +591,7 @@ static int CmdHF14AJookiSim(const char *Cmd) { break; } free(data); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf 14a list") "` to view trace log"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf 14a list") "` to view trace log"); PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } @@ -669,7 +669,7 @@ static int CmdHF14AJookiClone(const char *Cmd) { i++; } - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf mfu ndefread") "` to view"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf mfu ndefread") "` to view"); PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } diff --git a/client/src/cmdhflegic.c b/client/src/cmdhflegic.c index b12ac869a..907d53ab5 100644 --- a/client/src/cmdhflegic.c +++ b/client/src/cmdhflegic.c @@ -569,7 +569,7 @@ static int CmdLegicSim(const char *Cmd) { } } - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf legic list") "` to view trace log"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf legic list") "` to view trace log"); PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } @@ -936,7 +936,7 @@ static int CmdLegicDump(const char *Cmd) { // 0x00 ^ MCC = MCC. Finding the end of used data is not part of this function. if (legic_xor(data, dumplen) == false) { PrintAndLogEx(FAILED, "Deobsfuscate failed, exiting..."); - PrintAndLogEx(HINT, "Try running command without `--de` parameter"); + PrintAndLogEx(HINT, "Hint: Try running command without `--de` parameter"); free(data); return PM3_EFAILED; } @@ -1004,7 +1004,7 @@ static int CmdLegicRestore(const char *Cmd) { if (shall_obsfuscate) { if (legic_xor(dump, card.cardsize) == false) { PrintAndLogEx(FAILED, "Obsfuscate failed, exiting..."); - PrintAndLogEx(HINT, "Try running command without `--ob` parameter"); + PrintAndLogEx(HINT, "Hint: Try running command without `--ob` parameter"); free(dump); return PM3_EFAILED; } @@ -1109,7 +1109,7 @@ static int CmdLegicELoad(const char *Cmd) { free(dump); - PrintAndLogEx(HINT, "You are ready to simulate. See " _YELLOW_("`hf legic sim -h`")); + PrintAndLogEx(HINT, "Hint: You are ready to simulate. See `" _YELLOW_("hf legic sim -h") "`"); PrintAndLogEx(SUCCESS, "Done!"); return PM3_SUCCESS; } diff --git a/client/src/cmdhflto.c b/client/src/cmdhflto.c index f68dcdd5e..290b9ab55 100644 --- a/client/src/cmdhflto.c +++ b/client/src/cmdhflto.c @@ -682,7 +682,7 @@ static int CmdHfLTOWriteBlock(const char *Cmd) { int res = wrblLTO(blk, block_data, true); if (res == PM3_SUCCESS) - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf lto rdbl") "` to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf lto rdbl") "` to verify"); return res; } diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index a49f46a46..1d79fe51d 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -356,7 +356,7 @@ static void mf_print_blocks(uint16_t n, uint8_t *d, bool verbose) { // MAD detection if (HasMADKey(d)) { - PrintAndLogEx(HINT, "MAD key detected. Try " _YELLOW_("`hf mf mad`") " for more details"); + PrintAndLogEx(HINT, "Hint: MAD key detected. Try " _YELLOW_("`hf mf mad`") " for more details"); } PrintAndLogEx(NORMAL, ""); } @@ -1017,13 +1017,13 @@ static int CmdHF14AMfWrBl(const char *Cmd) { int status = resp.oldarg[0]; if (status > 0) { PrintAndLogEx(SUCCESS, "Write ( " _GREEN_("ok") " )"); - PrintAndLogEx(HINT, "try `" _YELLOW_("hf mf rdbl") "` to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf mf rdbl") "` to verify"); } else if (status == PM3_ETEAROFF) { return status; } else { PrintAndLogEx(FAILED, "Write ( " _RED_("fail") " )"); // suggest the opposite keytype than what was used. - PrintAndLogEx(HINT, "Maybe access rights? Try specify keytype `" _YELLOW_("hf mf wrbl -%c ...") "` instead", (keytype == MF_KEY_A) ? 'b' : 'a'); + PrintAndLogEx(HINT, "Hint: Maybe access rights? Try specify keytype `" _YELLOW_("hf mf wrbl -%c ...") "` instead", (keytype == MF_KEY_A) ? 'b' : 'a'); } return PM3_SUCCESS; } @@ -1611,7 +1611,7 @@ out: free(keyB); PrintAndLogEx(INFO, "-----+-------------------------------------------------+----------------"); PrintAndLogEx(NORMAL, ""); - PrintAndLogEx(HINT, "try `" _YELLOW_("hf mf dump --ns") "` to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf mf dump --ns") "` to verify"); PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } @@ -2408,7 +2408,7 @@ static int CmdHF14AMfNestedHard(const char *Cmd) { // check if tag doesn't have static nonce if (detect_classic_static_nonce() == NONCE_STATIC) { PrintAndLogEx(WARNING, "Static nonce detected. Quitting..."); - PrintAndLogEx(HINT, "\tTry use `" _YELLOW_("hf mf staticnested") "`"); + PrintAndLogEx(HINT, "Hint: Try use `" _YELLOW_("hf mf staticnested") "`"); return PM3_EOPABORTED; } @@ -2923,7 +2923,7 @@ static int CmdHF14AMfAutoPWN(const char *Cmd) { noValidKeyFound: PrintAndLogEx(FAILED, "No usable key was found!"); - PrintAndLogEx(HINT, "try `" _YELLOW_("hf mf autopwn -f mfc_default_keys")"` i.e. the Randy special"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf mf autopwn -f mfc_default_keys")"` i.e. the Randy special"); free(keyBlock); free(e_sector); free(fptr); @@ -4470,11 +4470,11 @@ void printKeyTableEx(size_t sectorscnt, sector_t *e_sector, uint8_t start_sector // MAD detection if (e_sector[MF_MAD1_SECTOR].foundKey[0] && e_sector[MF_MAD1_SECTOR].Key[0] == 0xA0A1A2A3A4A5) { - PrintAndLogEx(HINT, "MAD key detected. Try " _YELLOW_("`hf mf mad`") " for more details"); + PrintAndLogEx(HINT, "Hint: MAD key detected. Try " _YELLOW_("`hf mf mad`") " for more details"); } // NDEF detection if (has_ndef_key) { - PrintAndLogEx(HINT, "NDEF key detected. Try " _YELLOW_("`hf mf ndefread`") " for more details"); + PrintAndLogEx(HINT, "Hint: NDEF key detected. Try " _YELLOW_("`hf mf ndefread`") " for more details"); } PrintAndLogEx(NORMAL, ""); } @@ -4795,14 +4795,14 @@ int CmdHF14AMfELoad(const char *Cmd) { PrintAndLogEx(NORMAL, ""); if (block_width == MFU_BLOCK_SIZE) { - PrintAndLogEx(HINT, "You are ready to simulate. See " _YELLOW_("`hf mfu sim -h`")); + PrintAndLogEx(HINT, "Hint: You are ready to simulate. See `" _YELLOW_("hf mfu sim -h`") "`"); // MFU / NTAG if ((cnt != block_cnt)) { PrintAndLogEx(WARNING, "Warning, Ultralight/Ntag file content, Loaded %d blocks of expected %d blocks into emulator memory", cnt, block_cnt); return PM3_SUCCESS; } } else { - PrintAndLogEx(HINT, "You are ready to simulate. See " _YELLOW_("`hf mf sim -h`")); + PrintAndLogEx(HINT, "Hint: You are ready to simulate. See `" _YELLOW_("hf mf sim -h") "`"); // MFC if ((cnt != block_cnt)) { PrintAndLogEx(WARNING, "Error, file content, Only loaded %d blocks, must be %d blocks into emulator memory", cnt, block_cnt); @@ -5515,7 +5515,7 @@ static int CmdHF14AMfCLoad(const char *Cmd) { if (mf_chinese_set_block(blockno, data + (MFBLOCK_SIZE * blockno), NULL, flags)) { PrintAndLogEx(WARNING, "Can't set magic card block: %d", blockno); - PrintAndLogEx(HINT, "Verify that it is a GDM and not USCUID derivative"); + PrintAndLogEx(HINT, "Hint: Verify that it is a GDM and not USCUID derivative"); free(data); return PM3_ESOFT; } @@ -5761,7 +5761,7 @@ static int CmdHF14AMfCSave(const char *Cmd) { if (mf_chinese_get_block(i, dump + (i * MFBLOCK_SIZE), flags)) { PrintAndLogEx(WARNING, "Can't get magic card block: %d", i); - PrintAndLogEx(HINT, "Verify your card size, and try again or try another tag position"); + PrintAndLogEx(HINT, "Hint: Verify your card size and try again or try another tag position"); free(dump); return PM3_ESOFT; } @@ -5910,7 +5910,7 @@ static int CmdHF14AMfCView(const char *Cmd) { if (mf_chinese_get_block(i, dump + (i * MFBLOCK_SIZE), flags)) { 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, "Hint: Verify your card size and try again or try another tag position"); free(dump); return PM3_ESOFT; } @@ -6554,7 +6554,7 @@ int CmdHFMFNDEFRead(const char *Cmd) { if (mf_read_sector(MF_MAD1_SECTOR, MF_KEY_A, g_mifare_mad_key, sector0)) { PrintAndLogEx(ERR, "error, read sector 0. card doesn't have MAD or doesn't have MAD on default keys"); - PrintAndLogEx(HINT, "Try " _YELLOW_("`hf mf ndefread -k `") " with your custom key"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf mf ndefread -k `") " with your custom key"); return PM3_ESOFT; } @@ -6630,10 +6630,10 @@ int CmdHFMFNDEFRead(const char *Cmd) { } if (verbose == false) { - PrintAndLogEx(HINT, "Try " _YELLOW_("`hf mf ndefread -v`") " for more details"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf mf ndefread -v`") " for more details"); } else { if (verbose2 == false) { - PrintAndLogEx(HINT, "Try " _YELLOW_("`hf mf ndefread -vv`") " for more details"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf mf ndefread -vv`") " for more details"); } } return PM3_SUCCESS; @@ -6919,7 +6919,7 @@ int CmdHFMFNDEFWrite(const char *Cmd) { int res = mf_check_keys(0, MF_KEY_A, true, 1, (uint8_t *)g_mifare_mad_key, &key64); if (res != PM3_SUCCESS) { PrintAndLogEx(FAILED, "Sector 0 failed to authenticate with MAD default key"); - PrintAndLogEx(HINT, "Verify that the tag NDEF formatted"); + PrintAndLogEx(HINT, "Hint: Verify that the tag NDEF formatted"); return res; } @@ -6993,7 +6993,7 @@ int CmdHFMFNDEFWrite(const char *Cmd) { uint8_t sector0[MFBLOCK_SIZE * 4] = {0}; if (mf_read_sector(MF_MAD1_SECTOR, MF_KEY_A, g_mifare_mad_key, sector0)) { PrintAndLogEx(ERR, "error, reading sector 0. Card doesn't have MAD or doesn't have MAD on default keys"); - PrintAndLogEx(HINT, "Try " _YELLOW_("`hf mf ndefread -k `") " with your custom key"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf mf ndefread -k `") " with your custom key"); return PM3_ESOFT; } @@ -7002,7 +7002,7 @@ int CmdHFMFNDEFWrite(const char *Cmd) { if (m4) { if (mf_read_sector(MF_MAD2_SECTOR, MF_KEY_A, g_mifare_mad_key, sector10)) { PrintAndLogEx(ERR, "error, reading sector 10. Card doesn't have MAD or doesn't have MAD on default keys"); - PrintAndLogEx(HINT, "Try " _YELLOW_("`hf mf ndefread -k `") " with your custom key"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf mf ndefread -k `") " with your custom key"); return PM3_ESOFT; } } @@ -7224,7 +7224,7 @@ static int CmdHf14AGen3UID(const char *Cmd) { int res = mf_chinese_gen_3_uid(uid, uidlen, old_uid); if (res != PM3_SUCCESS) { PrintAndLogEx(ERR, "Can't set UID"); - PrintAndLogEx(HINT, "Are you sure your card is a Gen3 ?"); + PrintAndLogEx(HINT, "Hint: Are you sure your card is a Gen3?"); return PM3_ESOFT; } @@ -8427,7 +8427,7 @@ static int CmdHF14AGen4Load(const char *cmd) { int res = mfG4SetBlock(pwd, blockno, data + (blockno * MFBLOCK_SIZE), flags); if (res != PM3_SUCCESS) { PrintAndLogEx(WARNING, "Can't set magic card block: %d. error=%d", blockno, res); - PrintAndLogEx(HINT, "Verify your card size, and try again or try another tag position"); + PrintAndLogEx(HINT, "Hint: Verify your card size and try again or try another tag position"); free(data); return PM3_ESOFT; } @@ -8588,7 +8588,7 @@ static int CmdHF14AGen4View(const char *Cmd) { int res = mfG4GetBlock(pwd, i, dump + (i * MFBLOCK_SIZE), flags); if (res != PM3_SUCCESS) { PrintAndLogEx(WARNING, "Can't get magic card block: %u. error=%d", i, res); - PrintAndLogEx(HINT, "Verify your card size, and try again or try another tag position"); + PrintAndLogEx(HINT, "Hint: Verify your card size and try again or try another tag position"); free(dump); return PM3_ESOFT; } @@ -8738,7 +8738,7 @@ static int CmdHF14AGen4Save(const char *Cmd) { if (res != PM3_SUCCESS) { PrintAndLogEx(NORMAL, ""); PrintAndLogEx(WARNING, "Can't get magic card block: %u. error=%d", i, res); - PrintAndLogEx(HINT, "Verify your card size, and try again or try another tag position"); + PrintAndLogEx(HINT, "Hint: Verify your card size and try again or try another tag position"); free(dump); return PM3_ESOFT; } @@ -9076,7 +9076,7 @@ static int CmdHF14AGen4_GDM_SetCfg(const char *Cmd) { if (resp.status == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "Write ( " _GREEN_("ok") " )"); - PrintAndLogEx(HINT, "try `" _YELLOW_("hf mf gdmcfg") "` to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf mf gdmcfg") "` to verify"); } else { PrintAndLogEx(FAILED, "Write ( " _RED_("fail") " )"); } @@ -9159,7 +9159,7 @@ static int CmdHF14AGen4_GDM_SetBlk(const char *Cmd) { if (resp.status == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "Write ( " _GREEN_("ok") " )"); - PrintAndLogEx(HINT, "try `" _YELLOW_("hf mf rdbl") "` to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf mf rdbl") "` to verify"); } else if (resp.status == PM3_ETEAROFF) { PrintAndLogEx(INFO, "Tear off triggered"); return resp.status; @@ -10160,6 +10160,11 @@ static int CmdHF14AMfISEN(const char *Cmd) { } else if (res == NONCE_STATIC_ENC) { PrintAndLogEx(SUCCESS, "Static enc nonce..... " _RED_("yes")); } + + if (res == NONCE_STATIC_ENC) { + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("script run fm11rf08s_recovery.py") "`"); + } + if (setDeviceDebugLevel(dbg_curr, false) != PM3_SUCCESS) { return PM3_EFAILED; } diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c index 1b6be4145..8f9f517e0 100644 --- a/client/src/cmdhfmfdes.c +++ b/client/src/cmdhfmfdes.c @@ -1831,7 +1831,7 @@ static int CmdHF14aDesMAD(const char *Cmd) { if ((PICCInfo.keySettings & (1 << 1)) == 0) { PrintAndLogEx(WARNING, "Directory list access with CMK... ( " _RED_("Enabled") " )"); - PrintAndLogEx(HINT, "Try to read MAD with Card Master Key (CMK)"); + PrintAndLogEx(HINT, "Hint: Try to read MAD with Card Master Key (CMK)"); } PrintAndLogEx(SUCCESS, "----------------------------------------- " _CYAN_("MAD") " ------------------------------------------"); @@ -2559,7 +2559,7 @@ static int CmdHF14ADesCreateApp(const char *Cmd) { arg_str0(NULL, "rawdata", "", "Raw data that sends to command"), arg_str0(NULL, "aid", "", "Application ID for create. Mandatory. (3 hex bytes, big endian)"), arg_str0(NULL, "fid", "", "ISO file ID. Forbidden values: 0000 3F00, 3FFF, FFFF. (2 hex bytes, big endian)"), - arg_str0(NULL, "dfname", "", "ISO DF Name (1..16 chars)"), + arg_str0(NULL, "dfname", "", "ISO DF Name (1..16 chars)"), arg_str0(NULL, "dfhex", "", "ISO DF Name as hex (1..16 bytes)"), arg_str0(NULL, "ks1", "", "Key settings 1 (1 hex byte). Application Master Key Settings (def: 0x0F)"), arg_str0(NULL, "ks2", "", "Key settings 2 (1 hex byte). (def: 0x0E)"), diff --git a/client/src/cmdhfmfp.c b/client/src/cmdhfmfp.c index bb4bd28ce..d407cfe9a 100644 --- a/client/src/cmdhfmfp.c +++ b/client/src/cmdhfmfp.c @@ -361,7 +361,7 @@ static int CmdHFMFPInfo(const char *Cmd) { case DESFIRE_EV2_XL: case DESFIRE_EV3: case DESFIRE_LIGHT: { - PrintAndLogEx(HINT, "Card seems to be MIFARE DESFire. Try " _YELLOW_("`hf mfdes info`")); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf mfdes info") "` Card seems to be MIFARE DESFire"); PrintAndLogEx(NORMAL, ""); DropField(); return PM3_SUCCESS; @@ -1688,12 +1688,12 @@ static int CmdHFMFPChk(const char *Cmd) { // MAD detection if ((memcmp(&foundKeys[0][0][1], "\xA0\xA1\xA2\xA3\xA4\xA5\xA6\xA7\xA0\xA1\xA2\xA3\xA4\xA5\xA6\xA7", AES_KEY_LEN) == 0)) { - PrintAndLogEx(HINT, "MAD key detected. Try " _YELLOW_("`hf mfp mad`") " for more details"); + PrintAndLogEx(HINT, "Hint: MAD key detected. Try " _YELLOW_("`hf mfp mad`") " for more details"); } // NDEF detection if (has_ndef_key) { - PrintAndLogEx(HINT, "NDEF key detected. Try " _YELLOW_("`hf mfp ndefread -h`") " for more details"); + PrintAndLogEx(HINT, "Hint: NDEF key detected. Try " _YELLOW_("`hf mfp ndefread -h`") " for more details"); } PrintAndLogEx(NORMAL, ""); return PM3_SUCCESS; @@ -1999,7 +1999,7 @@ int CmdHFMFPNDEFRead(const char *Cmd) { if (mfpReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector0, verbose)) { PrintAndLogEx(ERR, "error, read sector 0. card doesn't have MAD or doesn't have MAD on default keys"); - PrintAndLogEx(HINT, "Try " _YELLOW_("`hf mfp ndefread -k `") " with your custom key"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf mfp ndefread -k `") " with your custom key"); return PM3_ESOFT; } @@ -2017,7 +2017,7 @@ int CmdHFMFPNDEFRead(const char *Cmd) { if (mfpReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifarep_mad_key, sector16, verbose)) { PrintAndLogEx(ERR, "error, read sector 0x10. card doesn't have MAD or doesn't have MAD on default keys"); - PrintAndLogEx(HINT, "Try " _YELLOW_("`hf mfp ndefread -k `") " with your custom key"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf mfp ndefread -k `") " with your custom key"); return PM3_ESOFT; } } @@ -2072,10 +2072,10 @@ int CmdHFMFPNDEFRead(const char *Cmd) { pm3_save_dump(filename, data, n, jsfNDEF); if (verbose == false) { - PrintAndLogEx(HINT, "Try " _YELLOW_("`hf mfp ndefread -v`") " for more details"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf mfp ndefread -v`") " for more details"); } else { if (verbose2 == false) { - PrintAndLogEx(HINT, "Try " _YELLOW_("`hf mfp ndefread -vv`") " for more details"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf mfp ndefread -vv`") " for more details"); } } return PM3_SUCCESS; diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c index 40f546741..2c2e1abda 100644 --- a/client/src/cmdhfmfu.c +++ b/client/src/cmdhfmfu.c @@ -1930,9 +1930,9 @@ static int mfu_fingerprint(uint64_t tagtype, bool hasAuthKey, const uint8_t *aut if (item->Pwd) { char s[40] = {0}; snprintf(s, sizeof(s), item->hint, item->Pwd(uid)); - PrintAndLogEx(HINT, "Use `" _YELLOW_("%s") "`", s); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("%s") "`", s); } else { - PrintAndLogEx(HINT, "Use `" _YELLOW_("%s") "`", item->hint); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("%s") "`", item->hint); } } } @@ -1948,9 +1948,9 @@ static int mfu_fingerprint(uint64_t tagtype, bool hasAuthKey, const uint8_t *aut if (item->otp) { char s[40] = {0}; snprintf(s, sizeof(s), item->hint, item->otp(uid)); - PrintAndLogEx(HINT, "Use `" _YELLOW_("%s") "`", s); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("%s") "`", s); } else { - PrintAndLogEx(HINT, "Use `" _YELLOW_("%s") "`", item->hint); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("%s") "`", item->hint); } } } @@ -2314,7 +2314,7 @@ static int CmdHF14AMfUInfo(const char *Cmd) { status = ul_read(0x28, ulc_conf, sizeof(ulc_conf)); if (status <= 0) { PrintAndLogEx(ERR, "Error: tag didn't answer to READ UL-C"); - PrintAndLogEx(HINT, "Hint: tag is likely fully read protected"); + PrintAndLogEx(HINT, "Hint: Tag is most likely fully read protected"); DropField(); return PM3_ESOFT; } @@ -2614,11 +2614,11 @@ static int CmdHF14AMfUInfo(const char *Cmd) { } if (len < 1) { PrintAndLogEx(WARNING, _YELLOW_("password not known")); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf mfu pwdgen -r`") " to get see known pwd gen algo suggestions"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf mfu pwdgen -r`") " to get see known pwd gen algo suggestions"); } } else { if (locked) { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf mfu pwdgen -r`") " to get see known pwd gen algo suggestions"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf mfu pwdgen -r`") " to get see known pwd gen algo suggestions"); } } } @@ -2630,11 +2630,11 @@ out: if (locked) { PrintAndLogEx(INFO, "\nTag appears to be locked, try using a key to get more info"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`hf mfu pwdgen -r`") " to get see known pwd gen algo suggestions"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf mfu pwdgen -r`") " to get see known pwd gen algo suggestions"); } if (tagtype & (MFU_TT_MAGIC_1A | MFU_TT_MAGIC_1B | MFU_TT_MAGIC_2)) { - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`script run hf_mfu_setuid -h`") " to set UID"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`script run hf_mfu_setuid -h`") " to set UID"); } PrintAndLogEx(NORMAL, ""); @@ -2755,7 +2755,7 @@ static int CmdHF14AMfUWrBl(const char *Cmd) { if (res == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "Write ( " _GREEN_("ok") " )"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf mfu rdbl -b %u") "` to verify ", blockno); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf mfu rdbl -b %u") "` to verify ", blockno); } } else { @@ -2763,12 +2763,12 @@ static int CmdHF14AMfUWrBl(const char *Cmd) { switch (res) { case PM3_SUCCESS: { PrintAndLogEx(SUCCESS, "Write ( " _GREEN_("ok") " )"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf mfu rdbl -b %u") "` to verify ", blockno); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf mfu rdbl -b %u") "` to verify ", blockno); break; } case PM3_ESOFT: { PrintAndLogEx(FAILED, "Write ( " _RED_("fail") " )"); - PrintAndLogEx(HINT, "Check password / key!"); + PrintAndLogEx(HINT, "Hint: Check password / key!"); break; } case PM3_ETIMEOUT: @@ -3242,10 +3242,10 @@ static int CmdHF14AMfUDump(const char *Cmd) { if ((tagtype & MFU_TT_UL_C) == MFU_TT_UL_C) { if (card_mem_size != (pages + 4)) { PrintAndLogEx(INFO, "Partial dump, got " _RED_("%d") " bytes - card mem size is %u bytes", pages * MFU_BLOCK_SIZE, card_mem_size * MFU_BLOCK_SIZE); - PrintAndLogEx(HINT, "Try using a key"); + PrintAndLogEx(HINT, "Hint: Try using a key"); } } else { - PrintAndLogEx(HINT, "Try using a pwd"); + PrintAndLogEx(HINT, "Hint: Try using a password"); } } @@ -3762,7 +3762,7 @@ static int CmdHF14AMfURestore(const char *Cmd) { DropField(); free(dump); - PrintAndLogEx(HINT, "try `" _YELLOW_("hf mfu dump --ns") "` to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf mfu dump --ns") "` to verify"); PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } @@ -3798,7 +3798,7 @@ static int CmdHF14AMfUeLoad(const char *Cmd) { int res = CmdHF14AMfELoad(nc); free(nc); - PrintAndLogEx(HINT, "Try " _YELLOW_("`hf mfu sim -t 7`") " to simulate an Amiibo."); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`hf mfu sim -t 7`") " to simulate an Amiibo."); PrintAndLogEx(INFO, "Done!"); return res; } @@ -5266,7 +5266,7 @@ int CmdHF14MfuNDEFRead(const char *Cmd) { jooki++; char s[17] = {0}; strncpy(s, jooki, 16); - PrintAndLogEx(HINT, "Use `" _YELLOW_("hf jooki decode -d %s") "` to decode", s); + PrintAndLogEx(HINT, "Hint: Use `" _YELLOW_("hf jooki decode -d %s") "` to decode", s); break; } } @@ -5838,7 +5838,7 @@ ulc: } - PrintAndLogEx(HINT, "try `" _YELLOW_("hf mfu dump --ns") "` to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf mfu dump --ns") "` to verify"); PrintAndLogEx(NORMAL, ""); PrintAndLogEx(INFO, "Done!"); @@ -5930,7 +5930,7 @@ static int CmdHF14AMfUIncr(const char *Cmd) { if (len != sizeof(current_counter)) { PrintAndLogEx(FAILED, "failed to read old counter"); if (is_ntag) { - PrintAndLogEx(HINT, "NTAG detected, try reading with PWD"); + PrintAndLogEx(HINT, "Hint: NTAG detected, try reading with password"); } DropField(); return PM3_ESOFT; diff --git a/client/src/cmdhftopaz.c b/client/src/cmdhftopaz.c index d7205c784..3646014db 100644 --- a/client/src/cmdhftopaz.c +++ b/client/src/cmdhftopaz.c @@ -837,8 +837,8 @@ static int CmdHFTopazSniff(const char *Cmd) { PacketResponseNG resp; WaitForResponse(CMD_HF_ISO14443A_SNIFF, &resp); PrintAndLogEx(INFO, "Done!"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("hf topaz list")"` to view captured tracelog"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("trace save -h") "` to save tracelog for later analysing"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf topaz list")"` to view captured tracelog"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("trace save -h") "` to save tracelog for later analysing"); return PM3_SUCCESS; } @@ -1052,7 +1052,7 @@ static int CmdHFTopazWrBl(const char *Cmd) { if (res == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "Write ( " _GREEN_("ok") " )"); - PrintAndLogEx(HINT, "try `" _YELLOW_("hf topaz rdbl --blk %u") "` to verify", blockno); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("hf topaz rdbl --blk %u") "` to verify", blockno); } else { PrintAndLogEx(WARNING, "Write ( " _RED_("fail") " )"); diff --git a/client/src/cmdlf.c b/client/src/cmdlf.c index 562e22916..0f63bee43 100644 --- a/client/src/cmdlf.c +++ b/client/src/cmdlf.c @@ -1572,7 +1572,7 @@ static bool check_chiptype(bool getDeviceData) { uint32_t word = 0; if (IfPm3EM4x50() && em4x05_isblock0(&word)) { PrintAndLogEx(SUCCESS, "Chipset detection: " _GREEN_("EM4x05 / EM4x69")); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf em 4x05`") " commands"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf em 4x05") "` commands"); retval = true; goto out; } @@ -1580,7 +1580,7 @@ static bool check_chiptype(bool getDeviceData) { //check for t55xx chip... if (tryDetectP1(true)) { PrintAndLogEx(SUCCESS, "Chipset detection: " _GREEN_("T55xx")); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf t55xx`") " commands"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf t55xx") "` commands"); retval = true; goto out; } @@ -1591,7 +1591,7 @@ static bool check_chiptype(bool getDeviceData) { // Hitag 2 if (ht2_read_uid() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "Chipset detection: " _GREEN_("Hitag 2")); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf hitag`") " commands"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf hitag") "` commands"); retval = true; goto out; } @@ -1599,7 +1599,7 @@ static bool check_chiptype(bool getDeviceData) { // Hitag S if (read_hts_uid() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "Chipset detection: " _GREEN_("Hitag 1/S / 82xx")); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf hitag hts`") " commands"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf hitag hts") "` commands"); retval = true; goto out; } @@ -1607,7 +1607,7 @@ static bool check_chiptype(bool getDeviceData) { // Hitag µ if (read_htu_uid() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "Chipset detection: " _GREEN_("Hitag µ / 8265")); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf hitag htu`") " commands"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf hitag htu") "` commands"); retval = true; goto out; } @@ -1618,7 +1618,7 @@ static bool check_chiptype(bool getDeviceData) { // check for em4x50 chips if (IfPm3EM4x50() && detect_4x50_block()) { PrintAndLogEx(SUCCESS, "Chipset detection: " _GREEN_("EM4x50")); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf em 4x50`") " commands"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf em 4x50") "` commands"); retval = true; goto out; } @@ -1626,7 +1626,7 @@ static bool check_chiptype(bool getDeviceData) { // check for em4x70 chips if (IfPm3EM4x70() && detect_4x70_block()) { PrintAndLogEx(SUCCESS, "Chipset detection: " _GREEN_("EM4x70")); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf em 4x70`") " commands"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf em 4x70") "` commands"); retval = true; goto out; } @@ -1783,7 +1783,7 @@ int CmdLFfind(const char *Cmd) { PrintAndLogEx(NORMAL, ""); PrintAndLogEx(FAILED, _RED_("No data found!")); - PrintAndLogEx(HINT, "Maybe not an LF tag?"); + PrintAndLogEx(HINT, "Hint: Maybe not an LF tag?"); PrintAndLogEx(NORMAL, ""); if (search_cont == 0) { return PM3_ESOFT; diff --git a/client/src/cmdlfawid.c b/client/src/cmdlfawid.c index 07504195a..716da0310 100644 --- a/client/src/cmdlfawid.c +++ b/client/src/cmdlfawid.c @@ -434,7 +434,7 @@ static int CmdAWIDClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf awid reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf awid reader") "` to verify"); return res; } diff --git a/client/src/cmdlfdestron.c b/client/src/cmdlfdestron.c index b5e1b10d9..c8cd6c596 100644 --- a/client/src/cmdlfdestron.c +++ b/client/src/cmdlfdestron.c @@ -213,7 +213,7 @@ static int CmdDestronClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf destron reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf destron reader") "` to verify"); return res; } diff --git a/client/src/cmdlfem410x.c b/client/src/cmdlfem410x.c index c56a22e8c..aa1a860b3 100644 --- a/client/src/cmdlfem410x.c +++ b/client/src/cmdlfem410x.c @@ -859,7 +859,7 @@ static int CmdEM410xClone(const char *Cmd) { switch (resp.status) { case PM3_SUCCESS: { PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf em 410x reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf em 410x reader`") " to verify"); break; } default: { diff --git a/client/src/cmdlfem4x05.c b/client/src/cmdlfem4x05.c index eb62cb31b..539c2bf48 100644 --- a/client/src/cmdlfem4x05.c +++ b/client/src/cmdlfem4x05.c @@ -1486,7 +1486,7 @@ int CmdEM4x05Write(const char *Cmd) { else PrintAndLogEx(DEBUG, "No answer from tag"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf em 4x05 read`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf em 4x05 read") "` to verify"); return status; } diff --git a/client/src/cmdlfem4x50.c b/client/src/cmdlfem4x50.c index 059f563b5..61cf2db22 100644 --- a/client/src/cmdlfem4x50.c +++ b/client/src/cmdlfem4x50.c @@ -215,7 +215,7 @@ static int CmdEM4x50ELoad(const char *Cmd) { // upload to emulator memory em4x50_seteml(data, 0, EM4X50_DUMP_FILESIZE); - PrintAndLogEx(HINT, "You are ready to simulate. See " _YELLOW_("`lf em 4x50 sim -h`")); + PrintAndLogEx(HINT, "Hint: You are ready to simulate. See `" _YELLOW_("lf em 4x50 sim -h") "`"); PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } @@ -983,7 +983,7 @@ static int CmdEM4x50Write(const char *Cmd) { em4x50_prepare_result(data, addr, addr, words); em4x50_print_result(words, addr, addr); PrintAndLogEx(SUCCESS, "Write ( " _GREEN_("ok") " )"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("lf em 4x50 rdbl -b %u") "` - to read your data", addr); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf em 4x50 rdbl -b %u") "` - to read your data", addr); PrintAndLogEx(INFO, "Done!"); return PM3_SUCCESS; } diff --git a/client/src/cmdlfem4x70.c b/client/src/cmdlfem4x70.c index b1869cbc8..be3dbe11a 100644 --- a/client/src/cmdlfem4x70.c +++ b/client/src/cmdlfem4x70.c @@ -1191,7 +1191,7 @@ static int CmdEM4x70AutoRecover(const char *Cmd) { // lf em 4x70 auth --rnd --frn if (PM3_SUCCESS == result) { PrintAndLogEx(INFO, "Step 1. Verifying passed parameters authenticate with the tag (safety check)"); - PrintAndLogEx(HINT, " " _YELLOW_("lf em 4x70 auth --rnd %s --frn %s"), rnd_string, frn_string); + PrintAndLogEx(HINT, "Hint: " _YELLOW_("lf em 4x70 auth --rnd %s --frn %s"), rnd_string, frn_string); em4x70_cmd_input_auth_t opts_auth = { .use_parity = opts.parity, @@ -1237,7 +1237,7 @@ static int CmdEM4x70AutoRecover(const char *Cmd) { // lf em 4x70 write -b N -d 0000 if (PM3_SUCCESS == result) { PrintAndLogEx(INFO, "Step %d. Brute force the key bits in block %d", step, block); - PrintAndLogEx(HINT, " " _YELLOW_("lf em 4x70 write -b %d -d 0000"), block); + PrintAndLogEx(HINT, "Hint: " _YELLOW_("lf em 4x70 write -b %d -d 0000"), block); em4x70_cmd_input_writeblock_t opt_write_zeros = { .use_parity = opts.parity, @@ -1249,18 +1249,18 @@ static int CmdEM4x70AutoRecover(const char *Cmd) { if (PM3_ETIMEOUT == result) { PrintAndLogEx(FAILED, "timeout while waiting for reply"); - PrintAndLogEx(HINT, "Block %d data may have been overwritten. Manually restart at step %d", block, step); + PrintAndLogEx(HINT, "Hint: Block %d data may have been overwritten. Manually restart at step %d", block, step); return result; } else if (PM3_SUCCESS != result) { PrintAndLogEx(FAILED, "Writing block %d ( " _RED_("fail") " )", block); - PrintAndLogEx(HINT, "Block %d data was overwritten. Manually restart at step %d", block, step); + PrintAndLogEx(HINT, "Hint: Block %d data was overwritten. Manually restart at step %d", block, step); return result; } } // lf em 4x70 brute -b N --rnd --frn if (PM3_SUCCESS == result) { - PrintAndLogEx(HINT, " " _YELLOW_("lf em 4x70 brute -b %d --rnd %s --frn %s"), block, rnd_string, frn_string); + PrintAndLogEx(HINT, "Hint: " _YELLOW_("lf em 4x70 brute -b %d --rnd %s --frn %s"), block, rnd_string, frn_string); em4x70_cmd_input_brute_t opts_brute = { .use_parity = opts.parity, @@ -1274,11 +1274,11 @@ static int CmdEM4x70AutoRecover(const char *Cmd) { if (PM3_ETIMEOUT == result) { PrintAndLogEx(FAILED, "timeout while waiting for reply"); - PrintAndLogEx(HINT, "Block %d data was overwritten. Manually restart at step %d", block, step); + PrintAndLogEx(HINT, "Hint: Block %d data was overwritten. Manually restart at step %d", block, step); return result; } else if (PM3_SUCCESS != result) { PrintAndLogEx(FAILED, "Writing block %d ( " _RED_("fail") " )", block); - PrintAndLogEx(HINT, "Block %d data was overwritten. Manually restart at step %d", block, step); + PrintAndLogEx(HINT, "Hint: Block %d data was overwritten. Manually restart at step %d", block, step); return result; } else { PrintAndLogEx(INFO, " Found: Partial key in block %d is " _GREEN_("%02X%02X") @@ -1301,7 +1301,7 @@ static int CmdEM4x70AutoRecover(const char *Cmd) { } // lf em 4x70 write -b N -d if (PM3_SUCCESS == result) { - PrintAndLogEx(HINT, " " _YELLOW_("lf em 4x70 write -b %d -d %02X%02X"), block, brute.partial_key[0], brute.partial_key[1]); + PrintAndLogEx(HINT, "Hint: " _YELLOW_("lf em 4x70 write -b %d -d %02X%02X"), block, brute.partial_key[0], brute.partial_key[1]); em4x70_cmd_input_writeblock_t opt_write_zeros = { .use_parity = opts.parity, @@ -1313,11 +1313,11 @@ static int CmdEM4x70AutoRecover(const char *Cmd) { if (PM3_ETIMEOUT == result) { PrintAndLogEx(FAILED, "timeout while waiting for reply"); - PrintAndLogEx(HINT, "Block %d data (" _GREEN_("%02X%02X") ") may need to be rewritten", block, brute.partial_key[0], brute.partial_key[1]); + PrintAndLogEx(HINT, "Hint: Block %d data (" _GREEN_("%02X%02X") ") may need to be rewritten", block, brute.partial_key[0], brute.partial_key[1]); return result; } else if (PM3_SUCCESS != result) { PrintAndLogEx(FAILED, "Writing block %d ( " _RED_("fail") " )", block); - PrintAndLogEx(HINT, "Block %d data (" _GREEN_("%02X%02X") ") may need to be rewritten", block, brute.partial_key[0], brute.partial_key[1]); + PrintAndLogEx(HINT, "Hint: Block %d data (" _GREEN_("%02X%02X") ") may need to be rewritten", block, brute.partial_key[0], brute.partial_key[1]); return result; } } @@ -1335,7 +1335,7 @@ static int CmdEM4x70AutoRecover(const char *Cmd) { // lf em 4x70 recover --key --rnd --frn if (PM3_SUCCESS == result) { PrintAndLogEx(INFO, "Step 5. Recover potential values of the lower 48 bits of the key"); - PrintAndLogEx(HINT, " " _YELLOW_("lf em 4x70 recover --key %s --rnd %s --frn %s --grn %s"), key_string, rnd_string, frn_string, grn_string); + PrintAndLogEx(HINT, "Hint: " _YELLOW_("lf em 4x70 recover --key %s --rnd %s --frn %s --grn %s"), key_string, rnd_string, frn_string, grn_string); result = recover_em4x70(&opts, &data); diff --git a/client/src/cmdlffdxb.c b/client/src/cmdlffdxb.c index f7b6742c6..a2e0e10a1 100644 --- a/client/src/cmdlffdxb.c +++ b/client/src/cmdlffdxb.c @@ -803,7 +803,7 @@ static int CmdFdxBClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf fdxb reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf fdxb reader`") " to verify"); return res; } diff --git a/client/src/cmdlfgallagher.c b/client/src/cmdlfgallagher.c index 5617d90a8..5f25513c6 100644 --- a/client/src/cmdlfgallagher.c +++ b/client/src/cmdlfgallagher.c @@ -277,7 +277,7 @@ static int CmdGallagherClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf gallagher reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf gallagher reader`") " to verify"); return res; } diff --git a/client/src/cmdlfguard.c b/client/src/cmdlfguard.c index 441c327b4..bc498f9a4 100644 --- a/client/src/cmdlfguard.c +++ b/client/src/cmdlfguard.c @@ -332,7 +332,7 @@ static int CmdGuardClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf gproxii reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf gproxii reader`") " to verify"); return res; } diff --git a/client/src/cmdlfhid.c b/client/src/cmdlfhid.c index a1631c0b7..02b266a87 100644 --- a/client/src/cmdlfhid.c +++ b/client/src/cmdlfhid.c @@ -479,7 +479,7 @@ static int CmdHIDClone(const char *Cmd) { if (resp.status == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf hid reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf hid reader`") " to verify"); } else { PrintAndLogEx(FAILED, "cloning ( " _RED_("fail") " )"); } diff --git a/client/src/cmdlfhitag.c b/client/src/cmdlfhitag.c index 9ebe97891..f3c2beb21 100644 --- a/client/src/cmdlfhitag.c +++ b/client/src/cmdlfhitag.c @@ -1807,8 +1807,8 @@ static int CmdLFHitagSniff(const char *Cmd) { SendCommandNG(CMD_LF_HITAG_SNIFF, NULL, 0); WaitForResponse(CMD_LF_HITAG_SNIFF, &resp); PrintAndLogEx(INFO, "Done!"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("lf hitag list")"` to view captured tracelog"); - PrintAndLogEx(HINT, "Try `" _YELLOW_("trace save -h") "` to save tracelog for later analysing"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf hitag list")"` to view captured tracelog"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("trace save -h") "` to save tracelog for later analysing"); return PM3_SUCCESS; } @@ -2242,7 +2242,7 @@ static int CmdLFHitag2Crack2(const char *Cmd) { } PrintAndLogEx(NORMAL, ""); PrintAndLogEx(SUCCESS, "Nonce replay and length extension attack ( %s )", _GREEN_("ok")); - PrintAndLogEx(HINT, "try running `tools/hitag2crack/crack2/ht2crack2search "); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("tools/hitag2crack/crack2/ht2crack2search ") "`"); break; } else { PrintAndLogEx(NORMAL, ""); diff --git a/client/src/cmdlfidteck.c b/client/src/cmdlfidteck.c index 0fb4242fc..fa498ea74 100644 --- a/client/src/cmdlfidteck.c +++ b/client/src/cmdlfidteck.c @@ -227,7 +227,7 @@ static int CmdIdteckClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf idteck reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf idteck reader`") " to verify"); return res; } diff --git a/client/src/cmdlfindala.c b/client/src/cmdlfindala.c index 80a7b5fbb..78fb5fad3 100644 --- a/client/src/cmdlfindala.c +++ b/client/src/cmdlfindala.c @@ -946,7 +946,7 @@ static int CmdIndalaClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf indala reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf indala reader`") " to verify"); return res; } diff --git a/client/src/cmdlfio.c b/client/src/cmdlfio.c index 6e92ce362..c648fc388 100644 --- a/client/src/cmdlfio.c +++ b/client/src/cmdlfio.c @@ -359,7 +359,7 @@ static int CmdIOProxClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf io reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf io reader`") " to verify"); return res; } diff --git a/client/src/cmdlfjablotron.c b/client/src/cmdlfjablotron.c index b584d8187..658b90965 100644 --- a/client/src/cmdlfjablotron.c +++ b/client/src/cmdlfjablotron.c @@ -241,7 +241,7 @@ static int CmdJablotronClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf jablotron reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf jablotron reader`") " to verify"); return res; } diff --git a/client/src/cmdlfkeri.c b/client/src/cmdlfkeri.c index 16f7d07c9..3f188f8eb 100644 --- a/client/src/cmdlfkeri.c +++ b/client/src/cmdlfkeri.c @@ -310,7 +310,7 @@ static int CmdKeriClone(const char *Cmd) { } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf keri read`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf keri read`") " to verify"); return res; } diff --git a/client/src/cmdlfmotorola.c b/client/src/cmdlfmotorola.c index 00f22cad3..99caaa7a3 100644 --- a/client/src/cmdlfmotorola.c +++ b/client/src/cmdlfmotorola.c @@ -254,7 +254,7 @@ static int CmdMotorolaClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf motorola reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf motorola reader`") " to verify"); return res; } diff --git a/client/src/cmdlfnedap.c b/client/src/cmdlfnedap.c index e5f857a03..c7369cc11 100644 --- a/client/src/cmdlfnedap.c +++ b/client/src/cmdlfnedap.c @@ -473,7 +473,7 @@ static int CmdLFNedapClone(const char *Cmd) { PrintAndLogEx(NORMAL, ""); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf nedap reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf nedap reader`") " to verify"); return res; } diff --git a/client/src/cmdlfnexwatch.c b/client/src/cmdlfnexwatch.c index 6977f5593..e725c998d 100644 --- a/client/src/cmdlfnexwatch.c +++ b/client/src/cmdlfnexwatch.c @@ -448,7 +448,7 @@ static int CmdNexWatchClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf nexwatch reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf nexwatch reader`") " to verify"); return res; } diff --git a/client/src/cmdlfnoralsy.c b/client/src/cmdlfnoralsy.c index 7eaf22f7d..9360e6d3e 100644 --- a/client/src/cmdlfnoralsy.c +++ b/client/src/cmdlfnoralsy.c @@ -221,7 +221,7 @@ static int CmdNoralsyClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf noralsy reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf noralsy reader`") " to verify"); return res; } diff --git a/client/src/cmdlfpac.c b/client/src/cmdlfpac.c index 46c81876c..95c58e4f2 100644 --- a/client/src/cmdlfpac.c +++ b/client/src/cmdlfpac.c @@ -305,7 +305,7 @@ static int CmdPacClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf pac reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf pac reader`") " to verify"); return res; } diff --git a/client/src/cmdlfparadox.c b/client/src/cmdlfparadox.c index 8c5e0cf8e..df9fc97e3 100644 --- a/client/src/cmdlfparadox.c +++ b/client/src/cmdlfparadox.c @@ -384,7 +384,7 @@ static int CmdParadoxClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf paradox read`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf paradox read`") " to verify"); return res; } diff --git a/client/src/cmdlfpcf7931.c b/client/src/cmdlfpcf7931.c index 8b7e73def..ae19b174f 100644 --- a/client/src/cmdlfpcf7931.c +++ b/client/src/cmdlfpcf7931.c @@ -44,7 +44,7 @@ int pcf7931_resetConfig(void) { configPcf.OffsetWidth = PCF7931_DEFAULT_OFFSET_WIDTH; configPcf.OffsetPosition = PCF7931_DEFAULT_OFFSET_POSITION; PrintAndLogEx(INFO, "Configuration reset"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf pcf7931 config`") " to view current settings"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf pcf7931 config") "` to view current settings"); return PM3_SUCCESS; } @@ -194,7 +194,7 @@ static int CmdLFPCF7931Write(const char *Cmd) { SendCommandMIX(CMD_LF_PCF7931_WRITE, block, idx, data[0], buf, sizeof(buf)); PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf pcf7931 reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf pcf7931 reader`") " to verify"); return PM3_SUCCESS; } diff --git a/client/src/cmdlfpresco.c b/client/src/cmdlfpresco.c index c566c9c4b..de4f7fb12 100644 --- a/client/src/cmdlfpresco.c +++ b/client/src/cmdlfpresco.c @@ -265,7 +265,7 @@ static int CmdPrescoClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf presco reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf presco reader`") " to verify"); return res; } diff --git a/client/src/cmdlfpyramid.c b/client/src/cmdlfpyramid.c index f61914e66..eb9385b2f 100644 --- a/client/src/cmdlfpyramid.c +++ b/client/src/cmdlfpyramid.c @@ -357,7 +357,7 @@ static int CmdPyramidClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf pyramid reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf pyramid reader`") " to verify"); return res; } diff --git a/client/src/cmdlfsecurakey.c b/client/src/cmdlfsecurakey.c index 3d61887e5..eb87aa9dd 100644 --- a/client/src/cmdlfsecurakey.c +++ b/client/src/cmdlfsecurakey.c @@ -233,7 +233,7 @@ static int CmdSecurakeyClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf securakey reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf securakey reader`") " to verify"); return res; } diff --git a/client/src/cmdlft55xx.c b/client/src/cmdlft55xx.c index 2afbf5c2e..440ef656a 100644 --- a/client/src/cmdlft55xx.c +++ b/client/src/cmdlft55xx.c @@ -900,7 +900,7 @@ int T55xxReadBlockEx(uint8_t block, bool page1, bool usepwd, uint8_t override, u if (t55xxTryDetectModulationEx(downlink_mode, false, 0, password) == false) { PrintAndLogEx(WARNING, "Safety check: Could not detect if PWD bit is set in config block. Exits."); - PrintAndLogEx(HINT, "Consider using the override parameter to force read."); + PrintAndLogEx(HINT, "Hint: Consider using the override parameter to force read."); return PM3_EWRONGANSWER; } else { PrintAndLogEx(WARNING, "Safety check: PWD bit is NOT set in config block. Reading without password..."); diff --git a/client/src/cmdlfti.c b/client/src/cmdlfti.c index 2c28bab8b..4664a344d 100644 --- a/client/src/cmdlfti.c +++ b/client/src/cmdlfti.c @@ -370,7 +370,7 @@ static int CmdTIWrite(const char *Cmd) { clearCommandBuffer(); SendCommandNG(CMD_LF_TI_WRITE, (uint8_t *)&payload, sizeof(payload)); PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf ti reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf ti reader`") " to verify"); return PM3_SUCCESS; } diff --git a/client/src/cmdlfverichip_disabled.c b/client/src/cmdlfverichip_disabled.c index fe9dc438f..b524f9e57 100644 --- a/client/src/cmdlfverichip_disabled.c +++ b/client/src/cmdlfverichip_disabled.c @@ -138,7 +138,7 @@ static int CmdVerichipClone(const char *Cmd) { int res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf verichip read`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf verichip read`") " to verify"); return res; } diff --git a/client/src/cmdlfviking.c b/client/src/cmdlfviking.c index d2f3b4e39..ed77f39e0 100644 --- a/client/src/cmdlfviking.c +++ b/client/src/cmdlfviking.c @@ -177,7 +177,7 @@ static int CmdVikingClone(const char *Cmd) { return PM3_ETIMEOUT; } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf viking reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try " _YELLOW_("`lf viking reader`") " to verify"); return resp.status; } diff --git a/client/src/cmdlfvisa2000.c b/client/src/cmdlfvisa2000.c index c7b9c8393..46b6c5b2f 100644 --- a/client/src/cmdlfvisa2000.c +++ b/client/src/cmdlfvisa2000.c @@ -245,7 +245,7 @@ static int CmdVisa2kClone(const char *Cmd) { res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); } PrintAndLogEx(SUCCESS, "Done!"); - PrintAndLogEx(HINT, "Hint: try " _YELLOW_("`lf visa2000 reader`") " to verify"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("lf visa2000 reader") "` to verify"); return res; } diff --git a/client/src/cmdsmartcard.c b/client/src/cmdsmartcard.c index 13f044320..005769083 100644 --- a/client/src/cmdsmartcard.c +++ b/client/src/cmdsmartcard.c @@ -696,7 +696,7 @@ static int CmdSmartUpgrade(const char *Cmd) { if (resp.status == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "Sim module firmware upgrade " _GREEN_("successful")); - PrintAndLogEx(HINT, "run " _YELLOW_("`hw status`") " to validate the fw version "); + PrintAndLogEx(HINT, "Hint: Run `" _YELLOW_("hw status") "` to validate the fw version "); } else { PrintAndLogEx(FAILED, "Sim module firmware upgrade " _RED_("failed")); } diff --git a/client/src/cmdtrace.c b/client/src/cmdtrace.c index a9c637149..f6d7fff6a 100644 --- a/client/src/cmdtrace.c +++ b/client/src/cmdtrace.c @@ -1231,7 +1231,7 @@ static int CmdTraceLoad(const char *Cmd) { gs_traceLen = (long)len; PrintAndLogEx(SUCCESS, "Recorded Activity (TraceLen = " _YELLOW_("%u") " bytes)", gs_traceLen); - PrintAndLogEx(HINT, "try " _YELLOW_("`trace list -1 -t ...`") " to view trace. Remember the " _YELLOW_("`-1`") " param"); + PrintAndLogEx(HINT, "Hint: Try `" _YELLOW_("trace list -1 -t ...") "` to view trace. Remember the " _YELLOW_("`-1`") " param"); return PM3_SUCCESS; } @@ -1588,7 +1588,7 @@ int CmdTraceList(const char *Cmd) { } if (show_hex) { - PrintAndLogEx(HINT, "syntax to use: " _YELLOW_("`text2pcap -t \"%%S.\" -l 264 -n `")); + PrintAndLogEx(HINT, "Hint: Syntax to use: `" _YELLOW_("text2pcap -t \"%%S.\" -l 264 -n ") "`"); } return PM3_SUCCESS; diff --git a/client/src/comms.c b/client/src/comms.c index 01fa44a15..e6a7c08e7 100644 --- a/client/src/comms.c +++ b/client/src/comms.c @@ -788,12 +788,12 @@ bool OpenProxmark(pm3_device_t **dev, const char *port, bool wait_for_port, int // check result of uart opening if (sp == INVALID_SERIAL_PORT) { PrintAndLogEx(WARNING, "\n" _RED_("ERROR:") " invalid serial port " _YELLOW_("%s"), port); - PrintAndLogEx(HINT, "Try the shell script " _YELLOW_("`./pm3 --list`") " to get a list of possible serial ports"); + PrintAndLogEx(HINT, "Hint: Try the shell script `" _YELLOW_("`./pm3 --list") "` to get a list of possible serial ports"); sp = NULL; return false; } else if (sp == CLAIMED_SERIAL_PORT) { PrintAndLogEx(WARNING, "\n" _RED_("ERROR:") " serial port " _YELLOW_("%s") " is claimed by another process", port); - PrintAndLogEx(HINT, "Try the shell script " _YELLOW_("`./pm3 --list`") " to get a list of possible serial ports"); + PrintAndLogEx(HINT, "Hint: Try the shell script `" _YELLOW_("./pm3 --list") "` to get a list of possible serial ports"); sp = NULL; return false; diff --git a/client/src/crypto/libpcrypto.c b/client/src/crypto/libpcrypto.c index 21f03ed79..031005ce0 100644 --- a/client/src/crypto/libpcrypto.c +++ b/client/src/crypto/libpcrypto.c @@ -128,7 +128,7 @@ void des3_decrypt(void *out, const void *in, const void *key, uint8_t keycount) int aes_encode(uint8_t *iv, uint8_t *key, uint8_t *input, uint8_t *output, int length) { uint8_t iiv[16] = {0}; if (iv) { - memcpy(iiv, iv, 16); + memcpy(iiv, iv, sizeof(iiv)); } mbedtls_aes_context aes; diff --git a/client/src/mifare/mad.c b/client/src/mifare/mad.c index a3365bb04..b5ab07897 100644 --- a/client/src/mifare/mad.c +++ b/client/src/mifare/mad.c @@ -145,15 +145,19 @@ static int print_aid_description(json_t *root, uint16_t aid, char *fmt, bool ver } if (verbose) { - PrintAndLogEx(SUCCESS, " MAD: %s", vmad); - if (application) - PrintAndLogEx(SUCCESS, " Application: %s", application); - if (company) - PrintAndLogEx(SUCCESS, " Company: %s", company); - if (provider) - PrintAndLogEx(SUCCESS, " Service provider: %s", provider); - if (integrator) - PrintAndLogEx(SUCCESS, " System integrator: %s", integrator); + PrintAndLogEx(SUCCESS, " MAD................. %s", vmad); + if (application) { + PrintAndLogEx(SUCCESS, " Application......... %s", application); + } + if (company) { + PrintAndLogEx(SUCCESS, " Company............. %s", company); + } + if (provider) { + PrintAndLogEx(SUCCESS, " Service provider.... %s", provider); + } + if (integrator) { + PrintAndLogEx(SUCCESS, " System integrator... %s", integrator); + } } return PM3_SUCCESS; }