github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

CHG: reordered the "hf search" internal checks. The iclass check takes 4.5sec to time-out...Incredible slow to identify.

Browse source
This commit is contained in:
iceman1001 2016-10-08 19:14:09 +02:00
commit f9b5377fd0
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/cmdhf.c
View file

@ -874,35 +874,34 @@ int CmdHFSearch(const char *Cmd){
PrintAndLog(""); PrintAndLog("");
int ans = CmdHF14AReader("s"); int ans = CmdHF14AReader("s");
if (ans > 0) { if (ans > 0) {
PrintAndLog("\nValid ISO14443-A Tag Found - Quiting Search\n"); PrintAndLog("\nValid ISO14443-A Tag Found - Quiting Search\n");
return ans; return ans;
} }
ans = CmdHF14BReader("s"); ans = HF14BReader(false); //CmdHF14BReader("s");
if (ans) { if (ans) {
PrintAndLog("\nValid ISO14443-B Tag Found - Quiting Search\n"); PrintAndLog("\nValid ISO14443-B Tag Found - Quiting Search\n");
return ans; return ans;
} }
ans = HFiClassReader("", false, false);
if (ans) {
PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
return ans;
}
ans = HF15Reader("", false); ans = HF15Reader("", false);
if (ans) { if (ans) {
PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n"); PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
return ans; return ans;
} }
ans = HFLegicReader("", false);
if ( ans == 0) {
PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
return 1;
}
ans = CmdHFTopazReader("s"); ans = CmdHFTopazReader("s");
if (ans == 0) { if (ans == 0) {
PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n"); PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
return 1; return 1;
} }
ans = HFLegicReader("", false); ans = HFiClassReader("", false, false);
if ( ans == 0) { if (ans) {
PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n"); PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
return 1; return ans;
} }
PrintAndLog("\nno known/supported 13.56 MHz tags found\n"); PrintAndLog("\nno known/supported 13.56 MHz tags found\n");