X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e57c8b2e5601aacd3655a7c1a5c47a7cab66d914..8c8317a5e92dd850128ae4bee366e7c4dde7c973:/client/cmdhf14a.c diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index fc6dcff7..b75215a0 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -15,6 +15,7 @@ #include #include #include "util.h" +#include "util_posix.h" #include "iso14443crc.h" #include "data.h" #include "proxmark3.h" @@ -25,6 +26,7 @@ #include "cmdmain.h" #include "mifare.h" #include "cmdhfmfu.h" +#include "mifarehost.h" static int CmdHelp(const char *Cmd); static void waitCmd(uint8_t iLen); @@ -409,8 +411,13 @@ int CmdHF14AReader(const char *Cmd) c.arg[2] = 0; SendCommand(&c); WaitForResponse(CMD_ACK,&resp); - uint8_t isOK = resp.arg[0] & 0xff; - PrintAndLog("Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") ); + + uint8_t isGeneration = resp.arg[0] & 0xff; + switch( isGeneration ){ + case 1: PrintAndLog("Answers to chinese magic backdoor commands (GEN 1a): YES"); break; + case 2: PrintAndLog("Answers to chinese magic backdoor commands (GEN 1b): YES"); break; + default: PrintAndLog("Answers to chinese magic backdoor commands: NO"); break; + } // disconnect c.cmd = CMD_READER_ISO_14443a; @@ -661,7 +668,7 @@ int CmdHF14ACmdRaw(const char *cmd) { PrintAndLog("Buffer is full, we can't add CRC to your data"); break; } else { - datalen++ + datalen++; } } continue;