fix reveng memory bug + @iceman1001 s scripting

[proxmark3-svn] / client / mifarehost.c

diff --git a/client/mifarehost.c b/client/mifarehost.c
index cfcc17ba17872036c1477b581f3e39de51b96ec0..237979c1bfaaefc13ca0940093c2a47d5b954f40 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -11,190 +11,202 @@
 #include <stdio.h>\r
 #include <stdlib.h> \r
 #include <string.h>\r
 #include <stdio.h>\r
 #include <stdlib.h> \r
 #include <string.h>\r

+#include <pthread.h>\r

 #include "mifarehost.h"\r
 #include "mifarehost.h"\r

+#include "proxmark3.h"\r

 \r
 // MIFARE\r
 \r
 // MIFARE\r

-\r

 int compar_int(const void * a, const void * b) {\r
 int compar_int(const void * a, const void * b) {\r

-       return (*(uint64_t*)b - *(uint64_t*)a);\r
+       // didn't work: (the result is truncated to 32 bits)\r
+       //return (*(uint64_t*)b - *(uint64_t*)a);\r
+\r
+       // better:\r
+       if (*(uint64_t*)b == *(uint64_t*)a) return 0;\r
+       else if (*(uint64_t*)b > *(uint64_t*)a) return 1;\r
+       else return -1;\r

 }\r
 \r
 }\r
 \r

-// Compare countKeys structure\r
-int compar_special_int(const void * a, const void * b) {\r
-       return (((countKeys *)b)->count - ((countKeys *)a)->count);\r
+// Compare 16 Bits out of cryptostate\r
+int Compare16Bits(const void * a, const void * b) {\r
+       if ((*(uint64_t*)b & 0x00ff000000ff0000) == (*(uint64_t*)a & 0x00ff000000ff0000)) return 0;\r
+       else if ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000)) return 1;\r
+       else return -1;\r

 }\r
 \r
 }\r
 \r

-countKeys * uniqsort(uint64_t * possibleKeys, uint32_t size) {\r
-       int i, j = 0;\r
-       int count = 0;\r
-       countKeys *our_counts;\r
-       \r
-       qsort(possibleKeys, size, sizeof (uint64_t), compar_int);\r
-       \r
-       our_counts = calloc(size, sizeof(countKeys));\r
-       if (our_counts == NULL) {\r
-               PrintAndLog("Memory allocation error for our_counts");\r
-               return NULL;\r
-       }\r
+typedef \r
+       struct {\r
+               union {\r
+                       struct Crypto1State *slhead;\r
+                       uint64_t *keyhead;\r
+               } head;\r
+               union {\r
+                       struct Crypto1State *sltail;\r
+                       uint64_t *keytail;\r
+               } tail;\r
+               uint32_t len;\r
+               uint32_t uid;\r
+               uint32_t blockNo;\r
+               uint32_t keyType;\r
+               uint32_t nt;\r
+               uint32_t ks1;\r
+       } StateList_t;\r
+\r
+\r
+// wrapper function for multi-threaded lfsr_recovery32\r
+void* nested_worker_thread(void *arg)\r
+{\r
+       struct Crypto1State *p1;\r
+       StateList_t *statelist = arg;\r
+\r
+       statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid);\r
+       for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++);\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

-       for (i = 0; i < size; i++) {\r
-        if (possibleKeys[i+1] == possibleKeys[i]) { \r
-                       count++;\r
-               } else {\r
-                       our_counts[j].key = possibleKeys[i];\r
-                       our_counts[j].count = count;\r
-                       j++;\r
-                       count=0;\r
-               }\r
-       }\r
-       qsort(our_counts, j, sizeof(countKeys), compar_special_int);\r
-       return (our_counts);\r
+       return statelist->head.slhead;\r

 }\r
 \r
 }\r
 \r

