:syntax sugger

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 1b815326e13e26f611a169a059702193455f9b83..d354952b10d8a2ab8d227c7f9b4ed92b4bb4dbe9 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -9,6 +9,8 @@
 //-----------------------------------------------------------------------------\r
 \r
 #include "cmdhfmf.h"\r
 //-----------------------------------------------------------------------------\r
 \r
 #include "cmdhfmf.h"\r

+#include "cmdhfmfhard.h"\r
+#include "nonce2key/nonce2key.h"\r

 \r
 static int CmdHelp(const char *Cmd);\r
 \r
 \r
 static int CmdHelp(const char *Cmd);\r
 \r


@@ -17,45 +19,66 @@ int CmdHF14AMifare(const char *Cmd)
        uint32_t uid = 0;\r
        uint32_t nt = 0, nr = 0;\r
        uint64_t par_list = 0, ks_list = 0, r_key = 0;\r
        uint32_t uid = 0;\r
        uint32_t nt = 0, nr = 0;\r
        uint64_t par_list = 0, ks_list = 0, r_key = 0;\r

-       uint8_t isOK = 0;\r
-       uint8_t keyBlock[8] = {0};\r
-\r
-       UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}};\r
+       int16_t isOK = 0;\r
+       int tmpchar; \r
+       uint8_t blockNo = 0;\r
+       \r
+       char cmdp = param_getchar(Cmd, 0);      \r
+       if ( cmdp == 'H' || cmdp == 'h') {\r
+               PrintAndLog("Usage:  hf mf mifare <block number>");\r
+               PrintAndLog("        sample: hf mf mifare 0");\r
+               return 0;\r
+       }       \r
+       \r
+       blockNo = param_get8(Cmd, 0);\r
+       UsbCommand c = {CMD_READER_MIFARE, {true, blockNo, 0}};\r

 \r
        // message\r
        printf("-------------------------------------------------------------------------\n");\r
        printf("Executing command. Expected execution time: 25sec on average  :-)\n");\r
 \r
        // message\r
        printf("-------------------------------------------------------------------------\n");\r
        printf("Executing command. Expected execution time: 25sec on average  :-)\n");\r

-       printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\r
+       printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");\r

        printf("-------------------------------------------------------------------------\n");\r
 \r
        printf("-------------------------------------------------------------------------\n");\r
 \r

+       clock_t t1 = clock();\r

        \r
 start:\r
     clearCommandBuffer();\r
     SendCommand(&c);\r
        \r
        //flush queue\r
        \r
 start:\r
     clearCommandBuffer();\r
     SendCommand(&c);\r
        \r
        //flush queue\r

-       while (ukbhit())        getchar();\r
+       while (ukbhit()) {\r
+               tmpchar = getchar();\r
+               (void)tmpchar;\r
+       }\r

 \r
        // wait cycle\r
        while (true) {\r
         printf(".");\r
                fflush(stdout);\r
                if (ukbhit()) {\r
 \r
        // wait cycle\r
        while (true) {\r
         printf(".");\r
                fflush(stdout);\r
                if (ukbhit()) {\r

-                       getchar();\r
+                       tmpchar = getchar();\r
+                       (void)tmpchar;\r

                        printf("\naborted via keyboard!\n");\r
                        break;\r
                }\r
                \r
                UsbCommand resp;\r
                        printf("\naborted via keyboard!\n");\r
                        break;\r
                }\r
                \r
                UsbCommand resp;\r

-               if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {\r
-                       isOK  = resp.arg[0] & 0xff;\r
+               if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
+                       isOK  = resp.arg[0];\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
                        printf("\n\n");\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
                        printf("\n\n");\r

-                       if (!isOK) PrintAndLog("Proxmark can't get statistic info. Execution aborted.\n");\r
+                       switch (isOK) {\r
+                               case -1 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
+                               case -2 : PrintAndLog("Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests).\n"); break;\r
+                               case -3 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator is not predictable).\n"); break;\r
+                               case -4 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");\r
+                                                 PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour.\n"); break;\r
+                               default: ;\r
+                       }\r

                        break;\r
                }\r
        }       \r
                        break;\r
                }\r
        }       \r


@@ -69,25 +92,16 @@ start:
        if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {\r
                isOK = 2;\r
                PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);    \r
        if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {\r
                isOK = 2;\r
                PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);    \r

-       } else {\r
-               printf("------------------------------------------------------------------\n");\r
-               PrintAndLog("Key found:%012"llx" \n", r_key);\r
-\r
-               num_to_bytes(r_key, 6, keyBlock);\r
-               isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);\r
-       }\r
-       \r
-       if (!isOK) \r
-               PrintAndLog("Found valid key:%012"llx, r_key);\r
-       else\r
-       {\r
-               if (isOK != 2) PrintAndLog("Found invalid key. ");      \r

                PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");\r
                c.arg[0] = false;\r
                goto start;\r
                PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");\r
                c.arg[0] = false;\r
                goto start;\r

+       } else {\r
+               PrintAndLog("Found valid key: %012"llx" \n", r_key);\r

        }\r
        \r
        }\r
        \r

-       PrintAndLog("");\r
+       t1 = clock() - t1;\r
+       if ( t1 > 0 )\r
+               PrintAndLog("Time in darkside: %.0f ticks - %4.2f sec\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC);\r

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


@@ -124,10 +138,11 @@ int CmdHF14AMfWrBl(const char *Cmd)
        PrintAndLog("--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
        PrintAndLog("--data: %s", sprint_hex(bldata, 16));\r
        \r
        PrintAndLog("--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
        PrintAndLog("--data: %s", sprint_hex(bldata, 16));\r
        \r

-  UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};\r
+       UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};\r

        memcpy(c.d.asBytes, key, 6);\r
        memcpy(c.d.asBytes + 10, bldata, 16);\r
        memcpy(c.d.asBytes, key, 6);\r
        memcpy(c.d.asBytes + 10, bldata, 16);\r

-  SendCommand(&c);\r
+       clearCommandBuffer();\r
+       SendCommand(&c);\r

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


@@ -168,9 +183,10 @@ int CmdHF14AMfRdBl(const char *Cmd)
        }\r
        PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
        \r
        }\r
        PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
        \r

-  UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
+       UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r

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

-  SendCommand(&c);\r
+       clearCommandBuffer();\r
+       SendCommand(&c);\r

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


@@ -223,6 +239,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
        \r
        UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r
        \r
        UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r

+       clearCommandBuffer();\r

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


@@ -303,8 +320,10 @@ int CmdHF14AMfDump(const char *Cmd)
        }\r
        \r
        // Read keys A from file\r
        }\r
        \r
        // Read keys A from file\r

+       size_t bytes_read;\r

        for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
        for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r

-               if (fread( keyA[sectorNo], 1, 6, fin ) == 0) {\r
+               bytes_read = fread( keyA[sectorNo], 1, 6, fin );\r
+               if ( bytes_read == 0) {\r

                        PrintAndLog("File reading error.");\r
                        fclose(fin);\r
                        return 2;\r
                        PrintAndLog("File reading error.");\r
                        fclose(fin);\r
                        return 2;\r


@@ -313,7 +332,8 @@ int CmdHF14AMfDump(const char *Cmd)
        \r
        // Read keys B from file\r
        for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
        \r
        // Read keys B from file\r
        for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r

-               if (fread( keyB[sectorNo], 1, 6, fin ) == 0) {\r
+               bytes_read = fread( keyB[sectorNo], 1, 6, fin );\r
+               if ( bytes_read == 0) {\r

                        PrintAndLog("File reading error.");\r
                        fclose(fin);\r
                        return 2;\r
                        PrintAndLog("File reading error.");\r
                        fclose(fin);\r
                        return 2;\r


@@ -329,6 +349,7 @@ int CmdHF14AMfDump(const char *Cmd)
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};\r
                memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};\r
                memcpy(c.d.asBytes, keyA[sectorNo], 6);\r

+               clearCommandBuffer();\r

                SendCommand(&c);\r
 \r
                if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
                SendCommand(&c);\r
 \r
                if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r


@@ -363,6 +384,7 @@ int CmdHF14AMfDump(const char *Cmd)
                        if (blockNo == NumBlocksPerSector(sectorNo) - 1) {              // sector trailer. At least the Access Conditions can always be read with key A. \r
                                UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
                                memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
                        if (blockNo == NumBlocksPerSector(sectorNo) - 1) {              // sector trailer. At least the Access Conditions can always be read with key A. \r
                                UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
                                memcpy(c.d.asBytes, keyA[sectorNo], 6);\r

+                               clearCommandBuffer();\r

                                SendCommand(&c);\r
                                received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                        } else {                                                                                                // data block. Check if it can be read with key A or key B\r
                                SendCommand(&c);\r
                                received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                        } else {                                                                                                // data block. Check if it can be read with key A or key B\r


@@ -378,6 +400,7 @@ int CmdHF14AMfDump(const char *Cmd)
                                } else {                                                                                                                                                                // key A would work\r
                                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
                                        memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
                                } else {                                                                                                                                                                // key A would work\r
                                        UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r
                                        memcpy(c.d.asBytes, keyA[sectorNo], 6);\r

+                                       clearCommandBuffer();\r

                                        SendCommand(&c);\r
                                        received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                }\r
                                        SendCommand(&c);\r
                                        received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                }\r


@@ -467,17 +490,19 @@ int CmdHF14AMfRestore(const char *Cmd)
                return 1;\r
        }\r
        \r
                return 1;\r
        }\r
        \r

+       size_t bytes_read;\r

        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r

-               if (fread(keyA[sectorNo], 1, 6, fkeys) == 0) {\r
+               bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );\r
+               if ( bytes_read == 0) {\r

                        PrintAndLog("File reading error (dumpkeys.bin).");\r
                        PrintAndLog("File reading error (dumpkeys.bin).");\r

-\r

                        fclose(fkeys);\r
                        return 2;\r
                }\r
        }\r
 \r
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                        fclose(fkeys);\r
                        return 2;\r
                }\r
        }\r
 \r
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r

