Adjust LUA scripts to new ISO14A_NO_RATS option

[proxmark3-svn] / client / mifarehost.c

diff --git a/client/mifarehost.c b/client/mifarehost.c
index c6c6877ed48cbd33c8071224e4b38be3c94f4030..629c8feb4a48c93b0d1431032d3261ebe6f8da60 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -11,7 +11,7 @@
 #include "mifarehost.h"\r
 \r
 #include <stdio.h>\r
 #include "mifarehost.h"\r
 \r
 #include <stdio.h>\r

-#include <stdlib.h> \r
+#include <stdlib.h>\r

 #include <string.h>\r
 #include <pthread.h>\r
 \r
 #include <string.h>\r
 #include <pthread.h>\r
 \r


@@ -23,6 +23,8 @@
 #include "util.h"\r
 #include "iso14443crc.h"\r
 \r
 #include "util.h"\r
 #include "iso14443crc.h"\r
 \r

+#include "mifare.h"\r
+\r

 // mifare tracer flags used in mfTraceDecode()\r
 #define TRACE_IDLE                                             0x00\r
 #define TRACE_AUTH1                                            0x01\r
 // mifare tracer flags used in mfTraceDecode()\r
 #define TRACE_IDLE                                             0x00\r
 #define TRACE_AUTH1                                            0x01\r


@@ -52,7 +54,7 @@ static uint32_t intersection(uint64_t *list1, uint64_t *list2)
                return 0;\r
        }\r
        uint64_t *p1, *p2, *p3;\r
                return 0;\r
        }\r
        uint64_t *p1, *p2, *p3;\r

-       p1 = p3 = list1; \r
+       p1 = p3 = list1;\r

        p2 = list2;\r
 \r
        while ( *p1 != -1 && *p2 != -1 ) {\r
        p2 = list2;\r
 \r
        while ( *p1 != -1 && *p2 != -1 ) {\r


@@ -98,7 +100,7 @@ static uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_i
        }\r
 \r
        keylist = (uint64_t*)states;\r
        }\r
 \r
        keylist = (uint64_t*)states;\r

-       \r
+\r

        for (i = 0; keylist[i]; i++) {\r
                lfsr_rollback_word(states+i, uid^nt, 0);\r
                crypto1_get_lfsr(states+i, &key_recovered);\r
        for (i = 0; keylist[i]; i++) {\r
                lfsr_rollback_word(states+i, uid^nt, 0);\r
                crypto1_get_lfsr(states+i, &key_recovered);\r


@@ -128,16 +130,16 @@ int mfDarkside(uint64_t *key)
        printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");\r
        printf("-------------------------------------------------------------------------\n");\r
 \r
        printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");\r
        printf("-------------------------------------------------------------------------\n");\r
 \r

-       \r
+\r

        while (true) {\r
                clearCommandBuffer();\r
                SendCommand(&c);\r
        while (true) {\r
                clearCommandBuffer();\r
                SendCommand(&c);\r

-               \r
+\r

                //flush queue\r
                while (ukbhit()) {\r
                        int c = getchar(); (void) c;\r
                }\r
                //flush queue\r
                while (ukbhit()) {\r
                        int c = getchar(); (void) c;\r
                }\r

-               \r
+\r

                // wait cycle\r
                while (true) {\r
                        printf(".");\r
                // wait cycle\r
                while (true) {\r
                        printf(".");\r


@@ -146,7 +148,7 @@ int mfDarkside(uint64_t *key)
                                return -5;\r
                                break;\r
                        }\r
                                return -5;\r
                                break;\r
                        }\r

-                       \r
+\r

                        UsbCommand resp;\r
                        if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {\r
                                isOK  = resp.arg[0];\r
                        UsbCommand resp;\r
                        if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {\r
                                isOK  = resp.arg[0];\r


@@ -160,7 +162,7 @@ int mfDarkside(uint64_t *key)
                                nr = bytes_to_num(resp.d.asBytes + 24, 4);\r
                                break;\r
                        }\r
                                nr = bytes_to_num(resp.d.asBytes + 24, 4);\r
                                break;\r
                        }\r

-               }       \r
+               }\r

 \r
                if (par_list == 0 && c.arg[0] == true) {\r
                        PrintAndLog("Parity is all zero. Most likely this card sends NACK on every failed authentication.");\r
 \r
                if (par_list == 0 && c.arg[0] == true) {\r
                        PrintAndLog("Parity is all zero. Most likely this card sends NACK on every failed authentication.");\r


@@ -171,7 +173,7 @@ int mfDarkside(uint64_t *key)
                keycount = nonce2key(uid, nt, nr, par_list, ks_list, &keylist);\r
 \r
                if (keycount == 0) {\r
                keycount = nonce2key(uid, nt, nr, par_list, ks_list, &keylist);\r
 \r
                if (keycount == 0) {\r

-                       PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);    \r
+                       PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);\r

                        PrintAndLog("This is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");\r
                        continue;\r
                }\r
                        PrintAndLog("This is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");\r
                        continue;\r
                }\r


@@ -188,7 +190,7 @@ int mfDarkside(uint64_t *key)
                        PrintAndLog("Found %u possible keys. Trying to authenticate with each of them ...\n", keycount);\r
                } else {\r
                        PrintAndLog("Found a possible key. Trying to authenticate...\n");\r
                        PrintAndLog("Found %u possible keys. Trying to authenticate with each of them ...\n", keycount);\r
                } else {\r
                        PrintAndLog("Found a possible key. Trying to authenticate...\n");\r

-               }               \r
+               }\r

 \r
                *key = -1;\r
                uint8_t keyBlock[USB_CMD_DATA_SIZE];\r
 \r
                *key = -1;\r
                uint8_t keyBlock[USB_CMD_DATA_SIZE];\r