-int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * resultKeys) \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
 {\r

-       int i, m, len;\r
-       uint8_t isEOF;\r
+       uint16_t i, len;\r

        uint32_t uid;\r
        uint32_t uid;\r

-       fnVector * vector = NULL;\r
-       countKeys       *ck;\r
-       int lenVector = 0;\r
-       UsbCommand * resp = NULL;\r
-       \r
-       memset(resultKeys, 0x00, 16 * 6);\r
+       UsbCommand resp;\r

 \r
 \r

+       StateList_t statelists[2];\r
+       struct Crypto1State *p1, *p2, *p3, *p4;\r
+       \r

        // flush queue\r
        // flush queue\r

-       while (WaitForResponseTimeout(CMD_ACK, 500) != NULL) ;\r
+       WaitForResponseTimeout(CMD_ACK,NULL,100);\r

        \r
        \r

-  UsbCommand c = {CMD_MIFARE_NESTED, {blockNo, keyType, trgBlockNo + trgKeyType * 0x100}};\r
+       UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}};\r

        memcpy(c.d.asBytes, key, 6);\r
        memcpy(c.d.asBytes, key, 6);\r

-  SendCommand(&c);\r
-\r
-       PrintAndLog("\n");\r
-\r
-       // wait cycle\r
-       while (true) {\r
-               printf(".");\r
-               if (ukbhit()) {\r
-                       getchar();\r
-                       printf("\naborted via keyboard!\n");\r
-                       break;\r
-               }\r
-\r
-               resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
-\r
-               if (resp != NULL) {\r
-                       isEOF  = resp->arg[0] & 0xff;\r
+       SendCommand(&c);\r

 \r
 \r

-                       if (isEOF) break;\r
-                       \r
-                       len = resp->arg[1] & 0xff;\r
-                       if (len == 0) continue;\r
-                       \r
-                       memcpy(&uid, resp->d.asBytes, 4); \r
-                       PrintAndLog("uid:%08x len=%d trgbl=%d trgkey=%x", uid, len, resp->arg[2] & 0xff, (resp->arg[2] >> 8) & 0xff);\r
-                       vector = (fnVector *) realloc((void *)vector, (lenVector + len) * sizeof(fnVector) + 200);\r
-                       if (vector == NULL) {\r
-                               PrintAndLog("Memory allocation error for fnVector. len: %d bytes: %d", lenVector + len, (lenVector + len) * sizeof(fnVector)); \r
-                               break;\r
-                       }\r
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+               len = resp.arg[1];\r
+               if (len == 2) { \r
+                       memcpy(&uid, resp.d.asBytes, 4);\r
+                       PrintAndLog("uid:%08x len=%d trgbl=%d trgkey=%x", uid, len, (uint16_t)resp.arg[2] & 0xff, (uint16_t)resp.arg[2] >> 8);\r

                        \r
                        \r

-                       for (i = 0; i < len; i++) {\r
-                               vector[lenVector + i].blockNo = resp->arg[2] & 0xff;\r
-                               vector[lenVector + i].keyType = (resp->arg[2] >> 8) & 0xff;\r
-                               vector[lenVector + i].uid = uid;\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
+                               statelists[i].uid = uid;\r

 \r
 \r

-                               memcpy(&vector[lenVector + i].nt,  (void *)(resp->d.asBytes + 8 + i * 8 + 0), 4);\r
-                               memcpy(&vector[lenVector + i].ks1, (void *)(resp->d.asBytes + 8 + i * 8 + 4), 4);\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
-                       lenVector += len;\r
+               }\r
+               else {\r
+                       PrintAndLog("Got 0 keys from proxmark."); \r
+                       return 1;\r

                }\r
        }\r
        \r
                }\r
        }\r
        \r

-       if (!lenVector) {\r
-               PrintAndLog("Got 0 keys from proxmark."); \r
-               return 1;\r
-       }\r
-       printf("------------------------------------------------------------------\n");\r
-       \r

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

-       struct Crypto1State* revstate = NULL;\r
-       struct Crypto1State* revstate_start = NULL;\r
-       uint64_t lfsr;\r
-       int kcount = 0;\r
-       pKeys           *pk;\r
-       \r
-       if ((pk = (void *) malloc(sizeof(pKeys))) == NULL) return 1;\r
-       memset(pk, 0x00, sizeof(pKeys));\r

        \r
        \r