-               if (fread(keyB[sectorNo], 1, 6, fkeys) == 0) {\r
+               bytes_read = fread( keyB[sectorNo], 1, 6, fkeys );\r
+               if ( bytes_read == 0) {\r

                        PrintAndLog("File reading error (dumpkeys.bin).");\r
                        fclose(fkeys);\r
                        return 2;\r
                        PrintAndLog("File reading error (dumpkeys.bin).");\r
                        fclose(fkeys);\r
                        return 2;\r


@@ -495,9 +520,9 @@ int CmdHF14AMfRestore(const char *Cmd)
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                for(blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r
                        UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};\r
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                for(blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r
                        UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};\r

-                       memcpy(c.d.asBytes, key, 6);\r
-                       \r
-                       if (fread(bldata, 1, 16, fdump) == 0) {\r
+                       memcpy(c.d.asBytes, key, 6);                    \r
+                       bytes_read = fread(bldata, 1, 16, fdump);\r
+                       if ( bytes_read == 0) {\r

                                PrintAndLog("File reading error (dumpdata.bin).");\r
                                fclose(fdump);\r
                                return 2;\r
                                PrintAndLog("File reading error (dumpdata.bin).");\r
                                fclose(fdump);\r
                                return 2;\r


@@ -521,6 +546,7 @@ int CmdHF14AMfRestore(const char *Cmd)
                        PrintAndLog("Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));\r
                        \r
                        memcpy(c.d.asBytes + 10, bldata, 16);\r
                        PrintAndLog("Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));\r
                        \r
                        memcpy(c.d.asBytes + 10, bldata, 16);\r

+                       clearCommandBuffer();\r

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


@@ -547,7 +573,7 @@ int CmdHF14AMfNested(const char *Cmd)
        uint8_t trgKeyType = 0;\r
        uint8_t SectorsCnt = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
        uint8_t trgKeyType = 0;\r
        uint8_t SectorsCnt = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r

-       uint8_t keyBlock[14*6];\r
+       uint8_t keyBlock[6*6];\r

        uint64_t key64 = 0;\r
        bool transferToEml = false;\r
        \r
        uint64_t key64 = 0;\r
        bool transferToEml = false;\r
        \r


@@ -621,38 +647,38 @@ int CmdHF14AMfNested(const char *Cmd)
        transferToEml |= (ctmp == 'd' || ctmp == 'D');\r
        \r
        if (cmdp == 'o') {\r
        transferToEml |= (ctmp == 'd' || ctmp == 'D');\r
        \r
        if (cmdp == 'o') {\r

-               PrintAndLog("--target block no:%3d, target key type:%c ", trgBlockNo, trgKeyType?'B':'A');\r
-               if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true)) {\r
-                       PrintAndLog("Nested error.");\r
-                       return 2;\r
-               }\r
-               key64 = bytes_to_num(keyBlock, 6);\r
-               if (key64) {\r
-                       PrintAndLog("Found valid key:%012"llx, key64);\r
-\r
-                       // transfer key to the emulator\r
-                       if (transferToEml) {\r
-                               uint8_t sectortrailer;\r
-                               if (trgBlockNo < 32*4) {        // 4 block sector\r
-                                       sectortrailer = (trgBlockNo & 0x03) + 3;\r
-                               } else {                                        // 16 block sector\r
-                                       sectortrailer = (trgBlockNo & 0x0f) + 15;\r
+               int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);\r
+               switch (isOK) {\r
+                       case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r
+                       case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
+                       case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;\r
+                       case -4 : PrintAndLog("No valid key found"); break;\r
+                       case -5 : \r
+                               key64 = bytes_to_num(keyBlock, 6);\r
+\r
+                               // transfer key to the emulator\r
+                               if (transferToEml) {\r
+                                       uint8_t sectortrailer;\r
+                                       if (trgBlockNo < 32*4) {        // 4 block sector\r
+                                               sectortrailer = (trgBlockNo & 0x03) + 3;\r
+                                       } else {                                        // 16 block sector\r
+                                               sectortrailer = (trgBlockNo & 0x0f) + 15;\r
+                                       }\r
+                                       mfEmlGetMem(keyBlock, sectortrailer, 1);\r
+                       \r
+                                       if (!trgKeyType)\r
+                                               num_to_bytes(key64, 6, keyBlock);\r
+                                       else\r
+                                               num_to_bytes(key64, 6, &keyBlock[10]);\r
+                                       mfEmlSetMem(keyBlock, sectortrailer, 1);                \r

                                }\r
                                }\r

-                               mfEmlGetMem(keyBlock, sectortrailer, 1);\r
-               \r
-                               if (!trgKeyType)\r
-                                       num_to_bytes(key64, 6, keyBlock);\r
-                               else\r
-                                       num_to_bytes(key64, 6, &keyBlock[10]);\r
-                               mfEmlSetMem(keyBlock, sectortrailer, 1);                \r
-                       }\r
-               } else {\r
-                       PrintAndLog("No valid key found");\r
+                               return 0;\r
+                       default : PrintAndLog("Unknown Error.\n");\r

                }\r
                }\r

+               return 2;\r

        }\r
        else { // ------------------------------------  multiple sectors working\r
        }\r
        else { // ------------------------------------  multiple sectors working\r

-               clock_t time1;\r
-               time1 = clock();\r
+               clock_t t1 = clock();\r

 \r
                e_sector = calloc(SectorsCnt, sizeof(sector));\r
                if (e_sector == NULL) return 1;\r
 \r
                e_sector = calloc(SectorsCnt, sizeof(sector));\r
                if (e_sector == NULL) return 1;\r


@@ -664,70 +690,96 @@ int CmdHF14AMfNested(const char *Cmd)
                num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 3 * 6));\r
                num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 4 * 6));\r
                num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 5 * 6));\r
                num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 3 * 6));\r
                num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 4 * 6));\r
                num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 5 * 6));\r

