//-----------------------------------------------------------------------------\r
\r
#include "mifaresniff.h"\r
-#include "apps.h"\r
\r
static int sniffState = SNF_INIT;\r
-static uint8_t sniffUIDType;\r
-static uint8_t sniffUID[8] = {0x00};\r
-static uint8_t sniffATQA[2] = {0x00};\r
-static uint8_t sniffSAK;\r
-static uint8_t sniffBuf[16] = {0x00};\r
+static uint8_t sniffUIDType = 0;\r
+static uint8_t sniffUID[10] = {0,0,0,0,0,0,0,0,0,0};\r
+static uint8_t sniffATQA[2] = {0,0};\r
+static uint8_t sniffSAK = 0;\r
+static uint8_t sniffBuf[17];\r
static uint32_t timerData = 0;\r
\r
-\r
-bool MfSniffInit(void){\r
- memset(sniffUID, 0x00, 8);\r
- memset(sniffATQA, 0x00, 2);\r
+void MfSniffInit(void){\r
+ memset(sniffUID, 0x00, sizeof(sniffUID));\r
+ memset(sniffATQA, 0x00, sizeof(sniffATQA));\r
+ memset(sniffBuf, 0x00, sizeof(sniffBuf));\r
sniffSAK = 0;\r
sniffUIDType = SNF_UID_4;\r
-\r
- return FALSE;\r
}\r
\r
-bool MfSniffEnd(void){\r
+void MfSniffEnd(void){\r
LED_B_ON();\r
cmd_send(CMD_ACK,0,0,0,0,0);\r
LED_B_OFF();\r
-\r
- return FALSE;\r
}\r
\r
bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader) {\r
\r
- if (reader && (len == 1) && (bitCnt == 7)) { // reset on 7-Bit commands from reader\r
+ // reset on 7-Bit commands from reader\r
+ if (reader && (len == 1) && (bitCnt == 7)) { \r
sniffState = SNF_INIT;\r
}\r
\r
switch (sniffState) {\r
case SNF_INIT:{\r
- if ((len == 1) && (reader) && (bitCnt == 7) ) { // REQA or WUPA from reader\r
- sniffUIDType = SNF_UID_4;\r
- memset(sniffUID, 0x00, 8);\r
- memset(sniffATQA, 0x00, 2);\r
- sniffSAK = 0;\r
+ // REQA or WUPA from reader\r
+ if ((len == 1) && (reader) && (bitCnt == 7) ) {\r
+ MfSniffInit();\r
sniffState = SNF_WUPREQ;\r
}\r
break;\r
}\r
case SNF_WUPREQ:{\r
- if ((!reader) && (len == 2)) { // ATQA from tag\r
- memcpy(sniffATQA, data, 2);\r
+ // ATQA from tag\r
+ if ((!reader) && (len == 2)) {\r
+ sniffATQA[0] = data[0];\r
+ sniffATQA[1] = data[1];\r
sniffState = SNF_ATQA;\r
}\r
break;\r
}\r
case SNF_ATQA:{\r
- if ((reader) && (len == 2) && (data[0] == 0x93) && (data[1] == 0x20)) { // Select ALL from reader\r
+ // Select ALL from reader\r
+ if ((reader) && (len == 2) && (data[0] == 0x93) && (data[1] == 0x20))\r
sniffState = SNF_ANTICOL1;\r
- }\r
break;\r
}\r
case SNF_ANTICOL1:{\r
- if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) { // UID from tag (CL1) \r
- memcpy(sniffUID + 3, data, 4);\r
+ // UID from tag (CL1) \r
+ if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) {\r
+ memcpy(sniffUID, data, 4);\r
sniffState = SNF_UID1;\r
}\r
break;\r
}\r
case SNF_UID1:{\r
- if ((reader) && (len == 9) && (data[0] == 0x93) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) { // Select 4 Byte UID from reader\r
+ // Select 4 Byte UID from reader\r
+ if ((reader) && (len == 9) && (data[0] == 0x93) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9)))\r
sniffState = SNF_SAK;\r
- }\r
break;\r
}\r
case SNF_SAK:{\r
if ((!reader) && (len == 3) && (CheckCrc14443(CRC_14443_A, data, 3))) { // SAK from card?\r
sniffSAK = data[0];\r
- if (sniffUID[3] == 0x88) { // CL2 UID part to be expected\r
- sniffState = SNF_ANTICOL2;\r
- } else { // select completed\r
+ if (sniffUID[0] == 0x88) // CL2/3 UID part to be expected \r
+ sniffState = (sniffState == SNF_ANTICOL2 ) ? SNF_ANTICOL3 : SNF_ANTICOL2;\r
+ else // select completed\r
sniffState = SNF_CARD_IDLE;\r
- }\r
}\r
break;\r
}\r
case SNF_ANTICOL2:{\r
- if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) { // CL2 UID \r
- memcpy(sniffUID, sniffUID+4, 3);\r
+ // CL2 UID \r
+ if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) {\r
+ sniffUID[0] = sniffUID[1];\r
+ sniffUID[1] = sniffUID[2];\r
+ sniffUID[2] = sniffUID[3];\r
memcpy(sniffUID+3, data, 4);\r
sniffUIDType = SNF_UID_7;\r
sniffState = SNF_UID2;\r
break;\r
}\r
case SNF_UID2:{\r
- if ((reader) && (len == 9) && (data[0] == 0x95) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) { // Select 2nd part of 7 Byte UID\r
+ // Select 2nd part of 7 Byte UID\r
+ if ((reader) && (len == 9) && (data[0] == 0x95) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9)))\r
sniffState = SNF_SAK;\r
+ break;\r
+ }\r
+ case SNF_ANTICOL3:{\r
+ // CL3 UID \r
+ if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) { \r
+ // 3+3+4 = 10.\r
+ sniffUID[3] = sniffUID[4];\r
+ sniffUID[4] = sniffUID[5];\r
+ sniffUID[5] = sniffUID[6];\r
+ memcpy(sniffUID+6, data, 4);\r
+ sniffUIDType = SNF_UID_10;\r
+ sniffState = SNF_UID3;\r
}\r
break;\r
}\r
+ case SNF_UID3:{\r
+ // Select 3nd part of 10 Byte UID\r
+ if ((reader) && (len == 9) && (data[0] == 0x97) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9)))\r
+ sniffState = SNF_SAK;\r
+ break;\r
+ }\r
case SNF_CARD_IDLE:{ // trace the card select sequence\r
sniffBuf[0] = 0xFF;\r
sniffBuf[1] = 0xFF;\r
- memcpy(sniffBuf + 2, sniffUID, 7);\r
- memcpy(sniffBuf + 9, sniffATQA, 2);\r
- sniffBuf[11] = sniffSAK;\r
- sniffBuf[12] = 0xFF;\r
- sniffBuf[13] = 0xFF;\r
- LogTrace(sniffBuf, 14, 0, 0, NULL, TRUE);\r
+ memcpy(sniffBuf + 2, sniffUID, sizeof(sniffUID));\r
+ memcpy(sniffBuf + 12, sniffATQA, sizeof(sniffATQA));\r
+ sniffBuf[14] = sniffSAK;\r
+ sniffBuf[15] = 0xFF;\r
+ sniffBuf[16] = 0xFF;\r
+ LogTrace(sniffBuf, sizeof(sniffBuf), 0, 0, NULL, TRUE);\r
} // intentionally no break;\r
case SNF_CARD_CMD:{ \r
LogTrace(data, len, 0, 0, NULL, TRUE);\r
timerData = GetTickCount();\r
break;\r
}\r
- \r
default:\r
sniffState = SNF_INIT;\r
break;\r
}\r
-\r
-\r
return FALSE;\r
}\r
\r
bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {\r
- if (traceLen && (GetTickCount() > timerData + maxTimeoutMs)) {\r
+ if (BigBuf_get_traceLen() && (GetTickCount() > timerData + maxTimeoutMs)) {\r
return intMfSniffSend();\r
}\r
return FALSE;\r
bool intMfSniffSend() {\r
\r
int pckSize = 0;\r
- int pckLen = traceLen;\r
+ int pckLen = BigBuf_get_traceLen();\r
int pckNum = 0;\r
- uint8_t *trace = BigBuf_get_addr();\r
+ uint8_t *data = BigBuf_get_addr();\r
\r
FpgaDisableSscDma();\r
while (pckLen > 0) {\r
pckSize = MIN(USB_CMD_DATA_SIZE, pckLen);\r
LED_B_ON();\r
- cmd_send(CMD_ACK, 1, traceLen, pckSize, trace + traceLen - pckLen, pckSize);\r
+ cmd_send(CMD_ACK, 1, BigBuf_get_traceLen(), pckSize, data + BigBuf_get_traceLen() - pckLen, pckSize);\r
LED_B_OFF();\r
-\r
pckLen -= pckSize;\r
pckNum++;\r
}\r
\r
LED_B_ON();\r
- cmd_send(CMD_ACK,2,0,0,0,0);\r
+ cmd_send(CMD_ACK,2,0,0,0,0); // 2 == data transfer is finished.\r
LED_B_OFF();\r
\r
- iso14a_clear_trace();\r
- \r
+ clear_trace();\r
return TRUE;\r
}\r
projects / proxmark3-svn / blobdiff