dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ADD: hf 14a read - now can detect the newer magic generation 1b. In output 1A (old version, where all hf mf c* commands works) 1B is the newer.

Browse Source
This commit is contained in:
iceman1001
2017-02-27 19:18:38 +01:00
parent 41611deef9
commit 8db18d2f15
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/cmdhf14a.c
View File

@@ -390,21 +390,22 @@ int CmdHF14AReader(const char *Cmd) {
// try to see if card responses to "chinese magic backdoor" commands.
uint8_t isOK = 0;
uint8_t isGeneration = 0;
clearCommandBuffer();
c.cmd = CMD_MIFARE_CIDENT;
c.arg[0] = 0;
c.arg[1] = 0;
c.arg[2] = 0;
SendCommand(&c);
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500))
isOK = resp.arg[0] & 0xff;
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
isGeneration = resp.arg[0] & 0xff;
}
if ( isGeneration )
PrintAndLog("Answers to magic commands (GEN %s): YES", ((isGeneration & 0x2 )==2)?"1B":"1A");
PrintAndLog("Answers to magic commands (GEN1): %s", (isOK ? "YES" : "NO") );
// disconnect
SendCommand(&cDisconnect);
return select_status;
}