ADD: LF JABLOTRON functionality. with clone/sim and detection in LF SEARCH.

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 2dc21fd9899f340084654eca5122a3afc8e1590f..a14c2e59f3b922df5ef5b1b245028df9913615f6 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -270,17 +270,16 @@ void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
                case ISO14443B_REQB             : {
                        
                        switch ( cmd[2] & 0x07 ) {
                case ISO14443B_REQB             : {
                        
                        switch ( cmd[2] & 0x07 ) {

-                               case 0: snprintf(exp, size,"1 slot ");
-                               case 1: snprintf(exp, size,"2 slots "); 
-                               case 2: snprintf(exp, size,"4 slots ");
-                               case 3: snprintf(exp, size,"8 slots ");
-                               default: snprintf(exp, size,"16 slots ");
-                       }
-                       
-                       if ( (cmd[2] & 0x4) == 1 )
-                               snprintf(exp, size,"REQB");
-                       else
+                               case 0: snprintf(exp, size,"1 slot ");break;
+                               case 1: snprintf(exp, size,"2 slots ");break; 
+                               case 2: snprintf(exp, size,"4 slots ");break;
+                               case 3: snprintf(exp, size,"8 slots ");break;
+                               default: snprintf(exp, size,"16 slots ");break;
+                       }                       
+                       if ( (cmd[2] & 0x8) )

                                snprintf(exp, size,"WUPB");
                                snprintf(exp, size,"WUPB");

+                       else
+                               snprintf(exp, size,"REQB");

                        break;
                }
                case ISO14443B_ATTRIB           : snprintf(exp,size,"ATTRIB");break;
                        break;
                }
                case ISO14443B_ATTRIB           : snprintf(exp,size,"ATTRIB");break;


@@ -743,12 +742,12 @@ int CmdHFSearch(const char *Cmd){
        int ans = CmdHF14AReader("s");
 
        if (ans > 0) {
        int ans = CmdHF14AReader("s");
 
        if (ans > 0) {

-               PrintAndLog("\nValid ISO14443A Tag Found - Quiting Search\n");
+               PrintAndLog("\nValid ISO14443-A Tag Found - Quiting Search\n");

                return ans;
        } 
        ans = CmdHF14BReader("s");
        if (ans) {
                return ans;
        } 
        ans = CmdHF14BReader("s");
        if (ans) {

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

                return ans;
        }
        ans = HFiClassReader("", false, false);
                return ans;
        }
        ans = HFiClassReader("", false, false);