add: iceman1001's idea to reuse @pwpiwi's fast select without anticollision to speedu...

[proxmark3-svn] / armsrc / mifaresniff.c

diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 3e5570f9ce6e575ecd1b19f2f696b30d42b94b94..7f94b0fe7c01ecdbce7a036a1fb94e00cfb1cbb2 100644 (file)
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -10,13 +10,22 @@
 \r
 #include "mifaresniff.h"\r
 #include "apps.h"\r
 \r
 #include "mifaresniff.h"\r
 #include "apps.h"\r

+#include "proxmark3.h"\r
+#include "util.h"\r
+#include "string.h"\r
+#include "iso14443crc.h"\r
+#include "iso14443a.h"\r
+#include "crapto1/crapto1.h"\r
+#include "mifareutil.h"\r
+#include "common.h"\r
+\r

 \r
 static int sniffState = SNF_INIT;\r
 static uint8_t sniffUIDType;\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 sniffUID[8] = {0x00};\r
+static uint8_t sniffATQA[2] = {0x00};\r

 static uint8_t sniffSAK;\r
 static uint8_t sniffSAK;\r

-static uint8_t sniffBuf[16];\r
+static uint8_t sniffBuf[16] = {0x00};\r

 static uint32_t timerData = 0;\r
 \r
 \r
 static uint32_t timerData = 0;\r
 \r
 \r


@@ -37,7 +46,7 @@ bool MfSniffEnd(void){
        return FALSE;\r
 }\r
 \r
        return FALSE;\r
 }\r
 \r

-bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint32_t parity, uint16_t bitCnt, bool reader) {\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
                sniffState = SNF_INIT;\r
 \r
        if (reader && (len == 1) && (bitCnt == 7)) {            // reset on 7-Bit commands from reader\r
                sniffState = SNF_INIT;\r


@@ -114,16 +123,16 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint32_t parity, ui
                        sniffBuf[11] = sniffSAK;\r
                        sniffBuf[12] = 0xFF;\r
                        sniffBuf[13] = 0xFF;\r
                        sniffBuf[11] = sniffSAK;\r
                        sniffBuf[12] = 0xFF;\r
                        sniffBuf[13] = 0xFF;\r

-                       LogTrace(sniffBuf, 14, 0, parity, true);\r
+                       LogTrace(sniffBuf, 14, 0, 0, NULL, TRUE);\r

                }       // intentionally no break;\r
                case SNF_CARD_CMD:{             \r
                }       // intentionally no break;\r
                case SNF_CARD_CMD:{             \r

-                       LogTrace(data, len, 0, parity, true);\r
+                       LogTrace(data, len, 0, 0, NULL, TRUE);\r

                        sniffState = SNF_CARD_RESP;\r
                        timerData = GetTickCount();\r
                        break;\r
                }\r
                case SNF_CARD_RESP:{\r
                        sniffState = SNF_CARD_RESP;\r
                        timerData = GetTickCount();\r
                        break;\r
                }\r
                case SNF_CARD_RESP:{\r

-                       LogTrace(data, len, 0, parity, false);\r
+                       LogTrace(data, len, 0, 0, NULL, FALSE);\r

                        sniffState = SNF_CARD_CMD;\r
                        timerData = GetTickCount();\r
                        break;\r
                        sniffState = SNF_CARD_CMD;\r
                        timerData = GetTickCount();\r
                        break;\r


@@ -139,7 +148,7 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint32_t parity, ui
 }\r
 \r
 bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {\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
                return intMfSniffSend();\r
        }\r
        return FALSE;\r


@@ -149,14 +158,15 @@ bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs) {
 bool intMfSniffSend() {\r
 \r
        int pckSize = 0;\r
 bool intMfSniffSend() {\r
 \r
        int pckSize = 0;\r

-       int pckLen = traceLen;\r
+       int pckLen = BigBuf_get_traceLen();\r

        int pckNum = 0;\r
        int pckNum = 0;\r

-\r
+       uint8_t *trace = BigBuf_get_addr();\r
+       \r

        FpgaDisableSscDma();\r
        while (pckLen > 0) {\r
                pckSize = MIN(USB_CMD_DATA_SIZE, pckLen);\r
                LED_B_ON();\r
        FpgaDisableSscDma();\r
        while (pckLen > 0) {\r
                pckSize = MIN(USB_CMD_DATA_SIZE, pckLen);\r
                LED_B_ON();\r

-               cmd_send(CMD_ACK, 1, pckSize, pckNum, trace + traceLen - pckLen, pckSize);\r
+               cmd_send(CMD_ACK, 1, BigBuf_get_traceLen(), pckSize, trace + BigBuf_get_traceLen() - pckLen, pckSize);\r

                LED_B_OFF();\r
 \r
                pckLen -= pckSize;\r
                LED_B_OFF();\r
 \r
                pckLen -= pckSize;\r


@@ -167,7 +177,7 @@ bool intMfSniffSend() {
        cmd_send(CMD_ACK,2,0,0,0,0);\r
        LED_B_OFF();\r
 \r
        cmd_send(CMD_ACK,2,0,0,0,0);\r
        LED_B_OFF();\r
 \r

-       iso14a_clear_trace();\r
+       clear_trace();\r

        \r
        return TRUE;\r
 }\r
        \r
        return TRUE;\r
 }\r