-               num_to_bytes(0x4d3a99c351dd, 6, (uint8_t*)(keyBlock + 6 * 6));\r
-               num_to_bytes(0x1a982c7e459a, 6, (uint8_t*)(keyBlock + 7 * 6));\r
-               num_to_bytes(0xd3f7d3f7d3f7, 6, (uint8_t*)(keyBlock + 8 * 6));\r
-               num_to_bytes(0x714c5c886e97, 6, (uint8_t*)(keyBlock + 9 * 6));\r
-               num_to_bytes(0x587ee5f9350f, 6, (uint8_t*)(keyBlock + 10 * 6));\r
-               num_to_bytes(0xa0478cc39091, 6, (uint8_t*)(keyBlock + 11 * 6));\r
-               num_to_bytes(0x533cb6c723f6, 6, (uint8_t*)(keyBlock + 12 * 6));\r
-               num_to_bytes(0x8fd0a4f256e9, 6, (uint8_t*)(keyBlock + 13 * 6));\r

 \r
                PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r
                for (i = 0; i < SectorsCnt; i++) {\r
                        for (j = 0; j < 2; j++) {\r
                                if (e_sector[i].foundKey[j]) continue;\r
                                \r
 \r
                PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r
                for (i = 0; i < SectorsCnt; i++) {\r
                        for (j = 0; j < 2; j++) {\r
                                if (e_sector[i].foundKey[j]) continue;\r
                                \r

-                               res = mfCheckKeys(FirstBlockOfSector(i), j, 6, keyBlock, &key64);\r
+                               res = mfCheckKeys(FirstBlockOfSector(i), j, true, 6, keyBlock, &key64);\r

                                \r
                                if (!res) {\r
                                        e_sector[i].Key[j] = key64;\r
                                \r
                                if (!res) {\r
                                        e_sector[i].Key[j] = key64;\r

-                                       e_sector[i].foundKey[j] = 1;\r
+                                       e_sector[i].foundKey[j] = TRUE;\r

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

+               clock_t t2 = clock() - t1;\r
+               if ( t2 > 0 )\r
+                       PrintAndLog("Time to check 6 known keys: %.0f ticks %4.2f sec", (float)t2, ((float)t2)/CLOCKS_PER_SEC);\r
+       \r

                \r
                // nested sectors\r
                iterations = 0;\r
                \r
                // nested sectors\r
                iterations = 0;\r

-               PrintAndLog("nested...");\r
+               PrintAndLog("enter nested...");\r

                bool calibrate = true;\r
                for (i = 0; i < NESTED_SECTOR_RETRY; i++) {\r
                bool calibrate = true;\r
                for (i = 0; i < NESTED_SECTOR_RETRY; i++) {\r

-                       for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
-                               for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { \r
+                       for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {\r
+                               for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) { \r
+\r

                                        if (e_sector[sectorNo].foundKey[trgKeyType]) continue;\r
                                        if (e_sector[sectorNo].foundKey[trgKeyType]) continue;\r

-                                       PrintAndLog("-----------------------------------------------");\r
-                                       if(mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate)) {\r
-                                               PrintAndLog("Nested error.\n");\r
-                                               free(e_sector);\r
-                                               return 2;                                       }\r
-                                       else {\r
-                                               calibrate = false;\r
-                                       }\r

                                        \r
                                        \r

-                                       iterations++;\r
-\r
-                                       key64 = bytes_to_num(keyBlock, 6);\r
-                                       if (key64) {\r
-                                               PrintAndLog("Found valid key:%012"llx, key64);\r
-                                               e_sector[sectorNo].foundKey[trgKeyType] = 1;\r
-                                               e_sector[sectorNo].Key[trgKeyType] = key64;\r
+                                       int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);\r
+                                       switch (isOK) {\r
+                                               case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r
+                                               case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
+                                               case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;\r
+                                               case -4 : //key not found\r
+                                                       calibrate = false;\r
+                                                       iterations++;\r
+                                                       continue; \r
+                                               case -5 :\r
+                                                       calibrate = false;\r
+                                                       iterations++;\r
+                                                       e_sector[sectorNo].foundKey[trgKeyType] = 1;\r
+                                                       e_sector[sectorNo].Key[trgKeyType] = bytes_to_num(keyBlock, 6);\r
+                                                       continue;\r
+                                                       \r
+                                               default : PrintAndLog("Unknown Error.\n");\r

                                        }\r
                                        }\r

+                                       free(e_sector);\r
+                                       return 2;\r

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

-               printf("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/iterations/CLOCKS_PER_SEC);\r
-               \r
-               PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);\r
-               //print them\r
-               PrintAndLog("|---|----------------|---|----------------|---|");\r
-               PrintAndLog("|sec|key A           |res|key B           |res|");\r
-               PrintAndLog("|---|----------------|---|----------------|---|");\r
+               // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?\r
+               PrintAndLog("trying to read key B...");\r

                for (i = 0; i < SectorsCnt; i++) {\r
                for (i = 0; i < SectorsCnt; i++) {\r

-                       PrintAndLog("|%03d|  %012"llx"  | %d |  %012"llx"  | %d |", i,\r
-                               e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);\r
+                       // KEY A  but not KEY B\r
+                       if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {\r
+                               \r
+                               uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);\r
+                               \r
+                               PrintAndLog("Reading block %d", sectrail);\r
+                                                       \r
+                               UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};\r
+                               num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A\r
+                               clearCommandBuffer();\r
+                               SendCommand(&c);\r
+\r
+                               UsbCommand resp;\r
+                               if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;\r
+                                       \r
+                               uint8_t isOK  = resp.arg[0] & 0xff;\r
+                               if (!isOK) continue;\r
+\r
+                               uint8_t *data = resp.d.asBytes;\r
+                               key64 = bytes_to_num(data+10, 6);\r
+                               if (key64) {\r
+                                       PrintAndLog("Data:%s", sprint_hex(data+10, 6));\r
+                                       e_sector[i].foundKey[1] = 1;\r
+                                       e_sector[i].Key[1] = key64;\r
+                               }\r
+                       }\r

                }\r
                }\r

-               PrintAndLog("|---|----------------|---|----------------|---|");\r
+               \r
+               t1 = clock() - t1;\r
+               if ( t1 > 0 )\r
+                       PrintAndLog("Time in nested: %.0f ticks %4.2f sec (%4.2f sec per key)\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/iterations/CLOCKS_PER_SEC);\r
+               \r
+               //print them\r
+               printKeyTable( SectorsCnt, e_sector );\r

                \r
                // transfer them to the emulator\r
                if (transferToEml) {\r
                \r
                // transfer them to the emulator\r
                if (transferToEml) {\r


@@ -775,6 +827,122 @@ int CmdHF14AMfNested(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

+int CmdHF14AMfNestedHard(const char *Cmd)\r
+{\r
+       uint8_t blockNo = 0;\r
+       uint8_t keyType = 0;\r
+       uint8_t trgBlockNo = 0;\r
+       uint8_t trgKeyType = 0;\r
+       uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
+       uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};\r
+       \r
+       char ctmp;\r
+       ctmp = param_getchar(Cmd, 0);\r
+\r
+       if (ctmp != 'R' && ctmp != 'r' && ctmp != 'T' && ctmp != 't' && strlen(Cmd) < 20) {\r
+               PrintAndLog("Usage:");\r
+               PrintAndLog("      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");\r
+               PrintAndLog("                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");\r
+               PrintAndLog("  or  hf mf hardnested r [known target key]");\r
+               PrintAndLog(" ");\r
+               PrintAndLog("Options: ");\r
+               PrintAndLog("      w: Acquire nonces and write them to binary file nonces.bin");\r
+               PrintAndLog("      s: Slower acquisition (required by some non standard cards)");\r
+               PrintAndLog("      r: Read nonces.bin and start attack");\r
+               PrintAndLog(" ");\r
+               PrintAndLog("      sample1: hf mf hardnested 0 A FFFFFFFFFFFF 4 A");\r
+               PrintAndLog("      sample2: hf mf hardnested 0 A FFFFFFFFFFFF 4 A w");\r
+               PrintAndLog("      sample3: hf mf hardnested 0 A FFFFFFFFFFFF 4 A w s");\r
+               PrintAndLog("      sample4: hf mf hardnested r");\r
+               PrintAndLog(" ");\r
+               PrintAndLog("Add the known target key to check if it is present in the remaining key space:");\r
+               PrintAndLog("      sample5: hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");\r
+               return 0;\r
+       }       \r
+       \r
+       bool know_target_key = false;\r
+       bool nonce_file_read = false;\r
+       bool nonce_file_write = false;\r
+       bool slow = false;\r
+       int tests = 0;\r
+       \r
+       \r
+       if (ctmp == 'R' || ctmp == 'r') {\r
+               nonce_file_read = true;\r
+               if (!param_gethex(Cmd, 1, trgkey, 12)) {\r
+                       know_target_key = true;\r
+               }\r
+       } else if (ctmp == 'T' || ctmp == 't') {\r
+               tests = param_get32ex(Cmd, 1, 100, 10);\r
+       } else {\r
+               blockNo = param_get8(Cmd, 0);\r
+               ctmp = param_getchar(Cmd, 1);\r
+               if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
+                       PrintAndLog("Key type must be A or B");\r
+                       return 1;\r
+               }\r
+               if (ctmp != 'A' && ctmp != 'a') { \r
+                       keyType = 1;\r
+               }\r
+               \r
+               if (param_gethex(Cmd, 2, key, 12)) {\r
+                       PrintAndLog("Key must include 12 HEX symbols");\r
+                       return 1;\r
+               }\r
+               \r
+               trgBlockNo = param_get8(Cmd, 3);\r
+               ctmp = param_getchar(Cmd, 4);\r
+               if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
+                       PrintAndLog("Target key type must be A or B");\r
+                       return 1;\r
+               }\r
+               if (ctmp != 'A' && ctmp != 'a') {\r
+                       trgKeyType = 1;\r
+               }\r
+\r
+               uint16_t i = 5;\r
+\r
+               if (!param_gethex(Cmd, 5, trgkey, 12)) {\r
+                       know_target_key = true;\r
+                       i++;\r
+               }\r
+\r
+               while ((ctmp = param_getchar(Cmd, i))) {\r
+                       if (ctmp == 's' || ctmp == 'S') {\r
+                               slow = true;\r
+                       } else if (ctmp == 'w' || ctmp == 'W') {\r
+                               nonce_file_write = true;\r
+                       } else {\r
+                               PrintAndLog("Possible options are w and/or s");\r
+                               return 1;\r
+                       }\r
+                       i++;\r
+               }\r
+       }\r
+\r
+       PrintAndLog("--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ", \r
+                       trgBlockNo, \r
+                       trgKeyType?'B':'A', \r
+                       trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],\r
+                       know_target_key?"":" (not set)",\r
+                       nonce_file_write?"write":nonce_file_read?"read":"none",\r
+                       slow?"Yes":"No",\r
+                       tests);\r
+\r
+       int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key?trgkey:NULL, nonce_file_read, nonce_file_write, slow, tests);\r
+\r
+       if (isOK) {\r
+               switch (isOK) {\r
+                       case 1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r
+                       case 2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
+                       default : break;\r
+               }\r
+               return 2;\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r

 int CmdHF14AMfChk(const char *Cmd)\r
 {\r
        if (strlen(Cmd)<3) {\r
 int CmdHF14AMfChk(const char *Cmd)\r
 {\r
        if (strlen(Cmd)<3) {\r


@@ -795,6 +963,8 @@ int CmdHF14AMfChk(const char *Cmd)
        uint8_t *keyBlock = NULL, *p;\r
        uint8_t stKeyBlock = 20;\r
        \r
        uint8_t *keyBlock = NULL, *p;\r
        uint8_t stKeyBlock = 20;\r
        \r

+       sector *e_sector = NULL;\r
+       \r

        int i, res;\r
        int     keycnt = 0;\r
        char ctmp       = 0x00;\r
        int i, res;\r
        int     keycnt = 0;\r
        char ctmp       = 0x00;\r


@@ -803,14 +973,15 @@ int CmdHF14AMfChk(const char *Cmd)
        uint8_t keyType = 0;\r
        uint64_t key64 = 0;\r
        \r
        uint8_t keyType = 0;\r
        uint64_t key64 = 0;\r
        \r

+       uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r
+               \r

        int transferToEml = 0;\r
        int createDumpFile = 0;\r
 \r
        keyBlock = calloc(stKeyBlock, 6);\r
        if (keyBlock == NULL) return 1;\r
 \r
        int transferToEml = 0;\r
        int createDumpFile = 0;\r
 \r
        keyBlock = calloc(stKeyBlock, 6);\r
        if (keyBlock == NULL) return 1;\r
 \r

-       uint64_t defaultKeys[] =\r
-       {\r
+       uint64_t defaultKeys[] = {\r

                0xffffffffffff, // Default key (first key used by program if no user defined key)\r
                0x000000000000, // Blank key\r
                0xa0a1a2a3a4a5, // NFCForum MAD key\r
                0xffffffffffff, // Default key (first key used by program if no user defined key)\r
                0x000000000000, // Blank key\r
                0xa0a1a2a3a4a5, // NFCForum MAD key\r


@@ -828,9 +999,8 @@ int CmdHF14AMfChk(const char *Cmd)
        int defaultKeysSize = sizeof(defaultKeys) / sizeof(uint64_t);\r
 \r
        for (int defaultKeyCounter = 0; defaultKeyCounter < defaultKeysSize; defaultKeyCounter++)\r
        int defaultKeysSize = sizeof(defaultKeys) / sizeof(uint64_t);\r
 \r
        for (int defaultKeyCounter = 0; defaultKeyCounter < defaultKeysSize; defaultKeyCounter++)\r

-       {\r

                num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));\r
                num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));\r

-       }\r
+\r

        \r
        if (param_getchar(Cmd, 0)=='*') {\r
                blockNo = 3;\r
        \r
        if (param_getchar(Cmd, 0)=='*') {\r
                blockNo = 3;\r


@@ -841,9 +1011,9 @@ int CmdHF14AMfChk(const char *Cmd)
                        case '4': SectorsCnt = 40; break;\r
                        default:  SectorsCnt = 16;\r
                }\r
                        case '4': SectorsCnt = 40; break;\r
                        default:  SectorsCnt = 16;\r
                }\r

-       }\r
-       else\r
+       } else {\r

                blockNo = param_get8(Cmd, 0);\r
                blockNo = param_get8(Cmd, 0);\r

+       }\r

        \r
        ctmp = param_getchar(Cmd, 1);\r
        switch (ctmp) { \r
        \r
        ctmp = param_getchar(Cmd, 1);\r
        switch (ctmp) { \r


@@ -858,6 +1028,7 @@ int CmdHF14AMfChk(const char *Cmd)
                break;\r
        default:\r
                PrintAndLog("Key type must be A , B or ?");\r
                break;\r
        default:\r
                PrintAndLog("Key type must be A , B or ?");\r

+               free(keyBlock);\r

                return 1;\r
        };\r
        \r
                return 1;\r
        };\r
        \r


@@ -876,7 +1047,7 @@ int CmdHF14AMfChk(const char *Cmd)
                                }\r
                                keyBlock = p;\r
                        }\r
                                }\r
                                keyBlock = p;\r
                        }\r

-                       PrintAndLog("chk key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r
+                       PrintAndLog("check key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r

                        (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
                        (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],     (keyBlock + 6*keycnt)[5], 6);\r
                        keycnt++;\r
                        (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
                        (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],     (keyBlock + 6*keycnt)[5], 6);\r
                        keycnt++;\r


@@ -909,13 +1080,14 @@ int CmdHF14AMfChk(const char *Cmd)
                                                if (!p) {\r
                                                        PrintAndLog("Cannot allocate memory for defKeys");\r
                                                        free(keyBlock);\r
                                                if (!p) {\r
                                                        PrintAndLog("Cannot allocate memory for defKeys");\r
                                                        free(keyBlock);\r

+                                                       fclose(f);\r

                                                        return 2;\r
                                                }\r
                                                keyBlock = p;\r
                                        }\r
                                        memset(keyBlock + 6 * keycnt, 0, 6);\r
                                        num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);\r
                                                        return 2;\r
                                                }\r
                                                keyBlock = p;\r
                                        }\r
                                        memset(keyBlock + 6 * keycnt, 0, 6);\r
                                        num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);\r

-                                       PrintAndLog("chk custom key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
+                                       PrintAndLog("check custom key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r

                                        keycnt++;\r
                                        memset(buf, 0, sizeof(buf));\r
                                }\r
                                        keycnt++;\r
                                        memset(buf, 0, sizeof(buf));\r
                                }\r


@@ -932,88 +1104,152 @@ int CmdHF14AMfChk(const char *Cmd)
        if (keycnt == 0) {\r
                PrintAndLog("No key specified, trying default keys");\r
                for (;keycnt < defaultKeysSize; keycnt++)\r
        if (keycnt == 0) {\r
                PrintAndLog("No key specified, trying default keys");\r
                for (;keycnt < defaultKeysSize; keycnt++)\r

-                       PrintAndLog("chk default key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r
+                       PrintAndLog("check default key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r

                                (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
                                (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],     (keyBlock + 6*keycnt)[5], 6);\r
        }\r
        \r
        // initialize storage for found keys\r
                                (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r
                                (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],     (keyBlock + 6*keycnt)[5], 6);\r
        }\r
        \r
        // initialize storage for found keys\r

-       bool validKey[2][40];\r
-       uint8_t foundKey[2][40][6];\r
-       for (uint16_t t = 0; t < 2; t++) {\r
-               for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
-                       validKey[t][sectorNo] = false;\r
-                       for (uint16_t i = 0; i < 6; i++) {\r
-                               foundKey[t][sectorNo][i] = 0xff;\r
-                       }\r
-               }\r
+       e_sector = calloc(SectorsCnt, sizeof(sector));\r
+       if (e_sector == NULL) {\r
+               free(keyBlock);\r
+               return 1;\r

        }\r
        }\r

+\r
+       uint8_t trgKeyType = 0;\r
+       \r
+       // time\r
+       clock_t t1 = clock();\r

        \r
        \r

-       for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) {\r
-               int b=blockNo;\r
+       // check keys.\r
+       for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) {\r
+               int b = blockNo;\r

                for (int i = 0; i < SectorsCnt; ++i) {\r
                for (int i = 0; i < SectorsCnt; ++i) {\r

-                       PrintAndLog("--sector:%2d, block:%3d, key type:%C, key count:%2d ", i, b, t?'B':'A', keycnt);\r
-                       uint32_t max_keys = keycnt>USB_CMD_DATA_SIZE/6?USB_CMD_DATA_SIZE/6:keycnt;\r
-                       for (uint32_t c = 0; c < keycnt; c+=max_keys) {\r
-                               uint32_t size = keycnt-c>max_keys?max_keys:keycnt-c;\r
-                               res = mfCheckKeys(b, t, size, &keyBlock[6*c], &key64);\r
-                               if (res != 1) {\r
-                                       if (!res) {\r
-                                               PrintAndLog("Found valid key:[%012"llx"]",key64);\r
-                                               num_to_bytes(key64, 6, foundKey[t][i]);\r
-                                               validKey[t][i] = true;\r
-                                       } \r
-                               } else {\r
-                                       PrintAndLog("Command execute timeout");\r
+                       \r
+                       // skip already found keys.\r
+                       if (e_sector[i].foundKey[trgKeyType]) continue;\r
+                       \r
+                       uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;\r
+                       \r
+                       for (uint32_t c = 0; c < keycnt; c += max_keys) {\r
+                               \r
+                               uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;\r
+                               \r
+                               res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);\r
+                               if (!res) {\r
+                                       PrintAndLog("Sector:%3d Block:%3d, key type: %C  -- Found key [%012"llx"]", i, b, trgKeyType ? 'B':'A', key64);\r
+                                                                                \r
+                                       e_sector[i].Key[trgKeyType] = key64;\r
+                                       e_sector[i].foundKey[trgKeyType] = TRUE;\r
+                                       break;\r
+                               } else {                                        \r
+                                       e_sector[i].Key[trgKeyType] = 0xffffffffffff;\r
+                                       e_sector[i].foundKey[trgKeyType] = FALSE;\r

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

-                       b<127?(b+=4):(b+=16);   \r
+                       b < 127 ? ( b +=4 ) : ( b += 16 );      \r

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

+       // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?\r
+       PrintAndLog("testing to read B...");\r
+       for (i = 0; i < SectorsCnt; i++) {\r
+               // KEY A  but not KEY B\r
+               if ( e_sector[i].foundKey[0] && !e_sector[i].foundKey[1] ) {\r
+                                               \r
+                       uint8_t sectrail = (FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);\r
+                       \r
+                       PrintAndLog("Reading block %d", sectrail);\r
+                       \r
+                       UsbCommand c = {CMD_MIFARE_READBL, {sectrail, 0, 0}};\r
+                       num_to_bytes(e_sector[i].Key[0], 6, c.d.asBytes); // KEY A\r
+                       clearCommandBuffer();\r
+                       SendCommand(&c);\r

 \r
 \r

-       if (transferToEml) {\r
-               uint8_t block[16];\r
-               for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
-                       if (validKey[0][sectorNo] || validKey[1][sectorNo]) {\r
-                               mfEmlGetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r
-                               for (uint16_t t = 0; t < 2; t++) {\r
-                                       if (validKey[t][sectorNo]) {\r
-                                               memcpy(block + t*10, foundKey[t][sectorNo], 6);\r
-                                       }\r
-                               }\r
-                               mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r
+                       UsbCommand resp;\r
+                       if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;\r
+                               \r
+                       uint8_t isOK  = resp.arg[0] & 0xff;\r
+                       if (!isOK) continue;\r
+\r
+                       uint8_t *data = resp.d.asBytes;\r
+                       key64 = bytes_to_num(data+10, 6);\r
+                       if (key64) {\r
+                               PrintAndLog("Data:%s", sprint_hex(data+10, 6));\r
+                               e_sector[i].foundKey[1] = 1;\r
+                               e_sector[i].Key[1] = key64;\r

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

-               PrintAndLog("Found keys have been transferred to the emulator memory");\r

        }\r
        }\r

+       \r
+       t1 = clock() - t1;\r
+       if ( t1 > 0 )\r
+               printf("Time in checkkeys: %.0f ticks  %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/keycnt/CLOCKS_PER_SEC);\r

 \r
 \r

+       //print them\r
+       printKeyTable( SectorsCnt, e_sector );\r
+       \r
+       if (transferToEml) {\r
+               uint8_t block[16] = {0x00};\r
+               for (uint8_t i = 0; i < SectorsCnt; ++i ) {\r
+                       mfEmlGetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);\r
+                       if (e_sector[i].foundKey[0])\r
+                               num_to_bytes(e_sector[i].Key[0], 6, block);\r
+                       if (e_sector[i].foundKey[1])\r
+                               num_to_bytes(e_sector[i].Key[1], 6, block+10);\r
+                       mfEmlSetMem(block, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);\r
+               }\r
+               PrintAndLog("Found keys have been transferred to the emulator memory");\r
+       }\r
+       \r

        if (createDumpFile) {\r
                FILE *fkeys = fopen("dumpkeys.bin","wb");\r
                if (fkeys == NULL) { \r
                        PrintAndLog("Could not create file dumpkeys.bin");\r
                        free(keyBlock);\r
        if (createDumpFile) {\r
                FILE *fkeys = fopen("dumpkeys.bin","wb");\r
                if (fkeys == NULL) { \r
                        PrintAndLog("Could not create file dumpkeys.bin");\r
                        free(keyBlock);\r

+                       free(e_sector);\r

                        return 1;\r
                }\r
                        return 1;\r
                }\r

-               for (uint16_t t = 0; t < 2; t++) {\r
-                       fwrite(foundKey[t], 1, 6*SectorsCnt, fkeys);\r
+               PrintAndLog("Printing keys to binary file dumpkeys.bin...");\r
+       \r
+               for( i=0; i<SectorsCnt; i++) {\r
+                       num_to_bytes(e_sector[i].Key[0], 6, tempkey);\r
+                       fwrite ( tempkey, 1, 6, fkeys );\r
+               }\r
+               for(i=0; i<SectorsCnt; i++) {\r
+                       num_to_bytes(e_sector[i].Key[1], 6, tempkey);\r
+                       fwrite ( tempkey, 1, 6, fkeys );\r

                }\r
                fclose(fkeys);\r
                }\r
                fclose(fkeys);\r

-               PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");\r
+               PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");                    \r

        }\r
        }\r

-\r
+       \r

        free(keyBlock);\r
        free(keyBlock);\r

+       free(e_sector);\r

        PrintAndLog("");\r
        return 0;\r
 }\r
 \r
        PrintAndLog("");\r
        return 0;\r
 }\r
 \r

+void printKeyTable( uint8_t sectorscnt, sector *e_sector ){\r
+       PrintAndLog("|---|----------------|---|----------------|---|");\r
+       PrintAndLog("|sec|key A           |res|key B           |res|");\r
+       PrintAndLog("|---|----------------|---|----------------|---|");\r
+       for (uint8_t i = 0; i < sectorscnt; ++i) {\r
+               PrintAndLog("|%03d|  %012"llx"  | %d |  %012"llx"  | %d |", i,\r
+                       e_sector[i].Key[0], e_sector[i].foundKey[0], \r
+                       e_sector[i].Key[1], e_sector[i].foundKey[1]\r
+               );\r
+       }\r
+       PrintAndLog("|---|----------------|---|----------------|---|");\r
+}\r
+\r

 int CmdHF14AMf1kSim(const char *Cmd)\r
 {\r
        uint8_t uid[7] = {0, 0, 0, 0, 0, 0, 0};\r
        uint8_t exitAfterNReads = 0;\r
        uint8_t flags = 0;\r
 int CmdHF14AMf1kSim(const char *Cmd)\r
 {\r
        uint8_t uid[7] = {0, 0, 0, 0, 0, 0, 0};\r
        uint8_t exitAfterNReads = 0;\r
        uint8_t flags = 0;\r

-\r
-       uint8_t cmdp = param_getchar(Cmd, 0);\r

        \r
        \r

+       uint8_t cmdp = param_getchar(Cmd, 0);\r
+\r

        if (cmdp == 'h' || cmdp == 'H') {\r
                PrintAndLog("Usage:  hf mf sim  u <uid (8 hex symbols)> n <numreads> i x");\r
                PrintAndLog("           h    this help");\r
        if (cmdp == 'h' || cmdp == 'H') {\r
                PrintAndLog("Usage:  hf mf sim  u <uid (8 hex symbols)> n <numreads> i x");\r
                PrintAndLog("           h    this help");\r


@@ -1038,10 +1274,12 @@ int CmdHF14AMf1kSim(const char *Cmd)
                }\r
                pnr +=2;\r
        }\r
                }\r
                pnr +=2;\r
        }\r

+       \r

        if (param_getchar(Cmd, pnr) == 'n') {\r
                exitAfterNReads = param_get8(Cmd,pnr+1);\r
                pnr += 2;\r
        }\r
        if (param_getchar(Cmd, pnr) == 'n') {\r
                exitAfterNReads = param_get8(Cmd,pnr+1);\r
                pnr += 2;\r
        }\r

+       \r

        if (param_getchar(Cmd, pnr) == 'i' ) {\r
                //Using a flag to signal interactiveness, least significant bit\r
                flags |= FLAG_INTERACTIVE;\r
        if (param_getchar(Cmd, pnr) == 'i' ) {\r
                //Using a flag to signal interactiveness, least significant bit\r
                flags |= FLAG_INTERACTIVE;\r


@@ -1052,26 +1290,60 @@ int CmdHF14AMf1kSim(const char *Cmd)
                //Using a flag to signal interactiveness, least significant bit\r
                flags |= FLAG_NR_AR_ATTACK;\r
        }\r
                //Using a flag to signal interactiveness, least significant bit\r
                flags |= FLAG_NR_AR_ATTACK;\r
        }\r

+       \r

        PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) ",\r
                                flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):\r
                                                                                          flags & FLAG_7B_UID_IN_DATA   ? sprint_hex(uid,7): "N/A"\r
        PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) ",\r
                                flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):\r
                                                                                          flags & FLAG_7B_UID_IN_DATA   ? sprint_hex(uid,7): "N/A"\r

-                               , exitAfterNReads, flags,flags);\r
+                               , exitAfterNReads\r
+                               , flags\r
+                               , flags);\r

 \r
 \r
        UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};\r
        memcpy(c.d.asBytes, uid, sizeof(uid));\r
 \r
 \r
        UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};\r
        memcpy(c.d.asBytes, uid, sizeof(uid));\r