-       for (m = 0; m < lenVector; m++) {\r
-               // And finally recover the first 32 bits of the key\r
-               revstate = lfsr_recovery32(vector[m].ks1, vector[m].nt ^ vector[m].uid);\r
-               if (revstate_start == NULL) revstate_start = revstate;\r
+       pthread_t thread_id[2];\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

-               while ((revstate->odd != 0x0) || (revstate->even != 0x0)) {\r
-                       lfsr_rollback_word(revstate, vector[m].nt ^ vector[m].uid, 0);\r
-                       crypto1_get_lfsr(revstate, &lfsr);\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
+       }\r

 \r
 \r

-                       // Allocate a new space for keys\r
-                       if (((kcount % MEM_CHUNK) == 0) || (kcount >= pk->size)) {\r
-                               pk->size += MEM_CHUNK;\r
-//fprintf(stdout, "New chunk by %d, sizeof %d\n", kcount, pk->size * sizeof(uint64_t));\r
-                               pk->possibleKeys = (uint64_t *) realloc((void *)pk->possibleKeys, pk->size * sizeof(uint64_t));\r
-                               if (pk->possibleKeys == NULL) {\r
-                                       PrintAndLog("Memory allocation error for pk->possibleKeys"); \r
-                                       return 1;\r
-                               }\r
+\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
+       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
+                       struct Crypto1State savestate, *savep = &savestate;\r
+                       savestate = *p1;\r
+                       while(Compare16Bits(p1, savep) == 0 && p1 <= statelists[0].tail.sltail) {\r
+                               *p3 = *p1;\r
+                               lfsr_rollback_word(p3, statelists[0].nt ^ statelists[0].uid, 0);\r
+                               p3++;\r
+                               p1++;\r
+                       }\r
+                       savestate = *p2;\r
+                       while(Compare16Bits(p2, savep) == 0 && p2 <= statelists[1].tail.sltail) {\r
+                               *p4 = *p2;\r
+                               lfsr_rollback_word(p4, statelists[1].nt ^ statelists[1].uid, 0);\r
+                               p4++;\r
+                               p2++;\r

                        }\r
                        }\r

-                       pk->possibleKeys[kcount] = lfsr;\r
-                       kcount++;\r
-                       revstate++;\r

                }\r
                }\r

-       free(revstate_start);\r
-       revstate_start = NULL;\r
-\r
+               else {\r
+                       while (Compare16Bits(p1, p2) == -1) p1++;\r
+                       while (Compare16Bits(p1, p2) == 1) p2++;\r
+               }\r

        }\r
        }\r

-       \r
-       // Truncate\r
-       if (kcount != 0) {\r
-               pk->size = --kcount;\r
-               if ((pk->possibleKeys = (uint64_t *) realloc((void *)pk->possibleKeys, pk->size * sizeof(uint64_t))) == NULL) {\r
-                       PrintAndLog("Memory allocation error for pk->possibleKeys"); \r
-                       return 1;\r
-               }               \r
+       p3->even = 0; p3->odd = 0;\r
+       p4->even = 0; p4->odd = 0;\r
+       statelists[0].len = p3 - statelists[0].head.slhead;\r
+       statelists[1].len = p4 - statelists[1].head.slhead;\r
+       statelists[0].tail.sltail=--p3;\r
+       statelists[1].tail.sltail=--p4;\r
+\r
+       // the statelists now contain possible keys. The key we are searching for must be in the\r
+       // intersection of both lists. Create the intersection:\r
+       qsort(statelists[0].head.keyhead, statelists[0].len, sizeof(uint64_t), compar_int);\r
+       qsort(statelists[1].head.keyhead, statelists[1].len, sizeof(uint64_t), compar_int);\r
+\r
+       uint64_t *p5, *p6, *p7;\r
+       p5 = p7 = statelists[0].head.keyhead; \r
+       p6 = statelists[1].head.keyhead;\r
+       while (p5 <= statelists[0].tail.keytail && p6 <= statelists[1].tail.keytail) {\r
+               if (compar_int(p5, p6) == 0) {\r
+                       *p7++ = *p5++;\r
+                       p6++;\r
+               }\r
+               else {\r
+                       while (compar_int(p5, p6) == -1) p5++;\r
+                       while (compar_int(p5, p6) == 1) p6++;\r
+               }\r

        }\r
        }\r