@@ -205,8 +207,8 @@ int mfDarkside(uint64_t *key)
                        if (!mfCheckKeys(0, 0, false, size, keyBlock, key)) {\r
                                break;\r
                        }\r
                        if (!mfCheckKeys(0, 0, false, size, keyBlock, key)) {\r
                                break;\r
                        }\r

-               }       \r
-               \r
+               }\r
+\r

                if (*key != -1) {\r
                        free(last_keylist);\r
                        free(keylist);\r
                if (*key != -1) {\r
                        free(last_keylist);\r
                        free(keylist);\r


@@ -217,14 +219,14 @@ int mfDarkside(uint64_t *key)
                        last_keylist = keylist;\r
                }\r
        }\r
                        last_keylist = keylist;\r
                }\r
        }\r

-       \r
+\r

        return 0;\r
 }\r
 \r
 \r
 int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){\r
 \r
        return 0;\r
 }\r
 \r
 \r
 int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){\r
 \r

-       *key = 0;\r
+       *key = -1;\r

 \r
        UsbCommand c = {CMD_MIFARE_CHKKEYS, {((blockNo & 0xff) | ((keyType&0xff)<<8)), clear_trace, keycnt}};\r
        memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\r
 \r
        UsbCommand c = {CMD_MIFARE_CHKKEYS, {((blockNo & 0xff) | ((keyType&0xff)<<8)), clear_trace, keycnt}};\r
        memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\r


@@ -244,7 +246,7 @@ int Compare16Bits(const void * a, const void * b) {
        else return -1;\r
 }\r
 \r
        else return -1;\r
 }\r
 \r

-typedef \r
+typedef\r

        struct {\r
                union {\r
                        struct Crypto1State *slhead;\r
        struct {\r
                union {\r
                        struct Crypto1State *slhead;\r


@@ -274,11 +276,11 @@ void* nested_worker_thread(void *arg)
        statelist->len = p1 - statelist->head.slhead;\r
        statelist->tail.sltail = --p1;\r
        qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits);\r
        statelist->len = p1 - statelist->head.slhead;\r
        statelist->tail.sltail = --p1;\r
        qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits);\r

-       \r
+\r

        return statelist->head.slhead;\r
 }\r
 \r
        return statelist->head.slhead;\r
 }\r
 \r

-int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate) \r
+int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate)\r

 {\r
        uint16_t i;\r
        uint32_t uid;\r
 {\r
        uint16_t i;\r
        uint32_t uid;\r


@@ -286,10 +288,10 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
 \r
        StateList_t statelists[2];\r
        struct Crypto1State *p1, *p2, *p3, *p4;\r
 \r
        StateList_t statelists[2];\r
        struct Crypto1State *p1, *p2, *p3, *p4;\r

-       \r
+\r

        // flush queue\r
        WaitForResponseTimeout(CMD_ACK, NULL, 100);\r
        // flush queue\r
        WaitForResponseTimeout(CMD_ACK, NULL, 100);\r

-       \r
+\r

        UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}};\r
        memcpy(c.d.asBytes, key, 6);\r
        SendCommand(&c);\r
        UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}};\r
        memcpy(c.d.asBytes, key, 6);\r
        SendCommand(&c);\r


