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 cfcc17ba17872036c1477b581f3e39de51b96ec0..629c8feb4a48c93b0d1431032d3261ebe6f8da60 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -8,193 +8,386 @@
 // mifare commands\r
 //-----------------------------------------------------------------------------\r
 \r
 // mifare commands\r
 //-----------------------------------------------------------------------------\r
 \r

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

 #include <stdio.h>\r
 #include <stdio.h>\r

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

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

-#include "mifarehost.h"\r
+#include <pthread.h>\r
+\r
+#include "crapto1/crapto1.h"\r
+#include "proxmark3.h"\r
+#include "usb_cmd.h"\r
+#include "cmdmain.h"\r
+#include "ui.h"\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
+#define TRACE_AUTH2                                            0x02\r
+#define TRACE_AUTH_OK                                  0x03\r
+#define TRACE_READ_DATA                                0x04\r
+#define TRACE_WRITE_OK                                 0x05\r
+#define TRACE_WRITE_DATA                               0x06\r
+#define TRACE_ERROR                                            0xFF\r
+\r
+\r
+static int compare_uint64(const void *a, const void *b) {\r
+       // didn't work: (the result is truncated to 32 bits)\r
+       //return (*(int64_t*)b - *(int64_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

-// MIFARE\r

 \r
 \r

-int compar_int(const void * a, const void * b) {\r
-       return (*(uint64_t*)b - *(uint64_t*)a);\r
+// create the intersection (common members) of two sorted lists. Lists are terminated by -1. Result will be in list1. Number of elements is returned.\r
+static uint32_t intersection(uint64_t *list1, uint64_t *list2)\r
+{\r
+       if (list1 == NULL || list2 == NULL) {\r
+               return 0;\r
+       }\r
+       uint64_t *p1, *p2, *p3;\r
+       p1 = p3 = list1;\r
+       p2 = list2;\r
+\r
+       while ( *p1 != -1 && *p2 != -1 ) {\r
+               if (compare_uint64(p1, p2) == 0) {\r
+                       *p3++ = *p1++;\r
+                       p2++;\r
+               }\r
+               else {\r
+                       while (compare_uint64(p1, p2) < 0) ++p1;\r
+                       while (compare_uint64(p1, p2) > 0) ++p2;\r
+               }\r
+       }\r
+       *p3 = -1;\r
+       return p3 - list1;\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
-}\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
-       \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
+// Darkside attack (hf mf mifare)\r
+static uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_info, uint64_t ks_info, uint64_t **keys) {\r
+       struct Crypto1State *states;\r
+       uint32_t i, pos, rr; //nr_diff;\r
+       uint8_t bt, ks3x[8], par[8][8];\r
+       uint64_t key_recovered;\r
+       static uint64_t *keylist;\r
+       rr = 0;\r
+\r
+       // Reset the last three significant bits of the reader nonce\r
+       nr &= 0xffffff1f;\r
+\r
+       for (pos=0; pos<8; pos++) {\r
+               ks3x[7-pos] = (ks_info >> (pos*8)) & 0x0f;\r
+               bt = (par_info >> (pos*8)) & 0xff;\r
+               for (i=0; i<8; i++)     {\r
+                               par[7-pos][i] = (bt >> i) & 0x01;\r

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

-       qsort(our_counts, j, sizeof(countKeys), compar_special_int);\r
-       return (our_counts);\r
+\r
+       states = lfsr_common_prefix(nr, rr, ks3x, par, (par_info == 0));\r
+\r
+       if (states == NULL) {\r
+               *keys = NULL;\r
+               return 0;\r
+       }\r
+\r
+       keylist = (uint64_t*)states;\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
+               keylist[i] = key_recovered;\r
+       }\r
+       keylist[i] = -1;\r
+\r
+       *keys = keylist;\r
+       return i;\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
+\r
+int mfDarkside(uint64_t *key)\r

 {\r
 {\r

-       int i, m, len;\r
-       uint8_t isEOF;\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
+       uint32_t uid = 0;\r
+       uint32_t nt = 0, nr = 0;\r
+       uint64_t par_list = 0, ks_list = 0;\r
+       uint64_t *keylist = NULL, *last_keylist = NULL;\r
+       uint32_t keycount = 0;\r
+       int16_t isOK = 0;\r

 \r
 \r

-       // flush queue\r
-       while (WaitForResponseTimeout(CMD_ACK, 500) != NULL) ;\r
-       \r
-  UsbCommand c = {CMD_MIFARE_NESTED, {blockNo, keyType, trgBlockNo + trgKeyType * 0x100}};\r
-       memcpy(c.d.asBytes, key, 6);\r
-  SendCommand(&c);\r
+       UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}};\r
+\r
+       // message\r
+       printf("-------------------------------------------------------------------------\n");\r
+       printf("Executing command. Expected execution time: 25sec on average\n");\r
+       printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");\r
+       printf("-------------------------------------------------------------------------\n");\r

 \r
 \r

-       PrintAndLog("\n");\r

 \r
 \r

-       // wait cycle\r

        while (true) {\r
        while (true) {\r

-               printf(".");\r
-               if (ukbhit()) {\r
-                       getchar();\r
-                       printf("\naborted via keyboard!\n");\r
-                       break;\r
+               clearCommandBuffer();\r
+               SendCommand(&c);\r
+\r
+               //flush queue\r
+               while (ukbhit()) {\r
+                       int c = getchar(); (void) c;\r

                }\r
 \r
                }\r
 \r

-               resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
-\r
-               if (resp != NULL) {\r
-                       isEOF  = resp->arg[0] & 0xff;\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
+               // wait cycle\r
+               while (true) {\r
+                       printf(".");\r
+                       fflush(stdout);\r
+                       if (ukbhit()) {\r
+                               return -5;\r

                                break;\r
                        }\r
                                break;\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
-\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
+\r
+                       UsbCommand resp;\r
+                       if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {\r
+                               isOK  = resp.arg[0];\r
+                               if (isOK < 0) {\r
+                                       return isOK;\r
+                               }\r
+                               uid = (uint32_t)bytes_to_num(resp.d.asBytes +  0, 4);\r
+                               nt =  (uint32_t)bytes_to_num(resp.d.asBytes +  4, 4);\r
+                               par_list = bytes_to_num(resp.d.asBytes +  8, 8);\r
+                               ks_list = bytes_to_num(resp.d.asBytes +  16, 8);\r
+                               nr = bytes_to_num(resp.d.asBytes + 24, 4);\r
+                               break;\r

                        }\r
                        }\r

+               }\r

 \r
 \r

-                       lenVector += len;\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
+                       PrintAndLog("Attack will take a few seconds longer because we need two consecutive successful runs.");\r
+               }\r
+               c.arg[0] = false;\r
+\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("This is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");\r
+                       continue;\r
+               }\r
+\r
+               qsort(keylist, keycount, sizeof(*keylist), compare_uint64);\r
+               keycount = intersection(last_keylist, keylist);\r
+               if (keycount == 0) {\r
+                       free(last_keylist);\r
+                       last_keylist = keylist;\r
+                       continue;\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
-       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
-       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
-       \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

 \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
+               if (keycount > 1) {\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
+               *key = -1;\r
+               uint8_t keyBlock[USB_CMD_DATA_SIZE];\r
+               int max_keys = USB_CMD_DATA_SIZE/6;\r
+               for (int i = 0; i < keycount; i += max_keys) {\r
+                       int size = keycount - i > max_keys ? max_keys : keycount - i;\r
+                       for (int j = 0; j < size; j++) {\r
+                               if (last_keylist == NULL) {\r
+                                       num_to_bytes(keylist[i*max_keys + j], 6, keyBlock);\r
+                               } else {\r
+                                       num_to_bytes(last_keylist[i*max_keys + j], 6, keyBlock);\r

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

-                       pk->possibleKeys[kcount] = lfsr;\r
-                       kcount++;\r
-                       revstate++;\r
+                       if (!mfCheckKeys(0, 0, false, size, keyBlock, key)) {\r
+                               break;\r
+                       }\r

                }\r
                }\r

-       free(revstate_start);\r
-       revstate_start = NULL;\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
+               if (*key != -1) {\r
+                       free(last_keylist);\r
+                       free(keylist);\r
+                       break;\r
+               } else {\r
+                       PrintAndLog("Authentication failed. Trying again...");\r
+                       free(last_keylist);\r
+                       last_keylist = keylist;\r
+               }\r

        }\r
 \r
        }\r
 \r

-       PrintAndLog("Total keys count:%d", kcount);\r
-       ck = uniqsort(pk->possibleKeys, pk->size);\r
+       return 0;\r
+}\r

 \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
-       }\r

 \r
 \r

-       // finalize\r
-       free(pk->possibleKeys);\r
-       free(pk);\r
-       free(ck);\r
-       free(vector);\r
+int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){\r

 \r
 \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
+       SendCommand(&c);\r
+\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

-int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){\r
-       *key = 0;\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

-  UsbCommand c = {CMD_MIFARE_CHKKEYS, {blockNo, keyType, keycnt}};\r
-       memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\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
+       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
+{\r
+       uint16_t i;\r
+       uint32_t uid;\r
+       UsbCommand resp;\r
+\r
+       StateList_t statelists[2];\r
+       struct Crypto1State *p1, *p2, *p3, *p4;\r
+\r
+       // flush queue\r
+       WaitForResponseTimeout(CMD_ACK, NULL, 100);\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

 \r
 \r

-  SendCommand(&c);\r
+       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
+               return -1;\r
+       }\r
+\r
+       if (resp.arg[0]) {\r
+               return resp.arg[0];  // error during nested\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
+\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
+               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
+       // calc keys\r

 \r
 \r

-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 3000);\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
+       // 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
+       // 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
+               else {\r
+                       while (Compare16Bits(p1, p2) == -1) p1++;\r
+                       while (Compare16Bits(p1, p2) == 1) p2++;\r
+               }\r
+       }\r
+       *(uint64_t*)p3 = -1;\r
+       *(uint64_t*)p4 = -1;\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), compare_uint64);\r
+       qsort(statelists[1].head.keyhead, statelists[1].len, sizeof(uint64_t), compare_uint64);\r
+       statelists[0].len = intersection(statelists[0].head.keyhead, statelists[1].head.keyhead);\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, false, 1, keyBlock, &key64)) {\r
+                       num_to_bytes(key64, 6, resultKey);\r
+                       break;\r
+               }\r
+       }\r
+\r
+       free(statelists[0].head.slhead);\r
+       free(statelists[1].head.slhead);\r

 \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

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


