Fixed another issue where a buffer was filled with 0x44, affecting chinese cards...

[proxmark3-svn] / armsrc / mifaresniff.c

diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 25c7780d49fda4a7539c7c8ea79a8f8d76acad5e..f95ca3dfc5e0f919a325be7bcc2e4adde3bf2d24 100644 (file)
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -11,5 +11,185 @@
 #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];\r
+static uint8_t sniffATQA[2];\r
+static uint8_t sniffSAK;\r
+static uint8_t sniffBuf[16];\r
+static int timerData = 0;\r
 \r
 \r
+int MfSniffInit(void){\r
+       rsamples = 0;\r
+       memset(sniffUID, 0x00, 8);\r
+       memset(sniffATQA, 0x00, 2);\r
+       sniffSAK = 0;\r
+       sniffUIDType = SNF_UID_4;\r
+\r
+       return 0;\r
+}\r
+\r
+int MfSniffEnd(void){\r
+//     UsbCommand ack = {CMD_ACK, {0, 0, 0}};\r
+\r
+       LED_B_ON();\r
+  cmd_send(CMD_ACK,0,0,0,0,0);\r
+//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
+       LED_B_OFF();\r
+\r
+       return 0;\r
+}\r
+\r
+int RAMFUNC MfSniffLogic(const uint8_t * data, int len, uint32_t parity, int bitCnt, int reader) {\r
+\r
+       if ((len == 1) && (bitCnt = 9) && (data[0] > 0x0F)) { \r
+               sniffState = SNF_INIT;\r
+       }\r
+\r
+       switch (sniffState) {\r
+               case SNF_INIT:{\r
+                       if ((reader) && (len == 1) && (bitCnt == 9) && ((data[0] == 0x26) || (data[0] == 0x52))) { \r
+                               sniffUIDType = SNF_UID_4;\r
+                               memset(sniffUID, 0x00, 8);\r
+                               memset(sniffATQA, 0x00, 2);\r
+                               sniffSAK = 0;\r
+\r
+                               sniffState = SNF_WUPREQ;\r
+                       }\r
+                       break;\r
+               }\r
+               case SNF_WUPREQ:{\r
+                       if ((!reader) && (len == 2)) { \r
+                               memcpy(sniffATQA, data, 2);\r
+\r
+                               sniffState = SNF_ATQA;\r
+                       }\r
+                       break;\r
+               }\r
+               case SNF_ATQA:{\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])) { \r
+                               memcpy(sniffUID + 3, data, 4);\r
+                       \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))) { \r
+                               sniffState = SNF_SAK;\r
+                       }\r
+                       break;\r
+               }\r
+               case SNF_SAK:{\r
+                       if ((!reader) && (len == 3) && (CheckCrc14443(CRC_14443_A, data, 3))) { \r
+                               sniffSAK = data[0];\r
+                               if (sniffUID[3] == 0x88) {\r
+                                       sniffState = SNF_ANTICOL2;\r
+                               } else {\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])) { \r
+                               memcpy(sniffUID, data, 4);\r
+                               sniffUIDType = SNF_UID_7;\r
+                       \r
+                               sniffState = SNF_UID2;\r
+               }\r
+                       break;\r
+               }\r
+               case SNF_UID2:{\r
+                       if ((reader) && (len == 9) && (data[0] == 0x95) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) { \r
+                               sniffState = SNF_SAK;\r
+       Dbprintf("SNF_SAK");                            \r
+                       }\r
+                       break;\r
+               }\r
+               case SNF_CARD_IDLE:{\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, parity, true);\r
+                       timerData = GetTickCount();\r
+               }\r
+               case SNF_CARD_CMD:{\r
+                       LogTrace(data, len, 0, parity, true);\r
+\r
+                       sniffState = SNF_CARD_RESP;\r
+                       timerData = GetTickCount();\r
+                       break;\r
+               }\r
+               case SNF_CARD_RESP:{\r
+                       LogTrace(data, len, 0, parity, false);\r
+\r
+                       sniffState = SNF_CARD_CMD;\r
+                       timerData = GetTickCount();\r
+                       break;\r
+               }\r
+       \r
+               default:\r
+                       sniffState = SNF_INIT;\r
+               break;\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
+int RAMFUNC MfSniffSend(int maxTimeoutMs) {\r
+       if (traceLen && (timerData + maxTimeoutMs < GetTickCount())) {\r
+               return intMfSniffSend();\r
+       }\r
+       return 0;\r
+}\r
+\r
+// internal seding function. not a RAMFUNC.\r
+int intMfSniffSend() {\r
+       \r
+       int pckSize = 0;\r
+       int pckLen = traceLen;\r
+       int pckNum = 0;\r
+       \r
+       if (!traceLen) return 0;\r
+\r
+       FpgaDisableSscDma();\r
+\r
+       while (pckLen > 0) {\r
+               pckSize = MIN(32, pckLen);\r
+//             UsbCommand ack = {CMD_ACK, {1, pckSize, pckNum}};\r
+//             memcpy(ack.d.asBytes, trace + traceLen - pckLen, pckSize);\r
+       \r
+               LED_B_ON();\r
+    cmd_send(CMD_ACK,1,pckSize,pckNum,trace + traceLen - pckLen,pckSize);\r
+//             UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
+//             SpinDelay(20);\r
+               LED_B_OFF();\r
+\r
+               pckLen -= pckSize;\r
+               pckNum++;\r
+       }\r
+\r
+//     UsbCommand ack = {CMD_ACK, {2, 0, 0}};\r
+\r
+       LED_B_ON();\r
+  cmd_send(CMD_ACK,2,0,0,0,0);\r
+//     UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));\r
+       LED_B_OFF();\r
+\r
+       traceLen = 0;\r
+       memset(trace, 0x44, TRACE_SIZE);\r
+       \r
+       return 1;\r
+}\r