@@ -301,10 +303,10 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
        if (resp.arg[0]) {\r
                return resp.arg[0];  // error during nested\r
        }\r
        if (resp.arg[0]) {\r
                return resp.arg[0];  // error during nested\r
        }\r

-               \r
+\r

        memcpy(&uid, resp.d.asBytes, 4);\r
        PrintAndLog("uid:%08x trgbl=%d trgkey=%x", uid, (uint16_t)resp.arg[2] & 0xff, (uint16_t)resp.arg[2] >> 8);\r
        memcpy(&uid, resp.d.asBytes, 4);\r
        PrintAndLog("uid:%08x trgbl=%d trgkey=%x", uid, (uint16_t)resp.arg[2] & 0xff, (uint16_t)resp.arg[2] >> 8);\r

-       \r
+\r

        for (i = 0; i < 2; i++) {\r
                statelists[i].blockNo = resp.arg[2] & 0xff;\r
                statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;\r
        for (i = 0; i < 2; i++) {\r
                statelists[i].blockNo = resp.arg[2] & 0xff;\r
                statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;\r


@@ -312,16 +314,16 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
                memcpy(&statelists[i].nt,  (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);\r
                memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);\r
        }\r
                memcpy(&statelists[i].nt,  (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);\r
                memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);\r
        }\r

-       \r
+\r

        // calc keys\r
        // calc keys\r

-       \r
+\r

        pthread_t thread_id[2];\r
        pthread_t thread_id[2];\r

-               \r
+\r

        // create and run worker threads\r
        for (i = 0; i < 2; i++) {\r
                pthread_create(thread_id + i, NULL, nested_worker_thread, &statelists[i]);\r
        }\r
        // create and run worker threads\r
        for (i = 0; i < 2; i++) {\r
                pthread_create(thread_id + i, NULL, nested_worker_thread, &statelists[i]);\r
        }\r

-       \r
+\r

        // wait for threads to terminate:\r
        for (i = 0; i < 2; i++) {\r
                pthread_join(thread_id[i], (void*)&statelists[i].head.slhead);\r
        // wait for threads to terminate:\r
        for (i = 0; i < 2; i++) {\r
                pthread_join(thread_id[i], (void*)&statelists[i].head.slhead);\r


@@ -331,7 +333,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
        // the first 16 Bits of the cryptostate already contain part of our key.\r
        // Create the intersection of the two lists based on these 16 Bits and\r
        // roll back the cryptostate\r
        // the first 16 Bits of the cryptostate already contain part of our key.\r
        // Create the intersection of the two lists based on these 16 Bits and\r
        // roll back the cryptostate\r

-       p1 = p3 = statelists[0].head.slhead; \r
+       p1 = p3 = statelists[0].head.slhead;\r

        p2 = p4 = statelists[1].head.slhead;\r
        while (p1 <= statelists[0].tail.sltail && p2 <= statelists[1].tail.sltail) {\r
                if (Compare16Bits(p1, p2) == 0) {\r
        p2 = p4 = statelists[1].head.slhead;\r
        while (p1 <= statelists[0].tail.sltail && p2 <= statelists[1].tail.sltail) {\r
                if (Compare16Bits(p1, p2) == 0) {\r


@@ -382,10 +384,10 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,
                        break;\r
                }\r
        }\r
                        break;\r
                }\r
        }\r

-       \r
+\r

        free(statelists[0].head.slhead);\r
        free(statelists[1].head.slhead);\r
        free(statelists[0].head.slhead);\r
        free(statelists[1].head.slhead);\r

-       \r
+\r

        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r


@@ -403,7 +405,7 @@ int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {
 \r
 int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {\r
        UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};\r
 \r
 int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {\r
        UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};\r

-       memcpy(c.d.asBytes, data, blocksCount * 16); \r
+       memcpy(c.d.asBytes, data, blocksCount * 16);\r

        SendCommand(&c);\r
        return 0;\r
 }\r
        SendCommand(&c);\r
        return 0;\r
 }\r


@@ -416,7 +418,7 @@ int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
        UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};\r
        SendCommand(&c);\r
 \r
        UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};\r
        SendCommand(&c);\r
 \r

