This commit is contained in:
iceman1001 2020-01-14 21:17:56 +01:00
parent e5a1861552
commit d956e8c2a3

View file

@ -571,7 +571,7 @@ static int CmdHF14AMfDarkside(const char *Cmd) {
PrintAndLogEx(WARNING, "aborted via keyboard."); PrintAndLogEx(WARNING, "aborted via keyboard.");
return 1; return 1;
default : default :
PrintAndLogEx(SUCCESS, "found valid key: %012" PRIx64 "\n", key); PrintAndLogEx(SUCCESS, "found valid key: "_YELLOW_("%012" PRIx64), key);
break; break;
} }
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
@ -1281,7 +1281,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
// check if tag doesn't have static nonce // check if tag doesn't have static nonce
if (detect_classic_static_nonce() != 0) { if (detect_classic_static_nonce() != 0) {
PrintAndLogEx(WARNING, "Static nonce detected. Quitting..."); PrintAndLogEx(WARNING, "Static nonce detected. Quitting...");
PrintAndLogEx(INFO, "\t Try use `" _YELLOW_("hf mf staticnested") "`"); PrintAndLogEx(INFO, "\t Try use " _YELLOW_("`hf mf staticnested`"));
return PM3_EOPABORTED; return PM3_EOPABORTED;
} }
@ -1534,7 +1534,8 @@ static int CmdHF14AMfNestedStatic(const char *Cmd) {
// check if tag have static nonce // check if tag have static nonce
if (detect_classic_static_nonce() == 0) { if (detect_classic_static_nonce() == 0) {
PrintAndLogEx(WARNING, "Normal nonce detected. Quitting..."); PrintAndLogEx(WARNING, "None static nonce detected. Quitting...");
PrintAndLogEx(INFO, "\t Try use " _YELLOW_("`hf mf nested`"));
return PM3_EOPABORTED; return PM3_EOPABORTED;
} }
@ -1685,7 +1686,6 @@ jumptoend:
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int CmdHF14AMfNestedHard(const char *Cmd) { static int CmdHF14AMfNestedHard(const char *Cmd) {
uint8_t blockNo = 0; uint8_t blockNo = 0;
uint8_t keyType = 0; uint8_t keyType = 0;