lf psk demods

[proxmark3-svn] / armsrc / mifaresniff.c

diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index bd9840e8cb4a8467e9b3c6b3719f0aede40a9d18..9b6f5f04c417d3514973a5dac79221821d22613b 100644 (file)
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -13,10 +13,10 @@
 \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 +37,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


@@ -93,7 +93,8 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint32_t parity, ui
                }\r
                case SNF_ANTICOL2:{\r
                        if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) { // CL2 UID \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, data, 4);\r
+                               memcpy(sniffUID, sniffUID+4, 3);\r
+                               memcpy(sniffUID+3, data, 4);\r

                                sniffUIDType = SNF_UID_7;\r
                                sniffState = SNF_UID2;\r
                        }\r
                                sniffUIDType = SNF_UID_7;\r
                                sniffState = SNF_UID2;\r
                        }\r


@@ -113,16 +114,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