diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c index 2fd28a51..f46018d7 100644 --- a/armsrc/mifarecmd.c +++ b/armsrc/mifarecmd.c @@ -1388,12 +1388,12 @@ void MifareCIdent(){ ReaderTransmitBitsPar(wupC1,7,0, NULL); if(ReaderReceive(receivedAnswer, receivedAnswerPar) && (receivedAnswer[0] == 0x0a)) { - isOK = 1; - }; + isOK = 2; - ReaderTransmit(wupC2, sizeof(wupC2), NULL); - if(ReaderReceive(receivedAnswer, receivedAnswerPar) && (receivedAnswer[0] == 0x0a)) { - isOK = 1; + ReaderTransmit(wupC2, sizeof(wupC2), NULL); + if(ReaderReceive(receivedAnswer, receivedAnswerPar) && (receivedAnswer[0] == 0x0a)) { + isOK = 1; + }; }; // From iceman1001: removed the if, since some magic tags misbehavies and send an answer to it. diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index bab3591e..b75215a0 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -411,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;