+       clearCommandBuffer();\r

        SendCommand(&c);\r
 \r
        if(flags & FLAG_INTERACTIVE)\r
        SendCommand(&c);\r
 \r
        if(flags & FLAG_INTERACTIVE)\r

-       {\r
-               UsbCommand resp;\r
-               PrintAndLog("Press pm3-button to abort simulation");\r
-               while(! WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
-                       //We're waiting only 1.5 s at a time, otherwise we get the\r
-                       // annoying message about "Waiting for a response... "\r
+       {               \r
+               uint8_t data[40];\r
+               uint8_t key[6];\r
+\r
+               UsbCommand resp;                \r
+               PrintAndLog("Press pm3-button or send another cmd to abort simulation");\r
+\r
+               while( !ukbhit() ){\r
+                       if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;\r
+\r
+                       if ( !(flags & FLAG_NR_AR_ATTACK) ) break;\r
+                       \r
+                       if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;\r
+\r
+                               memset(data, 0x00, sizeof(data));\r
+                               memset(key, 0x00, sizeof(key));\r
+                               int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];\r
+                               \r
+                               memcpy(data, resp.d.asBytes, len);\r
+                               \r
+                               uint64_t corr_uid = 0;\r
+                               \r
+                               // this IF?  what was I thinking of?\r
+                               if ( memcmp(data, "\x00\x00\x00\x00", 4) == 0 ) {\r
+                                       corr_uid = ((uint64_t)(data[3] << 24)) | (data[2] << 16) | (data[1] << 8) | data[0];\r
+                                       tryMfk32(corr_uid, data, key);\r
+                               } else {\r
+                                       corr_uid |= (uint64_t)data[2] << 48; \r
+                                       corr_uid |= (uint64_t)data[1] << 40; \r
+                                       corr_uid |= (uint64_t)data[0] << 32;\r
+                                       corr_uid |= (uint64_t)data[7] << 24;\r
+                                       corr_uid |= (uint64_t)data[6] << 16;\r
+                                       corr_uid |= (uint64_t)data[5] << 8;\r
+                                       corr_uid |= (uint64_t)data[4];\r
+                                       tryMfk64(corr_uid, data, key);\r
+                               }\r
+                       PrintAndLog("--");\r

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

-       \r

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


@@ -1093,10 +1365,10 @@ int CmdHF14AMfDbg(const char *Cmd)
                return 0;\r
        }       \r
 \r
                return 0;\r
        }       \r
 \r

-  UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};\r
-  SendCommand(&c);\r
+       UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};\r
+       SendCommand(&c);\r

 \r
 \r

