Merge pull request #362 from merlokk/master

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index dcfb1bdd38d98af1b1b8504c386feb5883ea8f12..eb2ba9b2e6d0e5b11030bb80948c109ad64f7729 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -673,14 +673,15 @@ int CmdHFSearch(const char *Cmd){
                PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
                return ans;
        }
                PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
                return ans;
        }

-       ans = HF14BInfo(false);
+       ans = HF15Reader("", false);

        if (ans) {
        if (ans) {

-               PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");
+               PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");

                return ans;
        }
                return ans;
        }

-       ans = HF15Reader("", false);
+       //14b is longest test currently (and rarest chip type) ... put last
+       ans = HF14BInfo(false);

        if (ans) {
        if (ans) {

-               PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
+               PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");

                return ans;
        }
        PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
                return ans;
        }
        PrintAndLog("\nno known/supported 13.56 MHz tags found\n");