-\r
-       PrintAndLog("Total keys count:%d", kcount);\r
-       ck = uniqsort(pk->possibleKeys, pk->size);\r
-\r
-       // fill key array\r
-       for (i = 0; i < 16 ; i++) {\r
-               num_to_bytes(ck[i].key, 6, (uint8_t*)(resultKeys + i * 6));\r
+       statelists[0].len = p7 - statelists[0].head.keyhead;\r
+       statelists[0].tail.keytail=--p7;\r
+\r
+       memset(resultKey, 0, 6);\r
+       // The list may still contain several key candidates. Test each of them with mfCheckKeys\r
+       for (i = 0; i < statelists[0].len; i++) {\r
+               uint8_t keyBlock[6];\r
+               uint64_t key64;\r
+               crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);\r
+               num_to_bytes(key64, 6, keyBlock);\r
+               key64 = 0;\r
+               if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, 1, keyBlock, &key64)) {\r
+                       num_to_bytes(key64, 6, resultKey);\r
+                       break;\r
+               }\r

        }\r
        }\r

-\r
-       // finalize\r
-       free(pk->possibleKeys);\r
-       free(pk);\r
-       free(ck);\r
-       free(vector);\r
-\r
+       \r
+       free(statelists[0].head.slhead);\r
+       free(statelists[1].head.slhead);\r
+       \r

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

+\r

        *key = 0;\r
 \r
        *key = 0;\r
 \r

-  UsbCommand c = {CMD_MIFARE_CHKKEYS, {blockNo, keyType, keycnt}};\r
+       UsbCommand c = {CMD_MIFARE_CHKKEYS, {blockNo, keyType, keycnt}};\r

        memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\r
        memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\r

+       SendCommand(&c);\r

 \r
 \r

-  SendCommand(&c);\r
-\r
-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 3000);\r
-\r
-       if (resp == NULL) return 1;\r
-       if ((resp->arg[0] & 0xff) != 0x01) return 2;\r
-       *key = bytes_to_num(resp->d.asBytes, 6);\r
+       UsbCommand resp;\r
+       if (!WaitForResponseTimeout(CMD_ACK,&resp,3000)) return 1;\r
+       if ((resp.arg[0] & 0xff) != 0x01) return 2;\r
+       *key = bytes_to_num(resp.d.asBytes, 6);\r

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


@@ -202,13 +214,11 @@ int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * key
 \r
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {\r
        UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};\r
 \r
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {\r
        UsbCommand c = {CMD_MIFARE_EML_MEMGET, {blockNum, blocksCount, 0}};\r

- \r
-       SendCommand(&c);\r
-\r
-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
+       SendCommand(&c);\r

 \r
 \r

-       if (resp == NULL) return 1;\r
-       memcpy(data, resp->d.asBytes, blocksCount * 16); \r
+  UsbCommand resp;\r
+       if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) return 1;\r
+       memcpy(data, resp.d.asBytes, blocksCount * 16);\r

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


@@ -221,32 +231,48 @@ int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
 \r
 // "MAGIC" CARD\r
 \r
 \r
 // "MAGIC" CARD\r
 \r

