} \r
\r
blockNo = param_get8(Cmd, 0);\r
- if (blockNo >= 32 * 4 + 8 * 16) {\r
- PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");\r
- return 1;\r
- }\r
\r
PrintAndLog(" ");\r
if (!mfEmlGetMem(data, blockNo, 3)) {\r
} \r
\r
blockNo = param_get8(Cmd, 0);\r
- if (blockNo >= 32 * 4 + 8 * 16) {\r
- PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");\r
- return 1;\r
- }\r
\r
if (param_gethex(Cmd, 1, memBlock, 32)) {\r
PrintAndLog("block data must include 32 HEX symbols");\r
} \r
\r
blockNo = param_get8(Cmd, 0);\r
- if (blockNo >= 32 * 4 + 8 * 16) {\r
- PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");\r
- return 1;\r
- }\r
\r
if (param_gethex(Cmd, 1, memBlock, 32)) {\r
PrintAndLog("block data must include 32 HEX symbols");\r
} \r
\r
blockNo = param_get8(Cmd, 0);\r
- if (blockNo >= 32 * 4 + 8 * 16) {\r
- PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");\r
- return 1;\r
- }\r
\r
PrintAndLog("--block number:%02x ", blockNo);\r
\r
\r
int CmdHF14AMfSniff(const char *Cmd){\r
// params\r
- bool wantLogToFile = 1;\r
- bool wantDecrypt = 1;\r
- bool wantSaveToEml = 0;\r
+ bool wantLogToFile = 0;\r
+ bool wantDecrypt = 0;\r
+ //bool wantSaveToEml = 0; TODO\r
bool wantSaveToEmlFile = 0;\r
\r
//var \r
uint8_t atqa[2];\r
uint8_t sak;\r
bool isTag;\r
+ uint32_t parity;\r
uint8_t buf[3000];\r
uint8_t * bufPtr = buf;\r
memset(buf, 0x00, 3000);\r
char ctmp = param_getchar(Cmd, i);\r
if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;\r
if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;\r
- if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true;\r
+ //if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO\r
if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;\r
}\r
\r
num = 0;\r
while (bufPtr - buf + 9 < blockLen) {\r
isTag = bufPtr[3] & 0x80 ? true:false;\r
- bufPtr += 8;\r
+ bufPtr += 4;\r
+ parity = *((uint32_t *)(bufPtr));\r
+ bufPtr += 4;\r
len = bufPtr[0];\r
bufPtr++;\r
if ((len == 14) && (bufPtr[0] = 0xff) && (bufPtr[1] = 0xff)) {\r
} else {\r
PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len));\r
if (wantLogToFile) AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);\r
- if (wantDecrypt) mfTraceDecode(bufPtr, len, wantSaveToEmlFile);\r
+ if (wantDecrypt) mfTraceDecode(bufPtr, len, parity, wantSaveToEmlFile);\r
}\r
bufPtr += len;\r
num++;\r