RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 02:34:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

Replace WITH_HITAG by dynamic detection in client

Browse source
This commit is contained in:
Philippe Teuwen 2019-05-01 23:26:06 +02:00
parent 78fdffddf7
commit d7b53aacee
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/cmdlf.c
View file

@ -865,9 +865,9 @@ int CmdLFfind(const char *Cmd) {
// The improved noise detection will find Cotag.
if (getSignalProperties()->isnoise) {
#ifdef WITH_HITAG
if (readHitagUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return 1;}
#endif
if (IfPm3Hitag()) {
if (readHitagUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Hitag") " found!"); return 1;}
}
if (readCOTAGUid()) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("COTAG ID") " found!"); return 1;}
PrintAndLogEx(FAILED, "\n" _YELLOW_("No data found!") " - Signal looks like noise. Maybe not an LF tag?");
@ -956,9 +956,7 @@ static command_t CommandTable[] = {
{"fdx", CmdLFFdx, AlwaysAvailable, "{ FDX-B RFIDs... }"},
{"gproxii", CmdLFGuard, AlwaysAvailable, "{ Guardall Prox II RFIDs... }"},
{"hid", CmdLFHID, AlwaysAvailable, "{ HID RFIDs... }"},
#ifdef WITH_HITAG
{"hitag", CmdLFHitag, AlwaysAvailable, "{ Hitag CHIPs... }"},
#endif
{"indala", CmdLFINDALA, AlwaysAvailable, "{ Indala RFIDs... }"},
{"io", CmdLFIO, AlwaysAvailable, "{ ioProx RFIDs... }"},
{"jablotron", CmdLFJablotron, AlwaysAvailable, "{ Jablotron RFIDs... }"},

14
client/cmdlfhitag.c
View file

@ -695,13 +695,13 @@ static int CmdLFHitagDump(const char *Cmd) {
static command_t CommandTable[] = {
{"help", CmdHelp, AlwaysAvailable, "This help" },
{"list", CmdLFHitagList, IfPm3Present, "List Hitag trace history" },
{"info", CmdLFHitagInfo, AlwaysAvailable, "Tag information" },
{"reader", CmdLFHitagReader, AlwaysAvailable, "Act like a Hitag Reader" },
{"sim", CmdLFHitagSim, AlwaysAvailable, "Simulate Hitag transponder" },
{"sniff", CmdLFHitagSniff, AlwaysAvailable, "Eavesdrop Hitag communication" },
{"writer", CmdLFHitagWriter, AlwaysAvailable, "Act like a Hitag Writer" },
{"cc", CmdLFHitagCheckChallenges, AlwaysAvailable, "Test all challenges" },
{"list", CmdLFHitagList, IfPm3Hitag, "List Hitag trace history" },
{"info", CmdLFHitagInfo, IfPm3Hitag, "Tag information" },
{"reader", CmdLFHitagReader, IfPm3Hitag, "Act like a Hitag Reader" },
{"sim", CmdLFHitagSim, IfPm3Hitag, "Simulate Hitag transponder" },
{"sniff", CmdLFHitagSniff, IfPm3Hitag, "Eavesdrop Hitag communication" },
{"writer", CmdLFHitagWriter, IfPm3Hitag, "Act like a Hitag Writer" },
{"cc", CmdLFHitagCheckChallenges, IfPm3Hitag, "Test all challenges" },
{ NULL, NULL, 0, NULL }
};