-int mfCSetUID(uint8_t *uid, uint8_t *oldUID, int wantWipe) {\r
-       uint8_t block0[16];\r
-       memset(block0, 0, 16);\r
+int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool wantWipe) {\r
+       uint8_t oldblock0[16] = {0x00};\r
+       uint8_t block0[16] = {0x00};\r
+\r
+       int old = mfCGetBlock(0, oldblock0, CSETBLOCK_SINGLE_OPER);\r
+       if (old == 0) {\r
+               memcpy(block0, oldblock0, 16);\r
+               PrintAndLog("old block 0:  %s", sprint_hex(block0,16));\r
+       } else {\r
+               PrintAndLog("Couldn't get old data. Will write over the last bytes of Block 0.");\r
+       }\r
+\r
+       // fill in the new values\r
+       // UID\r

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

-       block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // Mifare UID BCC\r
-       // mifare classic SAK(byte 5) and ATQA(byte 6 and 7)\r
-       block0[5] = 0x88;\r
-       block0[6] = 0x04;\r
-       block0[7] = 0x00;\r
-       \r
+       // Mifare UID BCC\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
+       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

        return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER);\r
 }\r
 \r
        return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER);\r
 }\r
 \r

-int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, int wantWipe, uint8_t params) {\r
-       uint8_t isOK = 0;\r
+int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params) {\r

 \r
 \r

-       UsbCommand c = {CMD_MIFARE_EML_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};\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
        SendCommand(&c);\r
 \r
        memcpy(c.d.asBytes, data, 16); \r
        SendCommand(&c);\r
 \r

-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
-\r
-       if (resp != NULL) {\r
-               isOK  = resp->arg[0] & 0xff;\r
-               if (uid != NULL) memcpy(uid, resp->d.asBytes, 4); \r
-               if (!isOK) return 2;\r
+  UsbCommand resp;\r
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+               isOK  = resp.arg[0] & 0xff;\r
+               if (uid != NULL) \r
+                       memcpy(uid, resp.d.asBytes, 4);\r
+               if (!isOK) \r
+                       return 2;\r

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


@@ -257,14 +283,13 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, int wantWipe, uint
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {\r
        uint8_t isOK = 0;\r
 \r
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {\r
        uint8_t isOK = 0;\r
 \r

-       UsbCommand c = {CMD_MIFARE_EML_CGETBLOCK, {params, 0, blockNo}};\r
+       UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};\r

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

-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
-\r
-       if (resp != NULL) {\r
-               isOK  = resp->arg[0] & 0xff;\r
-               memcpy(data, resp->d.asBytes, 16); \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 (!isOK) return 2;\r
        } else {\r
                PrintAndLog("Command execute timeout");\r
                if (!isOK) return 2;\r
        } else {\r
                PrintAndLog("Command execute timeout");\r


@@ -275,9 +300,13 @@ int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
 \r
 // SNIFFER\r
 \r
 \r
 // SNIFFER\r
 \r

+// constants\r
+static uint8_t trailerAccessBytes[4] = {0x08, 0x77, 0x8F, 0x00};\r
+\r

 // variables\r
 // variables\r

-char logHexFileName[200] = {0x00};\r
-static uint8_t traceCard[4096];\r
+char logHexFileName[FILE_PATH_SIZE] = {0x00};\r
+static uint8_t traceCard[4096] = {0x00};\r
+static char traceFileName[FILE_PATH_SIZE] = {0x00};\r

 static int traceState = TRACE_IDLE;\r
 static uint8_t traceCurBlock = 0;\r
 static uint8_t traceCurKey = 0;\r
 static int traceState = TRACE_IDLE;\r
 static uint8_t traceCurBlock = 0;\r
 static uint8_t traceCurKey = 0;\r


@@ -295,13 +324,94 @@ uint32_t nr_enc;  // encrypted reader challenge
 uint32_t ar_enc;  // encrypted reader response\r
 uint32_t at_enc;  // encrypted tag response\r
 \r
 uint32_t ar_enc;  // encrypted reader response\r
 uint32_t at_enc;  // encrypted tag response\r
 \r

-int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak) {\r
+int isTraceCardEmpty(void) {\r
+       return ((traceCard[0] == 0) && (traceCard[1] == 0) && (traceCard[2] == 0) && (traceCard[3] == 0));\r
+}\r

 \r
 \r

-       if (traceCrypto1) crypto1_destroy(traceCrypto1);\r
-       traceCrypto1 = NULL;\r
+int isBlockEmpty(int blockN) {\r
+       for (int i = 0; i < 16; i++) \r
+               if (traceCard[blockN * 16 + i] != 0) return 0;\r

 \r
 \r

+       return 1;\r
+}\r
+\r
+int isBlockTrailer(int blockN) {\r
+ return ((blockN & 0x03) == 0x03);\r
+}\r
+\r
+int loadTraceCard(uint8_t *tuid) {\r
+       FILE * f;\r
+       char buf[64] = {0x00};\r
+       uint8_t buf8[64] = {0x00};\r
+       int i, blockNum;\r
+       \r
+       if (!isTraceCardEmpty()) \r
+               saveTraceCard();\r
+               \r

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

+\r
+       FillFileNameByUID(traceFileName, tuid, ".eml", 7);\r
+\r
+       f = fopen(traceFileName, "r");\r
+       if (!f) return 1;\r
+       \r
+       blockNum = 0;\r
+               \r
+       while(!feof(f)){\r
+       \r
+               memset(buf, 0, sizeof(buf));\r
+               if (fgets(buf, sizeof(buf), f) == NULL) {\r
+                       PrintAndLog("File reading error.");\r
+                       fclose(f);\r
+                       return 2;\r
+       }\r
+\r
+               if (strlen(buf) < 32){\r
+                       if (feof(f)) break;\r
+                       PrintAndLog("File content error. Block data must include 32 HEX symbols");\r
+                       fclose(f);\r
+                       return 2;\r
+               }\r
+               for (i = 0; i < 32; i += 2)\r
+                       sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
+\r
+               memcpy(traceCard + blockNum * 16, buf8, 16);\r
+\r
+               blockNum++;\r
+       }\r
+       fclose(f);\r
+\r
+       return 0;\r
+}\r
+\r
+int saveTraceCard(void) {\r
+       FILE * f;\r
+       \r
+       if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;\r
+       \r
+       f = fopen(traceFileName, "w+");\r
+       if ( !f ) return 1;\r
+       \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,"\n");\r
+       }\r
+       fclose(f);\r
+       return 0;\r
+}\r
+\r
+int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {\r
+\r
+       if (traceCrypto1) \r
+               crypto1_destroy(traceCrypto1);\r
+\r
+       traceCrypto1 = NULL;\r
+\r
+       if (wantSaveToEmlFile) \r
+               loadTraceCard(tuid);\r
+               \r

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


@@ -331,7 +441,7 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool i
 }\r
 \r
 \r
 }\r
 \r
 \r

-int mfTraceDecode(uint8_t *data_src, int len) {\r
+int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {\r

        uint8_t data[64];\r
 \r
        if (traceState == TRACE_ERROR) return 1;\r
        uint8_t data[64];\r
 \r
        if (traceState == TRACE_ERROR) return 1;\r


@@ -349,7 +459,13 @@ int mfTraceDecode(uint8_t *data_src, int len) {
        \r
        switch (traceState) {\r
        case TRACE_IDLE: \r
        \r
        switch (traceState) {\r
        case TRACE_IDLE: \r

-               // TODO: check packet crc16!\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
+                       traceState = TRACE_ERROR;  // do not decrypt the next commands\r
+                       return 1;\r
+               }\r

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


@@ -386,7 +502,12 @@ int mfTraceDecode(uint8_t *data_src, int len) {
                if (len == 18) {\r
                        traceState = TRACE_IDLE;\r
 \r
                if (len == 18) {\r
                        traceState = TRACE_IDLE;\r
 \r

-                       memcpy(traceCard + traceCurBlock * 16, data, 16);\r
+                       if (isBlockTrailer(traceCurBlock)) {\r
+                               memcpy(traceCard + traceCurBlock * 16 + 6, data + 6, 4);\r
+                       } else {\r
+                               memcpy(traceCard + traceCurBlock * 16, data, 16);\r
+                       }\r
+                       if (wantSaveToEmlFile) saveTraceCard();\r

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


@@ -395,7 +516,7 @@ int mfTraceDecode(uint8_t *data_src, int len) {
        break;\r
 \r
        case TRACE_WRITE_OK: \r
        break;\r
 \r
        case TRACE_WRITE_OK: \r

-               if ((len == 1) && (data[0] = 0x0a)) {\r
+               if ((len == 1) && (data[0] == 0x0a)) {\r

                        traceState = TRACE_WRITE_DATA;\r
 \r
                        return 0;\r
                        traceState = TRACE_WRITE_DATA;\r
 \r
                        return 0;\r


@@ -410,6 +531,7 @@ int mfTraceDecode(uint8_t *data_src, int len) {
                        traceState = TRACE_IDLE;\r
 \r
                        memcpy(traceCard + traceCurBlock * 16, data, 16);\r
                        traceState = TRACE_IDLE;\r
 \r
                        memcpy(traceCard + traceCurBlock * 16, data, 16);\r

+                       if (wantSaveToEmlFile) saveTraceCard();\r

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


@@ -420,7 +542,6 @@ int mfTraceDecode(uint8_t *data_src, int len) {
        case TRACE_AUTH1: \r
                if (len == 4) {\r
                        traceState = TRACE_AUTH2;\r
        case TRACE_AUTH1: \r
                if (len == 4) {\r
                        traceState = TRACE_AUTH2;\r

-\r

                        nt = bytes_to_num(data, 4);\r
                        return 0;\r
                } else {\r
                        nt = bytes_to_num(data, 4);\r
                        return 0;\r
                } else {\r


@@ -449,32 +570,27 @@ int mfTraceDecode(uint8_t *data_src, int len) {
                        at_enc = bytes_to_num(data, 4);\r
                        \r
                        //  decode key here)\r
                        at_enc = bytes_to_num(data, 4);\r
                        \r
                        //  decode key here)\r

-                       if (!traceCrypto1) {\r
-                               ks2 = ar_enc ^ prng_successor(nt, 64);\r
-                               ks3 = at_enc ^ prng_successor(nt, 96);\r
-                               revstate = lfsr_recovery64(ks2, ks3);\r
-                               lfsr_rollback_word(revstate, 0, 0);\r
-                               lfsr_rollback_word(revstate, 0, 0);\r
-                               lfsr_rollback_word(revstate, nr_enc, 1);\r
-                               lfsr_rollback_word(revstate, uid ^ nt, 0);\r
-                       }else{\r
-                               ks2 = ar_enc ^ prng_successor(nt, 64);\r
-                               ks3 = at_enc ^ prng_successor(nt, 96);\r
-                               revstate = lfsr_recovery64(ks2, ks3);\r
-                               lfsr_rollback_word(revstate, 0, 0);\r
-                               lfsr_rollback_word(revstate, 0, 0);\r
-                               lfsr_rollback_word(revstate, nr_enc, 1);\r
-                               lfsr_rollback_word(revstate, uid ^ nt, 0);\r
-                       }\r
+                       ks2 = ar_enc ^ prng_successor(nt, 64);\r
+                       ks3 = at_enc ^ prng_successor(nt, 96);\r
+                       revstate = lfsr_recovery64(ks2, ks3);\r
+                       lfsr_rollback_word(revstate, 0, 0);\r
+                       lfsr_rollback_word(revstate, 0, 0);\r
+                       lfsr_rollback_word(revstate, nr_enc, 1);\r
+                       lfsr_rollback_word(revstate, uid ^ nt, 0);\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
                        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

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

                        if (traceCurKey) {\r
                        if (traceCurKey) {\r

-                               num_to_bytes(lfsr, 6, traceCard + traceCurBlock * 16 + 10);\r
+                               num_to_bytes(lfsr, 6, traceCard + blockShift + 10);\r

                        } else {\r
                        } else {\r

-                               num_to_bytes(lfsr, 6, traceCard + traceCurBlock * 16);\r
+                               num_to_bytes(lfsr, 6, traceCard + blockShift);\r

                        }\r
                        }\r

+                       if (wantSaveToEmlFile) saveTraceCard();\r

 \r
                        if (traceCrypto1) {\r
                                crypto1_destroy(traceCrypto1);\r
 \r
                        if (traceCrypto1) {\r
                                crypto1_destroy(traceCrypto1);\r