mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-09-21 07:46:12 +08:00
CHG: reordered the "hf search" internal checks. The iclass check takes 4.5sec to time-out...Incredible slow to identify.
This commit is contained in:
parent
8ddfbc34dc
commit
f9b5377fd0
|
@ -874,35 +874,34 @@ int CmdHFSearch(const char *Cmd){
|
|||
|
||||
PrintAndLog("");
|
||||
int ans = CmdHF14AReader("s");
|
||||
|
||||
if (ans > 0) {
|
||||
PrintAndLog("\nValid ISO14443-A Tag Found - Quiting Search\n");
|
||||
return ans;
|
||||
}
|
||||
ans = CmdHF14BReader("s");
|
||||
ans = HF14BReader(false); //CmdHF14BReader("s");
|
||||
if (ans) {
|
||||
PrintAndLog("\nValid ISO14443-B Tag Found - Quiting Search\n");
|
||||
return ans;
|
||||
}
|
||||
ans = HFiClassReader("", false, false);
|
||||
if (ans) {
|
||||
PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
|
||||
return ans;
|
||||
}
|
||||
ans = HF15Reader("", false);
|
||||
if (ans) {
|
||||
PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
|
||||
return ans;
|
||||
}
|
||||
ans = HFLegicReader("", false);
|
||||
if ( ans == 0) {
|
||||
PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
|
||||
return 1;
|
||||
}
|
||||
ans = CmdHFTopazReader("s");
|
||||
if (ans == 0) {
|
||||
PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
|
||||
return 1;
|
||||
}
|
||||
ans = HFLegicReader("", false);
|
||||
if ( ans == 0) {
|
||||
PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
|
||||
return 1;
|
||||
ans = HFiClassReader("", false, false);
|
||||
if (ans) {
|
||||
PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
|
||||
return ans;
|
||||
}
|
||||
|
||||
PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
|
||||
|
|
Loading…
Reference in a new issue