@@ -202,50 +395,33 @@ 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
+       SendCommand(&c);\r

 \r
 \r

-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\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
 int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {\r
        UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};\r
        return 0;\r
 }\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
 \r
 // "MAGIC" CARD\r
 \r
        SendCommand(&c);\r
        return 0;\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
-       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
-       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
+int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {\r

        uint8_t isOK = 0;\r
 \r
        uint8_t isOK = 0;\r
 \r

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


@@ -254,30 +430,144 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, int wantWipe, uint
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

-int mfCGetBlock(uint8_t blockNo, uint8_t *data, 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_CGETBLOCK, {params, 0, 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
        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
-               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
        }\r
        } else {\r
                PrintAndLog("Command execute timeout");\r
                return 1;\r
        }\r

+\r

        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \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
+       int gen = 0, res;\r
+\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
+               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
+       // 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
+\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
+       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

 // SNIFFER\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,19 +585,100 @@ 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
+int isBlockEmpty(int blockN) {\r
+       for (int i = 0; i < 16; i++)\r
+               if (traceCard[blockN * 16 + i] != 0) return 0;\r

 \r
 \r

-       if (traceCrypto1) crypto1_destroy(traceCrypto1);\r
-       traceCrypto1 = NULL;\r
+       return 1;\r
+}\r
+\r
+int isBlockTrailer(int blockN) {\r
+ return ((blockN & 0x03) == 0x03);\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 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
 \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 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
        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


@@ -316,7 +687,7 @@ int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak) {
 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


@@ -324,14 +695,14 @@ 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
 }\r
 \r
 \r
                data[0] = bt;\r
        }\r
        return;\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


