]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhf.c
CHG: LEGIC - allow offline mode due to existing offline command
[proxmark3-svn] / client / cmdhf.c
index 2dc21fd9899f340084654eca5122a3afc8e1590f..e1a203e7571513409f92a72df48ded780095ede3 100644 (file)
@@ -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 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");
+                       else
+                               snprintf(exp, size,"REQB");
                        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) {
-               PrintAndLog("\nValid ISO14443A Tag Found - Quiting Search\n");
+               PrintAndLog("\nValid ISO14443-A Tag Found - Quiting Search\n");
                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);
@@ -790,7 +789,7 @@ static command_t CommandTable[] = {
        {"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs... }"},
        {"15",          CmdHF15,          1, "{ ISO15693 RFIDs... }"},
        {"epa",         CmdHFEPA,         1, "{ German Identification Card... }"},
-       {"legic",       CmdHFLegic,       0, "{ LEGIC RFIDs... }"},
+       {"legic",       CmdHFLegic,       1, "{ LEGIC RFIDs... }"},
        {"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs... }"},
        {"mf",          CmdHFMF,                  1, "{ MIFARE RFIDs... }"},
        {"mfu",         CmdHFMFUltra,     1, "{ MIFARE Ultralight RFIDs... }"},
Impressum, Datenschutz