-  UsbCommand resp;\r
+       UsbCommand resp;\r

        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
                isOK  = resp.arg[0] & 0xff;\r
                memcpy(data, resp.d.asBytes, 16);\r
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
                isOK  = resp.arg[0] & 0xff;\r
                memcpy(data, resp.d.asBytes, 16);\r


@@ -432,29 +434,54 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin
 \r
        uint8_t isOK = 0;\r
        UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};\r
 \r
        uint8_t isOK = 0;\r
        UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};\r

-       memcpy(c.d.asBytes, data, 16); \r
+       memcpy(c.d.asBytes, data, 16);\r

        SendCommand(&c);\r
 \r
        SendCommand(&c);\r
 \r

-  UsbCommand resp;\r
-       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+       UsbCommand resp;\r
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r

                isOK  = resp.arg[0] & 0xff;\r
                isOK  = resp.arg[0] & 0xff;\r

-               if (uid != NULL) \r
+               if (uid != NULL)\r

                        memcpy(uid, resp.d.asBytes, 4);\r
                        memcpy(uid, resp.d.asBytes, 4);\r

-               if (!isOK) \r
+               if (!isOK)\r

                        return 2;\r
        } else {\r
                PrintAndLog("Command execute timeout");\r
                return 1;\r
        }\r
                        return 2;\r
        } else {\r
                PrintAndLog("Command execute timeout");\r
                return 1;\r
        }\r

+\r

        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

-int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool wantWipe) {\r
+int mfCWipe(uint32_t numSectors, bool gen1b, bool wantWipe, bool wantFill) {\r
+       uint8_t isOK = 0;\r
+       uint8_t cmdParams = wantWipe + wantFill * 0x02 + gen1b * 0x04;\r
+       UsbCommand c = {CMD_MIFARE_CWIPE, {numSectors, cmdParams, 0}};\r
+       SendCommand(&c);\r
+\r
+       UsbCommand resp;\r
+       WaitForResponse(CMD_ACK,&resp);\r
+       isOK  = resp.arg[0] & 0xff;\r
+       \r
+       return isOK;\r
+}\r
+\r
+int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID) {\r

        uint8_t oldblock0[16] = {0x00};\r
        uint8_t block0[16] = {0x00};\r
        uint8_t oldblock0[16] = {0x00};\r
        uint8_t block0[16] = {0x00};\r

+       int gen = 0, res;\r

 \r
 \r

-       int old = mfCGetBlock(0, oldblock0, CSETBLOCK_SINGLE_OPER);\r
-       if (old == 0) {\r
+       gen = mfCIdentify();\r
+\r
+       /* generation 1a magic card by default */\r
+       uint8_t cmdParams = CSETBLOCK_SINGLE_OPER;\r
+       if (gen == 2) {\r
+               /* generation 1b magic card */\r
+               cmdParams = CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B;\r
+       }\r
+       \r
+       res = mfCGetBlock(0, oldblock0, cmdParams);\r
+\r
+       if (res == 0) {\r

                memcpy(block0, oldblock0, 16);\r
                PrintAndLog("old block 0:  %s", sprint_hex(block0,16));\r
        } else {\r
                memcpy(block0, oldblock0, 16);\r
                PrintAndLog("old block 0:  %s", sprint_hex(block0,16));\r
        } else {\r


@@ -463,20 +490,75 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool w
 \r
        // fill in the new values\r
        // UID\r
 \r
        // fill in the new values\r
        // UID\r

-       memcpy(block0, uid, 4); \r
+       memcpy(block0, uid, 4);\r

        // Mifare UID BCC\r
        // Mifare UID BCC\r

-       block0[4] = block0[0]^block0[1]^block0[2]^block0[3];\r
+       block0[4] = block0[0] ^ block0[1] ^ block0[2] ^ block0[3];\r

        // mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed)\r
        // mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed)\r

-       if (sak!=NULL)\r
-               block0[5]=sak[0];\r
-       if (atqa!=NULL) {\r
-               block0[6]=atqa[1];\r
-               block0[7]=atqa[0];\r
+       if (sak != NULL)\r
+               block0[5] = sak[0];\r
+       if (atqa != NULL) {\r
+               block0[6] = atqa[1];\r
+               block0[7] = atqa[0];\r
+       }\r
+       PrintAndLog("new block 0:  %s", sprint_hex(block0, 16));\r
+\r
+       res = mfCSetBlock(0, block0, oldUID, false, cmdParams);\r
+       if (res) {\r
+               PrintAndLog("Can't set block 0. Error: %d", res);\r
+               return res;\r

        }\r
        }\r

-       PrintAndLog("new block 0:  %s", sprint_hex(block0,16));\r
-       return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER);\r
+       \r
+       return 0;\r
+}\r
+\r
+int mfCIdentify()\r
+{\r
+       UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};\r
+       SendCommand(&c);\r
+\r
+       UsbCommand resp;\r
+       WaitForResponse(CMD_ACK,&resp);\r
+\r
+       // iso14a_card_select_t card;\r
+       // memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));\r
+\r
+       // uint64_t select_status = resp.arg[0];                // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision\r
+\r
+       // if(select_status != 0) {\r
+               // uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0\r
+               // c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;\r
+               // c.arg[1] = 2;\r
+               // c.arg[2] = 0;\r
+               // memcpy(c.d.asBytes, rats, 2);\r
+               // SendCommand(&c);\r
+               // WaitForResponse(CMD_ACK,&resp);\r
+       // }\r
+\r
+       c.cmd = CMD_MIFARE_CIDENT;\r
+       c.arg[0] = 0;\r
+       c.arg[1] = 0;\r
+       c.arg[2] = 0;\r
+       SendCommand(&c);\r
+       WaitForResponse(CMD_ACK,&resp);\r
+\r
+       uint8_t isGeneration = resp.arg[0] & 0xff;\r
+       switch( isGeneration ){\r
+               case 1: PrintAndLog("Chinese magic backdoor commands (GEN 1a) detected"); break;\r
+               case 2: PrintAndLog("Chinese magic backdoor command (GEN 1b) detected"); break;\r
+               default: PrintAndLog("No chinese magic backdoor command detected"); break;\r
+       }\r
+\r
+       // disconnect\r
+       c.cmd = CMD_READER_ISO_14443a;\r
+       c.arg[0] = 0;\r
+       c.arg[1] = 0;\r
+       c.arg[2] = 0;\r
+       SendCommand(&c);\r
+\r
+       return (int) isGeneration;\r

 }\r
 \r
 }\r
 \r