@@ -339,18 +710,24 @@ int mfTraceDecode(uint8_t *data_src, int len) {
                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
-               // TODO: check packet crc16!\r
-               \r
+       case TRACE_IDLE:\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
                        traceState = TRACE_AUTH1;\r
                // AUTHENTICATION\r
                if ((len ==4) && ((data[0] == 0x60) || (data[0] == 0x61))) {\r
                        traceState = TRACE_AUTH1;\r


@@ -378,15 +755,20 @@ int mfTraceDecode(uint8_t *data_src, int len) {
                        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

-                       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


@@ -394,8 +776,8 @@ int mfTraceDecode(uint8_t *data_src, int len) {
                }\r
        break;\r
 \r
                }\r
        break;\r
 \r

-       case TRACE_WRITE_OK: \r
-               if ((len == 1) && (data[0] = 0x0a)) {\r
+       case TRACE_WRITE_OK:\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


@@ -405,11 +787,12 @@ int mfTraceDecode(uint8_t *data_src, int len) {
                }\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
                        memcpy(traceCard + traceCurBlock * 16, data, 16);\r
                if (len == 18) {\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


@@ -417,10 +800,9 @@ int mfTraceDecode(uint8_t *data_src, int len) {
                }\r
        break;\r
 \r
                }\r
        break;\r
 \r

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

                if (len == 4) {\r
                        traceState = TRACE_AUTH2;\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


@@ -429,7 +811,7 @@ int mfTraceDecode(uint8_t *data_src, int len) {
                }\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


@@ -442,47 +824,42 @@ int mfTraceDecode(uint8_t *data_src, int len) {
                }\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
                        //  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
                        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
+\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
 \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


@@ -490,7 +867,7 @@ int mfTraceDecode(uint8_t *data_src, int len) {
                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


@@ -498,10 +875,33 @@ int mfTraceDecode(uint8_t *data_src, int len) {
                }\r
        break;\r
 \r
                }\r
        break;\r
 \r

-       default: \r
+       default:\r

                traceState = TRACE_ERROR;\r
                return 1;\r
        }\r
 \r
        return 0;\r
 }\r
                traceState = TRACE_ERROR;\r
                return 1;\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
+       uint32_t ar_enc;  // encrypted reader response\r
+       uint32_t at_enc;  // encrypted tag response\r
+       */\r
+       if (traceCrypto1) {\r
+               crypto1_destroy(traceCrypto1);\r
+       }\r
+       ks2 = ar_enc ^ prng_successor(nt, 64);\r
+       ks3 = at_enc ^ prng_successor(nt, 96);\r
+       traceCrypto1 = lfsr_recovery64(ks2, ks3);\r
+\r
+       mf_crypto1_decrypt(traceCrypto1, data, len, 0);\r
+\r
+       PrintAndLog("Decrypted data: [%s]", sprint_hex(data,len) );\r
+       crypto1_destroy(traceCrypto1);\r
+       return 0;\r
+}\r
+\r