Bugfix 'hf list 14b' and 'hf list raw'

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 20ca057b3846629e62d75320b22da4881f040c87..9acc9825bb66b71344655d8e28e9dbc84dab2f69 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -519,9 +519,9 @@ int CmdHFList(const char *Cmd)
        int tlen = param_getstr(Cmd,0,type);
        char param = param_getchar(Cmd, 1);
        bool errors = false;
        int tlen = param_getstr(Cmd,0,type);
        char param = param_getchar(Cmd, 1);
        bool errors = false;

-       uint8_t protocol = false;
+       uint8_t protocol = 0;

        //Validate params
        //Validate params

-       if(tlen == 0 || (strcmp(type, "iclass") != 0 && strcmp(type,"14a") != 0))
+       if(tlen == 0)

        {
                errors = true;
        }
        {
                errors = true;
        }


@@ -529,6 +529,25 @@ int CmdHFList(const char *Cmd)
        {
                errors = true;
        }
        {
                errors = true;
        }

+       if(!errors)
+       {
+               if(strcmp(type, "iclass") == 0)
+               {
+                       protocol = ICLASS;
+               }else if(strcmp(type, "14a") == 0)
+               {
+                       protocol = ISO_14443A;
+               }
+               else if(strcmp(type, "14b") == 0)
+               {
+                       protocol = ISO_14443B;
+               }else if(strcmp(type,"raw")== 0)
+               {
+                       protocol = -1;//No crc, no annotations
+               }else{
+                       errors = true;
+               }
+       }

 
        if (errors) {
                PrintAndLog("List protocol data in trace buffer.");
 
        if (errors) {
                PrintAndLog("List protocol data in trace buffer.");


@@ -543,20 +562,7 @@ int CmdHFList(const char *Cmd)
                PrintAndLog("example: hf list iclass");
                return 0;
        }
                PrintAndLog("example: hf list iclass");
                return 0;
        }

-       if(strcmp(type, "iclass") == 0)
-       {
-               protocol = ICLASS;
-       }else if(strcmp(type, "14a") == 0)
-       {
-               protocol = ISO_14443A;
-       }
-       else if(strcmp(type, "14b") == 0)
-       {
-               protocol = ISO_14443B;
-       }else if(strcmp(type,"raw")== 0)
-       {
-               protocol = -1;//No crc, no annotations
-       }
+

 
        if (param == 'f') {
                showWaitCycles = true;
 
        if (param == 'f') {
                showWaitCycles = true;