X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b8edab0f831881c8a2aa13e9df45177ed092663b..9d84e689647c7f5b3bae29de8f2dce4781aa63b4:/client/cmdhf14b.c diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c index 9c65bb2f..77dba684 100644 --- a/client/cmdhf14b.c +++ b/client/cmdhf14b.c @@ -200,7 +200,7 @@ int CmdHF14BCmdRaw (const char *Cmd) { return 0; } - if (select){ + if (select){ //auto select 14b tag uint8_t cmd2[16]; uint8_t cmdLen = 3; bool crc2 = true; @@ -208,17 +208,20 @@ int CmdHF14BCmdRaw (const char *Cmd) { cmd2[1] = 0x00; cmd2[2] = 0x08; + // REQB if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose(); if (cmd2[0] != 0x50 || cmdLen != 14 || !crc2) return rawClose(); - data[0] = 0x1D; - data[5] = 0x00; - data[6] = 0x08; - data[7] = 0x01; - data[8] = 0x00; - + cmd2[0] = 0x1D; + // UID from data[1 - 4] + cmd2[5] = 0x00; + cmd2[6] = 0x08; + cmd2[7] = 0x01; + cmd2[8] = 0x00; cmdLen = 9; + + // attrib if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose(); if (cmd2[0] != 0x10 || cmdLen != 3 || !crc2) return rawClose();