FIX: 'hf 14a reader' - when card SAK was 0x00, it calls GetHF14AMfU_Type() to try...

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 44ad970032e2047dd9aace83c72abf0a9ea2cf1c..031f065ea99c35b0b463c40dfd057426789720fe 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -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");