X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b9e66427b70e310894de2ca048563f38dd162c77..a273fcfda25a24ca50d669f518947401536381e7:/client/cmdhf.c?ds=sidebyside diff --git a/client/cmdhf.c b/client/cmdhf.c index bcff90f5..a14c2e59 100644 --- 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);