+\r

 // SNIFFER\r
 \r
 // constants\r
 // SNIFFER\r
 \r
 // constants\r


@@ -508,7 +590,7 @@ int isTraceCardEmpty(void) {
 }\r
 \r
 int isBlockEmpty(int blockN) {\r
 }\r
 \r
 int isBlockEmpty(int blockN) {\r

-       for (int i = 0; i < 16; i++) \r
+       for (int i = 0; i < 16; i++)\r

                if (traceCard[blockN * 16 + i] != 0) return 0;\r
 \r
        return 1;\r
                if (traceCard[blockN * 16 + i] != 0) return 0;\r
 \r
        return 1;\r


@@ -520,15 +602,15 @@ int isBlockTrailer(int blockN) {
 \r
 int saveTraceCard(void) {\r
        FILE * f;\r
 \r
 int saveTraceCard(void) {\r
        FILE * f;\r

-       \r
+\r

        if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;\r
        if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;\r

-       \r
+\r

        f = fopen(traceFileName, "w+");\r
        if ( !f ) return 1;\r
        f = fopen(traceFileName, "w+");\r
        if ( !f ) return 1;\r

-       \r
+\r

        for (int i = 0; i < 64; i++) {  // blocks\r
                for (int j = 0; j < 16; j++)  // bytes\r
        for (int i = 0; i < 64; i++) {  // blocks\r
                for (int j = 0; j < 16; j++)  // bytes\r

-                       fprintf(f, "%02x", *(traceCard + i * 16 + j)); \r
+                       fprintf(f, "%02x", *(traceCard + i * 16 + j));\r

                fprintf(f,"\n");\r
        }\r
        fclose(f);\r
                fprintf(f,"\n");\r
        }\r
        fclose(f);\r


@@ -540,10 +622,10 @@ int loadTraceCard(uint8_t *tuid) {
        char buf[64] = {0x00};\r
        uint8_t buf8[64] = {0x00};\r
        int i, blockNum;\r
        char buf[64] = {0x00};\r
        uint8_t buf8[64] = {0x00};\r
        int i, blockNum;\r

-       \r
-       if (!isTraceCardEmpty()) \r
+\r
+       if (!isTraceCardEmpty())\r

                saveTraceCard();\r
                saveTraceCard();\r

-               \r
+\r

        memset(traceCard, 0x00, 4096);\r
        memcpy(traceCard, tuid + 3, 4);\r
 \r
        memset(traceCard, 0x00, 4096);\r
        memcpy(traceCard, tuid + 3, 4);\r
 \r


@@ -551,11 +633,11 @@ int loadTraceCard(uint8_t *tuid) {
 \r
        f = fopen(traceFileName, "r");\r
        if (!f) return 1;\r
 \r
        f = fopen(traceFileName, "r");\r
        if (!f) return 1;\r

-       \r
+\r

        blockNum = 0;\r
        blockNum = 0;\r

-               \r
+\r

        while(!feof(f)){\r
        while(!feof(f)){\r

-       \r
+\r

                memset(buf, 0, sizeof(buf));\r
                if (fgets(buf, sizeof(buf), f) == NULL) {\r
                        PrintAndLog("File reading error.");\r
                memset(buf, 0, sizeof(buf));\r
                if (fgets(buf, sizeof(buf), f) == NULL) {\r
                        PrintAndLog("File reading error.");\r


@@ -583,20 +665,20 @@ int loadTraceCard(uint8_t *tuid) {
 \r
 int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {\r
 \r
 \r
 int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {\r
 \r

-       if (traceCrypto1) \r
+       if (traceCrypto1)\r

                crypto1_destroy(traceCrypto1);\r
 \r
        traceCrypto1 = NULL;\r
 \r
                crypto1_destroy(traceCrypto1);\r
 \r
        traceCrypto1 = NULL;\r
 \r

-       if (wantSaveToEmlFile) \r
+       if (wantSaveToEmlFile)\r

                loadTraceCard(tuid);\r
                loadTraceCard(tuid);\r

-               \r
+\r

        traceCard[4] = traceCard[0] ^ traceCard[1] ^ traceCard[2] ^ traceCard[3];\r
        traceCard[5] = sak;\r
        memcpy(&traceCard[6], atqa, 2);\r
        traceCurBlock = 0;\r
        uid = bytes_to_num(tuid + 3, 4);\r
        traceCard[4] = traceCard[0] ^ traceCard[1] ^ traceCard[2] ^ traceCard[3];\r
        traceCard[5] = sak;\r
        memcpy(&traceCard[6], atqa, 2);\r
        traceCurBlock = 0;\r
        uid = bytes_to_num(tuid + 3, 4);\r

-       \r
+\r

        traceState = TRACE_IDLE;\r
 \r
        return 0;\r
        traceState = TRACE_IDLE;\r
 \r
        return 0;\r


@@ -605,7 +687,7 @@ int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFil
 void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted){\r
        uint8_t bt = 0;\r
        int i;\r
 void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted){\r
        uint8_t bt = 0;\r
        int i;\r

-       \r
+\r

        if (len != 1) {\r
                for (i = 0; i < len; i++)\r
                        data[i] = crypto1_byte(pcs, 0x00, isEncrypted) ^ data[i];\r
        if (len != 1) {\r
                for (i = 0; i < len; i++)\r
                        data[i] = crypto1_byte(pcs, 0x00, isEncrypted) ^ data[i];\r


@@ -613,7 +695,7 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool i
                bt = 0;\r
                for (i = 0; i < 4; i++)\r
                        bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], i)) << i;\r
                bt = 0;\r
                for (i = 0; i < 4; i++)\r
                        bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], i)) << i;\r

-                               \r
+\r

                data[0] = bt;\r
        }\r
        return;\r
                data[0] = bt;\r
        }\r
        return;\r


@@ -628,24 +710,24 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                traceState = TRACE_ERROR;\r
                return 1;\r
        }\r
                traceState = TRACE_ERROR;\r
                return 1;\r
        }\r

-       \r
+\r

        memcpy(data, data_src, len);\r
        if ((traceCrypto1) && ((traceState == TRACE_IDLE) || (traceState > TRACE_AUTH_OK))) {\r
                mf_crypto1_decrypt(traceCrypto1, data, len, 0);\r
                PrintAndLog("dec> %s", sprint_hex(data, len));\r
        memcpy(data, data_src, len);\r
        if ((traceCrypto1) && ((traceState == TRACE_IDLE) || (traceState > TRACE_AUTH_OK))) {\r
                mf_crypto1_decrypt(traceCrypto1, data, len, 0);\r
                PrintAndLog("dec> %s", sprint_hex(data, len));\r

-               AddLogHex(logHexFileName, "dec> ", data, len); \r
+               AddLogHex(logHexFileName, "dec> ", data, len);\r

        }\r
        }\r

-       \r
+\r

        switch (traceState) {\r
        switch (traceState) {\r

-       case TRACE_IDLE: \r
+       case TRACE_IDLE:\r

                // check packet crc16!\r
                if ((len >= 4) && (!CheckCrc14443(CRC_14443_A, data, len))) {\r
                        PrintAndLog("dec> CRC ERROR!!!");\r
                // check packet crc16!\r
                if ((len >= 4) && (!CheckCrc14443(CRC_14443_A, data, len))) {\r
                        PrintAndLog("dec> CRC ERROR!!!");\r

-                       AddLogLine(logHexFileName, "dec> ", "CRC ERROR!!!"); \r
+                       AddLogLine(logHexFileName, "dec> ", "CRC ERROR!!!");\r

                        traceState = TRACE_ERROR;  // do not decrypt the next commands\r
                        return 1;\r
                }\r
                        traceState = TRACE_ERROR;  // do not decrypt the next commands\r
                        return 1;\r
                }\r

-               \r
+\r

                // AUTHENTICATION\r
                if ((len ==4) && ((data[0] == 0x60) || (data[0] == 0x61))) {\r
                        traceState = TRACE_AUTH1;\r
                // AUTHENTICATION\r
                if ((len ==4) && ((data[0] == 0x60) || (data[0] == 0x61))) {\r
                        traceState = TRACE_AUTH1;\r


@@ -673,11 +755,11 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                        traceState = TRACE_ERROR;  // do not decrypt the next commands\r
                        return 0;\r
                }\r
                        traceState = TRACE_ERROR;  // do not decrypt the next commands\r
                        return 0;\r
                }\r

-               \r
+\r

                return 0;\r
        break;\r
                return 0;\r
        break;\r

-       \r
-       case TRACE_READ_DATA: \r
+\r
+       case TRACE_READ_DATA:\r

                if (len == 18) {\r
                        traceState = TRACE_IDLE;\r
 \r
                if (len == 18) {\r
                        traceState = TRACE_IDLE;\r
 \r


@@ -694,7 +776,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                }\r
        break;\r
 \r
                }\r
        break;\r
 \r

-       case TRACE_WRITE_OK: \r
+       case TRACE_WRITE_OK:\r

                if ((len == 1) && (data[0] == 0x0a)) {\r
                        traceState = TRACE_WRITE_DATA;\r
 \r
                if ((len == 1) && (data[0] == 0x0a)) {\r
                        traceState = TRACE_WRITE_DATA;\r
 \r


@@ -705,7 +787,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                }\r
        break;\r
 \r
                }\r
        break;\r
 \r

-       case TRACE_WRITE_DATA: \r
+       case TRACE_WRITE_DATA:\r

                if (len == 18) {\r
                        traceState = TRACE_IDLE;\r
 \r
                if (len == 18) {\r
                        traceState = TRACE_IDLE;\r
 \r


@@ -718,7 +800,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                }\r
        break;\r
 \r
                }\r
        break;\r
 \r

-       case TRACE_AUTH1: \r
+       case TRACE_AUTH1:\r

                if (len == 4) {\r
                        traceState = TRACE_AUTH2;\r
                        nt = bytes_to_num(data, 4);\r
                if (len == 4) {\r
                        traceState = TRACE_AUTH2;\r
                        nt = bytes_to_num(data, 4);\r


@@ -729,7 +811,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                }\r
        break;\r
 \r
                }\r
        break;\r
 \r

-       case TRACE_AUTH2: \r
+       case TRACE_AUTH2:\r

                if (len == 8) {\r
                        traceState = TRACE_AUTH_OK;\r
 \r
                if (len == 8) {\r
                        traceState = TRACE_AUTH_OK;\r
 \r


@@ -742,12 +824,12 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                }\r
        break;\r
 \r
                }\r
        break;\r
 \r

-       case TRACE_AUTH_OK: \r
+       case TRACE_AUTH_OK:\r

                if (len ==4) {\r
                        traceState = TRACE_IDLE;\r
 \r
                        at_enc = bytes_to_num(data, 4);\r
                if (len ==4) {\r
                        traceState = TRACE_IDLE;\r
 \r
                        at_enc = bytes_to_num(data, 4);\r

-                       \r
+\r

                        //  decode key here)\r
                        ks2 = ar_enc ^ prng_successor(nt, 64);\r
                        ks3 = at_enc ^ prng_successor(nt, 96);\r
                        //  decode key here)\r
                        ks2 = ar_enc ^ prng_successor(nt, 64);\r
                        ks3 = at_enc ^ prng_successor(nt, 96);\r


@@ -759,11 +841,11 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
 \r
                        crypto1_get_lfsr(revstate, &lfsr);\r
                        printf("key> %x%x\n", (unsigned int)((lfsr & 0xFFFFFFFF00000000) >> 32), (unsigned int)(lfsr & 0xFFFFFFFF));\r
 \r
                        crypto1_get_lfsr(revstate, &lfsr);\r
                        printf("key> %x%x\n", (unsigned int)((lfsr & 0xFFFFFFFF00000000) >> 32), (unsigned int)(lfsr & 0xFFFFFFFF));\r

-                       AddLogUint64(logHexFileName, "key> ", lfsr); \r
-                       \r
+                       AddLogUint64(logHexFileName, "key> ", lfsr);\r
+\r

                        int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;\r
                        if (isBlockEmpty((traceCurBlock & 0xFC) + 3)) memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);\r
                        int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;\r
                        if (isBlockEmpty((traceCurBlock & 0xFC) + 3)) memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);\r

-                       \r
+\r

                        if (traceCurKey) {\r
                                num_to_bytes(lfsr, 6, traceCard + blockShift + 10);\r
                        } else {\r
                        if (traceCurKey) {\r
                                num_to_bytes(lfsr, 6, traceCard + blockShift + 10);\r
                        } else {\r


@@ -774,10 +856,10 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                        if (traceCrypto1) {\r
                                crypto1_destroy(traceCrypto1);\r
                        }\r
                        if (traceCrypto1) {\r
                                crypto1_destroy(traceCrypto1);\r
                        }\r

-                       \r
+\r

                        // set cryptosystem state\r
                        traceCrypto1 = lfsr_recovery64(ks2, ks3);\r
                        // set cryptosystem state\r
                        traceCrypto1 = lfsr_recovery64(ks2, ks3);\r

-                       \r
+\r

 //     nt = crypto1_word(traceCrypto1, nt ^ uid, 1) ^ nt;\r
 \r
        /*      traceCrypto1 = crypto1_create(lfsr); // key in lfsr\r
 //     nt = crypto1_word(traceCrypto1, nt ^ uid, 1) ^ nt;\r
 \r
        /*      traceCrypto1 = crypto1_create(lfsr); // key in lfsr\r


@@ -785,7 +867,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                crypto1_word(traceCrypto1, ar, 1);\r
                crypto1_word(traceCrypto1, 0, 0);\r
                crypto1_word(traceCrypto1, 0, 0);*/\r
                crypto1_word(traceCrypto1, ar, 1);\r
                crypto1_word(traceCrypto1, 0, 0);\r
                crypto1_word(traceCrypto1, 0, 0);*/\r

-       \r
+\r

                        return 0;\r
                } else {\r
                        traceState = TRACE_ERROR;\r
                        return 0;\r
                } else {\r
                        traceState = TRACE_ERROR;\r


@@ -793,7 +875,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
                }\r
        break;\r
 \r
                }\r
        break;\r
 \r

-       default: \r
+       default:\r

                traceState = TRACE_ERROR;\r
                return 1;\r
        }\r
                traceState = TRACE_ERROR;\r
                return 1;\r
        }\r


@@ -801,6 +883,8 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

+// DECODING\r
+\r

 int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){\r
        /*\r
        uint32_t nt;      // tag challenge\r
 int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){\r
        /*\r
        uint32_t nt;      // tag challenge\r


@@ -820,3 +904,4 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,
        crypto1_destroy(traceCrypto1);\r
        return 0;\r
 }\r
        crypto1_destroy(traceCrypto1);\r
        return 0;\r
 }\r

+\r