reenabled felica in hf search

This commit is contained in:
iceman1001 2021-04-14 08:15:30 +02:00
commit eb4181d8be

View file

@ -127,6 +127,15 @@ int CmdHFSearch(const char *Cmd) {
} }
} }
PROMPT_CLEARLINE;
PrintAndLogEx(INPLACE, " Searching for FeliCa tag...");
if (IfPm3Felica()) {
if (read_felica_uid(false, false) == PM3_SUCCESS) {
PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO18092 / FeliCa tag") " found\n");
res = PM3_SUCCESS;
}
}
// 14b is the longest test (put last) // 14b is the longest test (put last)
PROMPT_CLEARLINE; PROMPT_CLEARLINE;
PrintAndLogEx(INPLACE, " Searching for ISO14443-B tag..."); PrintAndLogEx(INPLACE, " Searching for ISO14443-B tag...");
@ -139,22 +148,13 @@ int CmdHFSearch(const char *Cmd) {
/* /*
PROMPT_CLEARLINE; PROMPT_CLEARLINE;
PrintAndLogEx(INPLACE, " Searching for FeliCa tag..."); PrintAndLogEx(INPLACE, " Searching for CryptoRF tag...");
if (IfPm3Felica()) { if (IfPm3Iso14443b()) {
if (read_felica_uid(false, false) == PM3_SUCCESS) { if (readHFCryptoRF(false, false) == PM3_SUCCESS) {
PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("ISO18092 / FeliCa tag") " found\n"); PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("CryptoRF tag") " found\n");
res = PM3_SUCCESS; res = PM3_SUCCESS;
} }
} }
PROMPT_CLEARLINE;
PrintAndLogEx(INPLACE, " Searching for CryptoRF tag...");
if (IfPm3Iso14443b()) {
if (readHFCryptoRF(false, false) == PM3_SUCCESS) {
PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("CryptoRF tag") " found\n");
res = PM3_SUCCESS;
}
}
*/ */
PROMPT_CLEARLINE; PROMPT_CLEARLINE;