-  return 0;\r
+       return 0;\r

 }\r
 \r
 int CmdHF14AMfEGet(const char *Cmd)\r
 }\r
 \r
 int CmdHF14AMfEGet(const char *Cmd)\r


@@ -1130,12 +1402,11 @@ int CmdHF14AMfEClear(const char *Cmd)
                return 0;\r
        }       \r
 \r
                return 0;\r
        }       \r
 \r

-  UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};\r
-  SendCommand(&c);\r
-  return 0;\r
+       UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};\r
+       SendCommand(&c);\r
+       return 0;\r

 }\r
 \r
 }\r
 \r

-\r

 int CmdHF14AMfESet(const char *Cmd)\r
 {\r
        uint8_t memBlock[16];\r
 int CmdHF14AMfESet(const char *Cmd)\r
 {\r
        uint8_t memBlock[16];\r


@@ -1163,7 +1434,6 @@ int CmdHF14AMfESet(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

-\r

 int CmdHF14AMfELoad(const char *Cmd)\r
 {\r
        FILE * f;\r
 int CmdHF14AMfELoad(const char *Cmd)\r
 {\r
        FILE * f;\r


@@ -1173,13 +1443,13 @@ int CmdHF14AMfELoad(const char *Cmd)
        uint8_t buf8[64] = {0x00};\r
        int i, len, blockNum, numBlocks;\r
        int nameParamNo = 1;\r
        uint8_t buf8[64] = {0x00};\r
        int i, len, blockNum, numBlocks;\r
        int nameParamNo = 1;\r

-       \r
+       uint8_t blockWidth = 32;\r

        char ctmp = param_getchar(Cmd, 0);\r
                \r
        char ctmp = param_getchar(Cmd, 0);\r
                \r

-       if ( ctmp == 'h' || ctmp == 0x00) {\r
+       if ( ctmp == 'h' || ctmp == 'H' || ctmp == 0x00) {\r

                PrintAndLog("It loads emul dump from the file `filename.eml`");\r
                PrintAndLog("It loads emul dump from the file `filename.eml`");\r

-               PrintAndLog("Usage:  hf mf eload [card memory] <file name w/o `.eml`>");\r
-               PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
+               PrintAndLog("Usage:  hf mf eload [card memory] <file name w/o `.eml`> [numblocks]");\r
+               PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K, u = UL");\r

                PrintAndLog("");\r
                PrintAndLog(" sample: hf mf eload filename");\r
                PrintAndLog("         hf mf eload 4 filename");\r
                PrintAndLog("");\r
                PrintAndLog(" sample: hf mf eload filename");\r
                PrintAndLog("         hf mf eload 4 filename");\r


@@ -1192,17 +1462,21 @@ int CmdHF14AMfELoad(const char *Cmd)
                case '\0': numBlocks = 16*4; break;\r
                case '2' : numBlocks = 32*4; break;\r
                case '4' : numBlocks = 256; break;\r
                case '\0': numBlocks = 16*4; break;\r
                case '2' : numBlocks = 32*4; break;\r
                case '4' : numBlocks = 256; break;\r

+               case 'U' : // fall through\r
+               case 'u' : numBlocks = 255; blockWidth = 8; break;\r

                default:  {\r
                        numBlocks = 16*4;\r
                        nameParamNo = 0;\r
                }\r
        }\r
                default:  {\r
                        numBlocks = 16*4;\r
                        nameParamNo = 0;\r
                }\r
        }\r

+       uint32_t numblk2 = param_get32ex(Cmd,2,0,10);\r
+       if (numblk2 > 0) numBlocks = numblk2;   \r

 \r
        len = param_getstr(Cmd,nameParamNo,filename);\r
        \r
 \r
        len = param_getstr(Cmd,nameParamNo,filename);\r
        \r

-       if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r
+       if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r

 \r
 \r

-       fnameptr += len-4;\r
+       fnameptr += len;\r

 \r
        sprintf(fnameptr, ".eml"); \r
        \r
 \r
        sprintf(fnameptr, ".eml"); \r
        \r


@@ -1226,19 +1500,18 @@ int CmdHF14AMfELoad(const char *Cmd)
                        return 2;\r
                }\r
                \r
                        return 2;\r
                }\r
                \r

-               if (strlen(buf) < 32){\r
+               if (strlen(buf) < blockWidth){\r

                        if(strlen(buf) && feof(f))\r
                                break;\r
                        if(strlen(buf) && feof(f))\r
                                break;\r

-                       PrintAndLog("File content error. Block data must include 32 HEX symbols");\r
+                       PrintAndLog("File content error. Block data must include %d HEX symbols", blockWidth);\r

                        fclose(f);\r
                        return 2;\r
                }\r
                \r
                        fclose(f);\r
                        return 2;\r
                }\r
                \r

-               for (i = 0; i < 32; i += 2) {\r
+               for (i = 0; i < blockWidth; i += 2) {\r

                        sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
                }\r
                        sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
                }\r

-               \r
-               if (mfEmlSetMem(buf8, blockNum, 1)) {\r
+               if (mfEmlSetMem_xt(buf8, blockNum, 1, blockWidth/2)) {\r

                        PrintAndLog("Cant set emul block: %3d", blockNum);\r
                        fclose(f);\r
                        return 3;\r
                        PrintAndLog("Cant set emul block: %3d", blockNum);\r
                        fclose(f);\r
                        return 3;\r


@@ -1259,7 +1532,6 @@ int CmdHF14AMfELoad(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

-\r

 int CmdHF14AMfESave(const char *Cmd)\r
 {\r
        FILE * f;\r
 int CmdHF14AMfESave(const char *Cmd)\r
 {\r
        FILE * f;\r


@@ -1299,19 +1571,22 @@ int CmdHF14AMfESave(const char *Cmd)
 \r
        len = param_getstr(Cmd,nameParamNo,filename);\r
        \r
 \r
        len = param_getstr(Cmd,nameParamNo,filename);\r
        \r

-       if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r
+       if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r

        \r
        // user supplied filename?\r
        if (len < 1) {\r
                // get filename (UID from memory)\r
                if (mfEmlGetMem(buf, 0, 1)) {\r
                        PrintAndLog("Can\'t get UID from block: %d", 0);\r
        \r
        // user supplied filename?\r
        if (len < 1) {\r
                // get filename (UID from memory)\r
                if (mfEmlGetMem(buf, 0, 1)) {\r
                        PrintAndLog("Can\'t get UID from block: %d", 0);\r

-                       sprintf(filename, "dump.eml"); \r
+                       len = sprintf(fnameptr, "dump");\r
+                       fnameptr += len;\r
+               }\r
+               else {\r
+                       for (j = 0; j < 7; j++, fnameptr += 2)\r
+                               sprintf(fnameptr, "%02X", buf[j]);\r

                }\r
                }\r

-               for (j = 0; j < 7; j++, fnameptr += 2)\r
-                       sprintf(fnameptr, "%02X", buf[j]); \r

        } else {\r
        } else {\r

-               fnameptr += len-4;\r
+               fnameptr += len;\r

        }\r
 \r
        // add file extension\r
        }\r
 \r
        // add file extension\r


@@ -1342,7 +1617,6 @@ int CmdHF14AMfESave(const char *Cmd)
   return 0;\r
 }\r
 \r
   return 0;\r
 }\r
 \r

-\r

 int CmdHF14AMfECFill(const char *Cmd)\r
 {\r
        uint8_t keyType = 0;\r
 int CmdHF14AMfECFill(const char *Cmd)\r
 {\r
        uint8_t keyType = 0;\r


@@ -1382,15 +1656,16 @@ int CmdHF14AMfECFill(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

-\r

 int CmdHF14AMfEKeyPrn(const char *Cmd)\r
 {\r
        int i;\r
        uint8_t numSectors;\r
        uint8_t data[16];\r
        uint64_t keyA, keyB;\r
 int CmdHF14AMfEKeyPrn(const char *Cmd)\r
 {\r
        int i;\r
        uint8_t numSectors;\r
        uint8_t data[16];\r
        uint64_t keyA, keyB;\r

+\r
+       char cmdp = param_getchar(Cmd, 0);\r

        \r
        \r

-       if (param_getchar(Cmd, 0) == 'h') {\r
+       if ( cmdp == 'h' || cmdp == 'H' ) {\r

                PrintAndLog("It prints the keys loaded in the emulator memory");\r
                PrintAndLog("Usage:  hf mf ekeyprn [card memory]");\r
                PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r
                PrintAndLog("It prints the keys loaded in the emulator memory");\r
                PrintAndLog("Usage:  hf mf ekeyprn [card memory]");\r
                PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r


@@ -1399,8 +1674,6 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
                return 0;\r
        }       \r
 \r
                return 0;\r
        }       \r
 \r

-       char cmdp = param_getchar(Cmd, 0);\r
-       \r

        switch (cmdp) {\r
                case '0' : numSectors = 5; break;\r
                case '1' : \r
        switch (cmdp) {\r
                case '0' : numSectors = 5; break;\r
                case '1' : \r


@@ -1427,7 +1700,6 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

-\r

 int CmdHF14AMfCSetUID(const char *Cmd)\r
 {\r
        uint8_t wipeCard = 0;\r
 int CmdHF14AMfCSetUID(const char *Cmd)\r
 {\r
        uint8_t wipeCard = 0;\r


@@ -1499,9 +1771,9 @@ int CmdHF14AMfCSetUID(const char *Cmd)
 \r
 int CmdHF14AMfCSetBlk(const char *Cmd)\r
 {\r
 \r
 int CmdHF14AMfCSetBlk(const char *Cmd)\r
 {\r

-       uint8_t memBlock[16] = {0x00};\r
+       uint8_t block[16] = {0x00};\r

        uint8_t blockNo = 0;\r
        uint8_t blockNo = 0;\r

-       bool wipeCard = FALSE;\r
+       uint8_t params = MAGIC_SINGLE;\r

        int res;\r
 \r
        if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
        int res;\r
 \r
        if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r


@@ -1514,16 +1786,18 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
 \r
        blockNo = param_get8(Cmd, 0);\r
 \r
 \r
        blockNo = param_get8(Cmd, 0);\r
 \r

-       if (param_gethex(Cmd, 1, memBlock, 32)) {\r
+       if (param_gethex(Cmd, 1, block, 32)) {\r

                PrintAndLog("block data must include 32 HEX symbols");\r
                return 1;\r
        }\r
 \r
        char ctmp = param_getchar(Cmd, 2);\r
                PrintAndLog("block data must include 32 HEX symbols");\r
                return 1;\r
        }\r
 \r
        char ctmp = param_getchar(Cmd, 2);\r

-       wipeCard = (ctmp == 'w' || ctmp == 'W');\r
-       PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));\r
+       if (ctmp == 'w' || ctmp == 'W')\r
+               params |= MAGIC_WIPE;\r
+       \r
+       PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(block, 16));\r

 \r
 \r

-       res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER);\r
+       res = mfCSetBlock(blockNo, block, NULL, params);\r

        if (res) {\r
                PrintAndLog("Can't write block. error=%d", res);\r
                return 1;\r
        if (res) {\r
                PrintAndLog("Can't write block. error=%d", res);\r
                return 1;\r


@@ -1531,18 +1805,21 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

-\r

 int CmdHF14AMfCLoad(const char *Cmd)\r
 {\r
        FILE * f;\r
 int CmdHF14AMfCLoad(const char *Cmd)\r
 {\r
        FILE * f;\r

-       char filename[FILE_PATH_SIZE] = {0x00};\r
+       char filename[FILE_PATH_SIZE];\r

        char * fnameptr = filename;\r
        char buf[64] = {0x00};\r
        uint8_t buf8[64] = {0x00};\r
        uint8_t fillFromEmulator = 0;\r
        int i, len, blockNum, flags=0;\r
        char * fnameptr = filename;\r
        char buf[64] = {0x00};\r
        uint8_t buf8[64] = {0x00};\r
        uint8_t fillFromEmulator = 0;\r
        int i, len, blockNum, flags=0;\r

+\r
+       memset(filename, 0, sizeof(filename));\r
+       \r
+       char ctmp = param_getchar(Cmd, 0);\r

        \r
        \r

-       if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {\r
+       if (ctmp == 'h' || ctmp == 'H' || ctmp == 0x00) {\r

                PrintAndLog("It loads magic Chinese card from the file `filename.eml`");\r
                PrintAndLog("or from emulator memory (option `e`)");\r
                PrintAndLog("Usage:  hf mf cload <file name w/o `.eml`>");\r
                PrintAndLog("It loads magic Chinese card from the file `filename.eml`");\r
                PrintAndLog("or from emulator memory (option `e`)");\r
                PrintAndLog("Usage:  hf mf cload <file name w/o `.eml`>");\r


@@ -1551,7 +1828,6 @@ int CmdHF14AMfCLoad(const char *Cmd)
                return 0;\r
        }       \r
 \r
                return 0;\r
        }       \r
 \r

-       char ctmp = param_getchar(Cmd, 0);\r

        if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
        \r
        if (fillFromEmulator) {\r
        if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
        \r
        if (fillFromEmulator) {\r


@@ -1560,11 +1836,11 @@ int CmdHF14AMfCLoad(const char *Cmd)
                                PrintAndLog("Cant get block: %d", blockNum);\r
                                return 2;\r
                        }\r
                                PrintAndLog("Cant get block: %d", blockNum);\r
                                return 2;\r
                        }\r

-                       if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;                               // switch on field and send magic sequence\r
+                       if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;                             // switch on field and send magic sequence\r

                        if (blockNum == 1) flags = 0;                                                                                                   // just write\r
                        if (blockNum == 1) flags = 0;                                                                                                   // just write\r

-                       if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;             // Done. Magic Halt and switch off field.\r
+                       if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;             // Done. Magic Halt and switch off field.\r

 \r
 \r

-                       if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r
+                       if (mfCSetBlock(blockNum, buf8, NULL, flags)) {\r

                                PrintAndLog("Cant set magic card block: %d", blockNum);\r
                                return 3;\r
                        }\r
                                PrintAndLog("Cant set magic card block: %d", blockNum);\r
                                return 3;\r
                        }\r


@@ -1572,10 +1848,10 @@ int CmdHF14AMfCLoad(const char *Cmd)
                return 0;\r
        } else {\r
                len = strlen(Cmd);\r
                return 0;\r
        } else {\r
                len = strlen(Cmd);\r

-               if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r
+               if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r

 \r
                memcpy(filename, Cmd, len);\r
 \r
                memcpy(filename, Cmd, len);\r

-               fnameptr += len-4;\r
+               fnameptr += len;\r

 \r
                sprintf(fnameptr, ".eml"); \r
        \r
 \r
                sprintf(fnameptr, ".eml"); \r
        \r


@@ -1592,8 +1868,8 @@ int CmdHF14AMfCLoad(const char *Cmd)
                        memset(buf, 0, sizeof(buf));\r
                        \r
                        if (fgets(buf, sizeof(buf), f) == NULL) {\r
                        memset(buf, 0, sizeof(buf));\r
                        \r
                        if (fgets(buf, sizeof(buf), f) == NULL) {\r

-                               PrintAndLog("File reading error.");\r

                                fclose(f);\r
                                fclose(f);\r

+                               PrintAndLog("File reading error.");\r

                                return 2;\r
                        }\r
 \r
                                return 2;\r
                        }\r
 \r


@@ -1607,12 +1883,13 @@ int CmdHF14AMfCLoad(const char *Cmd)
                        for (i = 0; i < 32; i += 2)\r
                                sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
 \r
                        for (i = 0; i < 32; i += 2)\r
                                sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
 \r

-                       if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;                               // switch on field and send magic sequence\r
+                       if (blockNum == 0) flags = MAGIC_INIT + MAGIC_WUPC;                             // switch on field and send magic sequence\r

                        if (blockNum == 1) flags = 0;                                                                                                   // just write\r
                        if (blockNum == 1) flags = 0;                                                                                                   // just write\r

-                       if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;             // Done. Switch off field.\r
+                       if (blockNum == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;             // Done. Switch off field.\r

 \r
 \r

-                       if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r
+                       if (mfCSetBlock(blockNum, buf8, NULL, flags)) {\r

                                PrintAndLog("Can't set magic card block: %d", blockNum);\r
                                PrintAndLog("Can't set magic card block: %d", blockNum);\r

+                               fclose(f);\r

                                return 3;\r
                        }\r
                        blockNum++;\r
                                return 3;\r
                        }\r
                        blockNum++;\r


@@ -1621,6 +1898,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
                }\r
                fclose(f);\r
        \r
                }\r
                fclose(f);\r
        \r

+               // 64 or 256blocks.\r

                if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){\r
                        PrintAndLog("File content error. There must be 64 blocks");\r
                        return 4;\r
                if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){\r
                        PrintAndLog("File content error. There must be 64 blocks");\r
                        return 4;\r


@@ -1632,12 +1910,13 @@ int CmdHF14AMfCLoad(const char *Cmd)
 }\r
 \r
 int CmdHF14AMfCGetBlk(const char *Cmd) {\r
 }\r
 \r
 int CmdHF14AMfCGetBlk(const char *Cmd) {\r

-       uint8_t memBlock[16];\r
+       uint8_t data[16];\r

        uint8_t blockNo = 0;\r
        int res;\r
        uint8_t blockNo = 0;\r
        int res;\r

-       memset(memBlock, 0x00, sizeof(memBlock));\r
+       memset(data, 0x00, sizeof(data));\r
+       char ctmp = param_getchar(Cmd, 0);\r

 \r
 \r

-       if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
+       if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') {\r

                PrintAndLog("Usage:  hf mf cgetblk <block number>");\r
                PrintAndLog("sample:  hf mf cgetblk 1");\r
                PrintAndLog("Get block data from magic Chinese card (only works with such cards)\n");\r
                PrintAndLog("Usage:  hf mf cgetblk <block number>");\r
                PrintAndLog("sample:  hf mf cgetblk 1");\r
                PrintAndLog("Get block data from magic Chinese card (only works with such cards)\n");\r


@@ -1648,23 +1927,24 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
 \r
        PrintAndLog("--block number:%2d ", blockNo);\r
 \r
 \r
        PrintAndLog("--block number:%2d ", blockNo);\r
 \r

-       res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER);\r
+       res = mfCGetBlock(blockNo, data, MAGIC_SINGLE);\r

        if (res) {\r
        if (res) {\r

-                       PrintAndLog("Can't read block. error=%d", res);\r
-                       return 1;\r
-               }\r
+               PrintAndLog("Can't read block. error=%d", res);\r
+               return 1;\r
+       }\r

        \r
        \r

-       PrintAndLog("block data:%s", sprint_hex(memBlock, 16));\r
+       PrintAndLog("data: %s", sprint_hex(data, sizeof(data)));\r

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

-\r

 int CmdHF14AMfCGetSc(const char *Cmd) {\r
 int CmdHF14AMfCGetSc(const char *Cmd) {\r

-       uint8_t memBlock[16] = {0x00};\r
+       uint8_t data[16];\r

        uint8_t sectorNo = 0;\r
        int i, res, flags;\r
        uint8_t sectorNo = 0;\r
        int i, res, flags;\r

-\r
-       if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
+       memset(data, 0x00, sizeof(data));\r
+       char ctmp = param_getchar(Cmd, 0);\r
+       \r
+       if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') {\r

                PrintAndLog("Usage:  hf mf cgetsc <sector number>");\r
                PrintAndLog("sample:  hf mf cgetsc 0");\r
                PrintAndLog("Get sector data from magic Chinese card (only works with such cards)\n");\r
                PrintAndLog("Usage:  hf mf cgetsc <sector number>");\r
                PrintAndLog("sample:  hf mf cgetsc 0");\r
                PrintAndLog("Get sector data from magic Chinese card (only works with such cards)\n");\r


@@ -1678,37 +1958,37 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
        }\r
 \r
        PrintAndLog("--sector number:%d ", sectorNo);\r
        }\r
 \r
        PrintAndLog("--sector number:%d ", sectorNo);\r

+       PrintAndLog("block | data");\r

 \r
 \r

-       flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
+       flags = MAGIC_INIT + MAGIC_WUPC;\r

        for (i = 0; i < 4; i++) {\r
                if (i == 1) flags = 0;\r
        for (i = 0; i < 4; i++) {\r
                if (i == 1) flags = 0;\r

-               if (i == 3) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+               if (i == 3) flags = MAGIC_HALT + MAGIC_OFF;\r

 \r
 \r

-               res = mfCGetBlock(sectorNo * 4 + i, memBlock, flags);\r
+               res = mfCGetBlock(sectorNo * 4 + i, data, flags);\r

                if (res) {\r
                        PrintAndLog("Can't read block. %d error=%d", sectorNo * 4 + i, res);\r
                        return 1;\r
                if (res) {\r
                        PrintAndLog("Can't read block. %d error=%d", sectorNo * 4 + i, res);\r
                        return 1;\r

-               }\r
-       \r
-               PrintAndLog("block %3d data:%s", sectorNo * 4 + i, sprint_hex(memBlock, 16));\r
+               }       \r
+               PrintAndLog(" %3d | %s", sectorNo * 4 + i, sprint_hex(data, sizeof(data)));\r

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

-\r

 int CmdHF14AMfCSave(const char *Cmd) {\r
 \r
        FILE * f;\r
 int CmdHF14AMfCSave(const char *Cmd) {\r
 \r
        FILE * f;\r

-       char filename[FILE_PATH_SIZE] = {0x00};\r
+       char filename[FILE_PATH_SIZE];\r

        char * fnameptr = filename;\r
        uint8_t fillFromEmulator = 0;\r
        char * fnameptr = filename;\r
        uint8_t fillFromEmulator = 0;\r

-       uint8_t buf[64] = {0x00};\r
+       uint8_t buf[64];\r

        int i, j, len, flags;\r
        \r
        int i, j, len, flags;\r
        \r

-       // memset(filename, 0, sizeof(filename));\r
-       // memset(buf, 0, sizeof(buf));\r
-\r
-       if (param_getchar(Cmd, 0) == 'h') {\r
+       memset(filename, 0, sizeof(filename));\r
+       memset(buf, 0, sizeof(buf));\r
+       char ctmp = param_getchar(Cmd, 0);\r
+       \r
+       if ( ctmp == 'h' || ctmp == 'H' ) {\r

                PrintAndLog("It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");\r
                PrintAndLog("or into emulator memory (option `e`)");\r
                PrintAndLog("Usage:  hf mf esave [file name w/o `.eml`][e]");\r
                PrintAndLog("It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");\r
                PrintAndLog("or into emulator memory (option `e`)");\r
                PrintAndLog("Usage:  hf mf esave [file name w/o `.eml`][e]");\r


@@ -1717,16 +1997,14 @@ int CmdHF14AMfCSave(const char *Cmd) {
                PrintAndLog("         hf mf esave e \n");\r
                return 0;\r
        }       \r
                PrintAndLog("         hf mf esave e \n");\r
                return 0;\r
        }       \r

-\r
-       char ctmp = param_getchar(Cmd, 0);\r

        if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
 \r
        if (fillFromEmulator) {\r
                // put into emulator\r
        if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
 \r
        if (fillFromEmulator) {\r
                // put into emulator\r

-               flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
+               flags = MAGIC_INIT + MAGIC_WUPC;\r

                for (i = 0; i < 16 * 4; i++) {\r
                        if (i == 1) flags = 0;\r
                for (i = 0; i < 16 * 4; i++) {\r
                        if (i == 1) flags = 0;\r

-                       if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+                       if (i == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;\r

                \r
                        if (mfCGetBlock(i, buf, flags)) {\r
                                PrintAndLog("Cant get block: %d", i);\r
                \r
                        if (mfCGetBlock(i, buf, flags)) {\r
                                PrintAndLog("Cant get block: %d", i);\r


@@ -1741,21 +2019,25 @@ int CmdHF14AMfCSave(const char *Cmd) {
                return 0;\r
        } else {\r
                len = strlen(Cmd);\r
                return 0;\r
        } else {\r
                len = strlen(Cmd);\r

-               if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r
+               if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r

        \r
        \r

+               // get filename based on UID\r

                if (len < 1) {\r
                if (len < 1) {\r

-                       // get filename\r
-                       if (mfCGetBlock(0, buf, CSETBLOCK_SINGLE_OPER)) {\r
+               \r
+                       if (mfCGetBlock(0, buf, MAGIC_SINGLE)) {\r

                                PrintAndLog("Cant get block: %d", 0);\r
                                PrintAndLog("Cant get block: %d", 0);\r

-                               return 1;\r
+                               len = sprintf(fnameptr, "dump");\r
+                               fnameptr += len;\r
+                       } else {\r
+                               for (j = 0; j < 7; j++, fnameptr += 2)\r
+                                       sprintf(fnameptr, "%02x", buf[j]); \r

                        }\r
                        }\r

-                       for (j = 0; j < 7; j++, fnameptr += 2)\r
-                               sprintf(fnameptr, "%02x", buf[j]); \r

                } else {\r
                        memcpy(filename, Cmd, len);\r
                        fnameptr += len;\r
                }\r
 \r
                } else {\r
                        memcpy(filename, Cmd, len);\r
                        fnameptr += len;\r
                }\r
 \r

+               // add .eml extension\r

                sprintf(fnameptr, ".eml"); \r
        \r
                // open file\r
                sprintf(fnameptr, ".eml"); \r
        \r
                // open file\r


@@ -1767,10 +2049,10 @@ int CmdHF14AMfCSave(const char *Cmd) {
                }\r
 \r
                // put hex\r
                }\r
 \r
                // put hex\r

-               flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
+               flags = MAGIC_INIT + MAGIC_WUPC;\r

                for (i = 0; i < 16 * 4; i++) {\r
                        if (i == 1) flags = 0;\r
                for (i = 0; i < 16 * 4; i++) {\r
                        if (i == 1) flags = 0;\r

-                       if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+                       if (i == 16 * 4 - 1) flags = MAGIC_HALT + MAGIC_OFF;\r

                \r
                        if (mfCGetBlock(i, buf, flags)) {\r
                                PrintAndLog("Cant get block: %d", i);\r
                \r
                        if (mfCGetBlock(i, buf, flags)) {\r
                                PrintAndLog("Cant get block: %d", i);\r


@@ -1780,15 +2062,13 @@ int CmdHF14AMfCSave(const char *Cmd) {
                                fprintf(f, "%02x", buf[j]); \r
                        fprintf(f,"\n");\r
                }\r
                                fprintf(f, "%02x", buf[j]); \r
                        fprintf(f,"\n");\r
                }\r

+               fflush(f);\r

                fclose(f);\r
                fclose(f);\r

-       \r

                PrintAndLog("Saved to file: %s", filename);\r
                PrintAndLog("Saved to file: %s", filename);\r

-       \r

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

-\r

 int CmdHF14AMfSniff(const char *Cmd){\r
 \r
        bool wantLogToFile = 0;\r
 int CmdHF14AMfSniff(const char *Cmd){\r
 \r
        bool wantLogToFile = 0;\r


@@ -1797,6 +2077,7 @@ int CmdHF14AMfSniff(const char *Cmd){
        bool wantSaveToEmlFile = 0;\r
 \r
        //var \r
        bool wantSaveToEmlFile = 0;\r
 \r
        //var \r

+       int tmpchar;\r

        int res = 0;\r
        int len = 0;\r
        int blockLen = 0;\r
        int res = 0;\r
        int len = 0;\r
        int blockLen = 0;\r


@@ -1847,7 +2128,8 @@ int CmdHF14AMfSniff(const char *Cmd){
                printf(".");\r
                fflush(stdout);\r
                if (ukbhit()) {\r
                printf(".");\r
                fflush(stdout);\r
                if (ukbhit()) {\r

-                       getchar();\r
+                       tmpchar = getchar();\r
+                       (void)tmpchar;\r

                        printf("\naborted via keyboard!\n");\r
                        break;\r
                }\r
                        printf("\naborted via keyboard!\n");\r
                        break;\r
                }\r


@@ -1858,7 +2140,10 @@ int CmdHF14AMfSniff(const char *Cmd){
                        uint16_t traceLen = resp.arg[1];\r
                        len = resp.arg[2];\r
 \r
                        uint16_t traceLen = resp.arg[1];\r
                        len = resp.arg[2];\r
 \r

-                       if (res == 0) return 0;                                         // we are done\r
+                       if (res == 0) {\r
+                               free(buf);\r
+                               return 0;                                               // we are done\r
+                       }\r

 \r
                        if (res == 1) {                                                         // there is (more) data to be transferred\r
                                if (pckNum == 0) {                                              // first packet, (re)allocate necessary buffer\r
 \r
                        if (res == 1) {                                                         // there is (more) data to be transferred\r
                                if (pckNum == 0) {                                              // first packet, (re)allocate necessary buffer\r


@@ -1880,6 +2165,11 @@ int CmdHF14AMfSniff(const char *Cmd){
                                        bufsize = traceLen;\r
                                        memset(buf, 0x00, traceLen);\r
                                }\r
                                        bufsize = traceLen;\r
                                        memset(buf, 0x00, traceLen);\r
                                }\r

+                               if (bufPtr == NULL) {\r
+                                       PrintAndLog("Cannot allocate memory for trace");\r
+                                       free(buf);\r
+                                       return 2;\r
+                               }\r

                                memcpy(bufPtr, resp.d.asBytes, len);\r
                                bufPtr += len;\r
                                pckNum++;\r
                                memcpy(bufPtr, resp.d.asBytes, len);\r
                                bufPtr += len;\r
                                pckNum++;\r


@@ -1936,48 +2226,66 @@ int CmdHF14AMfSniff(const char *Cmd){
        return 0;\r
 }\r
 \r
        return 0;\r
 }\r
 \r

+//needs nt, ar, at, Data to decrypt\r
+int CmdHf14MfDecryptBytes(const char *Cmd){\r
+       uint8_t data[50];\r
+       \r
+       uint32_t nt     = param_get32ex(Cmd,0,0,16);\r
+       uint32_t ar_enc = param_get32ex(Cmd,1,0,16);\r
+       uint32_t at_enc = param_get32ex(Cmd,2,0,16);\r

 \r
 \r

-static command_t CommandTable[] =\r
-{\r
-  {"help",             CmdHelp,                                1, "This help"},\r
-  {"dbg",              CmdHF14AMfDbg,                  0, "Set default debug mode"},\r
-  {"rdbl",             CmdHF14AMfRdBl,                 0, "Read MIFARE classic block"},\r
-  {"rdsc",             CmdHF14AMfRdSc,                 0, "Read MIFARE classic sector"},\r
-  {"dump",             CmdHF14AMfDump,                 0, "Dump MIFARE classic tag to binary file"},\r
-  {"restore",  CmdHF14AMfRestore,              0, "Restore MIFARE classic binary file to BLANK tag"},\r
-  {"wrbl",             CmdHF14AMfWrBl,                 0, "Write MIFARE classic block"},\r
-  {"chk",              CmdHF14AMfChk,                  0, "Test block keys"},\r
-  {"mifare",   CmdHF14AMifare,                 0, "Read parity error messages."},\r
-  {"nested",   CmdHF14AMfNested,               0, "Test nested authentication"},\r
-  {"sniff",            CmdHF14AMfSniff,                0, "Sniff card-reader communication"},\r
-  {"sim",              CmdHF14AMf1kSim,                0, "Simulate MIFARE card"},\r
-  {"eclr",             CmdHF14AMfEClear,               0, "Clear simulator memory block"},\r
-  {"eget",             CmdHF14AMfEGet,                 0, "Get simulator memory block"},\r
-  {"eset",             CmdHF14AMfESet,                 0, "Set simulator memory block"},\r
-  {"eload",            CmdHF14AMfELoad,                0, "Load from file emul dump"},\r
-  {"esave",            CmdHF14AMfESave,                0, "Save to file emul dump"},\r
-  {"ecfill",   CmdHF14AMfECFill,               0, "Fill simulator memory with help of keys from simulator"},\r
-  {"ekeyprn",  CmdHF14AMfEKeyPrn,              0, "Print keys from simulator memory"},\r
-  {"csetuid",  CmdHF14AMfCSetUID,              0, "Set UID for magic Chinese card"},\r
-  {"csetblk",  CmdHF14AMfCSetBlk,              0, "Write block - Magic Chinese card"},\r
-  {"cgetblk",  CmdHF14AMfCGetBlk,              0, "Read block - Magic Chinese card"},\r
-  {"cgetsc",   CmdHF14AMfCGetSc,               0, "Read sector - Magic Chinese card"},\r
-  {"cload",            CmdHF14AMfCLoad,                0, "Load dump into magic Chinese card"},\r
-  {"csave",            CmdHF14AMfCSave,                0, "Save dump from magic Chinese card into file or emulator"},\r
-  {NULL, NULL, 0, NULL}\r
+       int len = 0;\r
+       param_gethex_ex(Cmd, 3, data, &len);\r
+       \r
+       len /= 2;       \r
+       int limit = sizeof(data) / 2;\r
+       \r
+       if ( len >= limit )\r
+               len = limit;\r
+       \r
+       return tryDecryptWord( nt, ar_enc, at_enc, data, len);\r
+}\r
+\r
+static command_t CommandTable[] = {\r
+       {"help",                CmdHelp,                                1, "This help"},\r
+       {"dbg",                 CmdHF14AMfDbg,                  0, "Set default debug mode"},\r
+       {"rdbl",                CmdHF14AMfRdBl,                 0, "Read MIFARE classic block"},\r
+       {"rdsc",                CmdHF14AMfRdSc,                 0, "Read MIFARE classic sector"},\r
+       {"dump",                CmdHF14AMfDump,                 0, "Dump MIFARE classic tag to binary file"},\r
+       {"restore",             CmdHF14AMfRestore,              0, "Restore MIFARE classic binary file to BLANK tag"},\r
+       {"wrbl",                CmdHF14AMfWrBl,                 0, "Write MIFARE classic block"},\r
+       {"chk",                 CmdHF14AMfChk,                  0, "Test block keys"},\r
+       {"mifare",              CmdHF14AMifare,                 0, "Read parity error messages."},\r
+       {"nested",              CmdHF14AMfNested,               0, "Test nested authentication"},\r
+       {"hardnested",  CmdHF14AMfNestedHard,   0, "Nested attack for hardened Mifare cards"},\r
+       {"sniff",               CmdHF14AMfSniff,                0, "Sniff card-reader communication"},\r
+       {"sim",                 CmdHF14AMf1kSim,                0, "Simulate MIFARE card"},\r
+       {"eclr",                CmdHF14AMfEClear,               0, "Clear simulator memory block"},\r
+       {"eget",                CmdHF14AMfEGet,                 0, "Get simulator memory block"},\r
+       {"eset",                CmdHF14AMfESet,                 0, "Set simulator memory block"},\r
+       {"eload",               CmdHF14AMfELoad,                0, "Load from file emul dump"},\r
+       {"esave",               CmdHF14AMfESave,                0, "Save to file emul dump"},\r
+       {"ecfill",              CmdHF14AMfECFill,               0, "Fill simulator memory with help of keys from simulator"},\r
+       {"ekeyprn",             CmdHF14AMfEKeyPrn,              0, "Print keys from simulator memory"},\r
+       {"csetuid",             CmdHF14AMfCSetUID,              0, "Set UID for magic Chinese card"},\r
+       {"csetblk",             CmdHF14AMfCSetBlk,              0, "Write block - Magic Chinese card"},\r
+       {"cgetblk",             CmdHF14AMfCGetBlk,              0, "Read block - Magic Chinese card"},\r
+       {"cgetsc",              CmdHF14AMfCGetSc,               0, "Read sector - Magic Chinese card"},\r
+       {"cload",               CmdHF14AMfCLoad,                0, "Load dump into magic Chinese card"},\r
+       {"csave",               CmdHF14AMfCSave,                0, "Save dump from magic Chinese card into file or emulator"},\r
+       {"decrypt",             CmdHf14MfDecryptBytes,  1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},\r
+       {NULL, NULL, 0, NULL}\r

 };\r
 \r
 };\r
 \r

-int CmdHFMF(const char *Cmd)\r
-{\r
+int CmdHFMF(const char *Cmd) {\r

        // flush\r
        // flush\r

-       WaitForResponseTimeout(CMD_ACK,NULL,100);\r
-\r
-  CmdsParse(CommandTable, Cmd);\r
-  return 0;\r
+       clearCommandBuffer();\r
+       //WaitForResponseTimeout(CMD_ACK,NULL,100);\r
+       CmdsParse(CommandTable, Cmd);\r
+       return 0;\r

 }\r
 \r
 }\r
 \r

-int CmdHelp(const char *Cmd)\r
-{\r
-  CmdsHelp(CommandTable);\r
-  return 0;\r
+int CmdHelp(const char *Cmd) {\r
+       CmdsHelp(CommandTable);\r
+       return 0;\r

 }\r
 }\r