CHG: NEDAP, changed back the preamble. With new parity check it has a decent detec...

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index bcff90f5612a93d59d7dd859f1607c7fe24486e3..a14c2e59f3b922df5ef5b1b245028df9913615f6 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -275,12 +275,11 @@ void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
                                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] & 0x4) )
-                               snprintf(exp, size,"REQB");
-                       else
+                       }                       
+                       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);