ADD: `analyse nuid` - generates NUID 4byte from a UID 7byte. Mifare Classic Ev1...

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 6b944df37e56bebf94d401632746f0a6eca61f9a..4ebef19c503ef688204590d40552c6358fe759e4 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -24,19 +24,20 @@ int usage_hf14_mifare(void){
        return 0;\r
 }\r
 int usage_hf14_mf1ksim(void){\r
        return 0;\r
 }\r
 int usage_hf14_mf1ksim(void){\r

-       PrintAndLog("Usage:  hf mf sim  [h] u <uid (8,14,20 hex symbols)> n <numreads> i x");\r
+       PrintAndLog("Usage:  hf mf sim [h] u <uid> n <numreads> [i] [x] [e] [v]");\r

        PrintAndLog("options:");\r
        PrintAndLog("      h    this help");\r
        PrintAndLog("      u    (Optional) UID 4,7 or 10bytes. If not specified, the UID 4b from emulator memory will be used");\r
        PrintAndLog("      n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");\r
        PrintAndLog("      i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");\r
        PrintAndLog("options:");\r
        PrintAndLog("      h    this help");\r
        PrintAndLog("      u    (Optional) UID 4,7 or 10bytes. If not specified, the UID 4b from emulator memory will be used");\r
        PrintAndLog("      n    (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");\r
        PrintAndLog("      i    (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");\r

-       PrintAndLog("      x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");\r
-       PrintAndLog("      e    (Optional) Fill simulator keys from what we crack");\r
-       PrintAndLog("      v    (Optional) Show maths used for cracking reader. Useful for debugging.");\r
+       PrintAndLog("      x    (Optional) Crack, performs the 'reader attack', nr/ar attack against a reader");\r
+       PrintAndLog("      e    (Optional) Fill simulator keys from found keys");\r
+       PrintAndLog("      v    (Optional) Verbose");\r

        PrintAndLog("samples:");\r
        PrintAndLog("           hf mf sim u 0a0a0a0a");\r
        PrintAndLog("           hf mf sim u 11223344556677");\r
        PrintAndLog("           hf mf sim u 112233445566778899AA");     \r
        PrintAndLog("samples:");\r
        PrintAndLog("           hf mf sim u 0a0a0a0a");\r
        PrintAndLog("           hf mf sim u 11223344556677");\r
        PrintAndLog("           hf mf sim u 112233445566778899AA");     \r

+       PrintAndLog("           hf mf sim u 11223344 i x");     \r

        return 0;\r
 }\r
 int usage_hf14_dbg(void){\r
        return 0;\r
 }\r
 int usage_hf14_dbg(void){\r


@@ -225,7 +226,7 @@ start:
                        c.arg[0] = false;\r
                        goto start;\r
                } else {\r
                        c.arg[0] = false;\r
                        goto start;\r
                } else {\r

-                       PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
+                       PrintAndLog("Found valid key: %012" PRIx64 " \n", r_key);\r

                        goto END;\r
                }\r
        }\r
                        goto END;\r
                }\r
        }\r


@@ -245,10 +246,10 @@ start:
                uint64_t key64 = 0;\r
                int res = mfCheckKeys(blockNo, keytype - 0x60 , false, 1, keyblock, &key64);\r
                if ( res > 0 ) {\r
                uint64_t key64 = 0;\r
                int res = mfCheckKeys(blockNo, keytype - 0x60 , false, 1, keyblock, &key64);\r
                if ( res > 0 ) {\r

-                       PrintAndLog("Candidate Key found (%012"llx") - Test authentication failed. [%d] Restarting darkside attack", r_key, res);       \r
+                       PrintAndLog("Candidate Key found (%012" PRIx64 ") - Test authentication failed. [%d] Restarting darkside attack", r_key, res);  \r

                        goto start;\r
                }\r
                        goto start;\r
                }\r

-               PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
+               PrintAndLog("Found valid key: %012" PRIx64 " \n", r_key);\r

        }\r
 END:\r
        t1 = clock() - t1;\r
        }\r
 END:\r
        t1 = clock() - t1;\r


@@ -312,9 +313,7 @@ int CmdHF14AMfRdBl(const char *Cmd) {
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r

-       \r
-       char cmdp       = 0x00;\r
-\r
+       char cmdp = 0x00;\r

 \r
        if (strlen(Cmd)<3) {\r
                PrintAndLog("Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");\r
 \r
        if (strlen(Cmd)<3) {\r
                PrintAndLog("Usage:  hf mf rdbl    <block number> <key A/B> <key (12 hex symbols)>");\r


@@ -341,7 +340,7 @@ int CmdHF14AMfRdBl(const char *Cmd) {
        SendCommand(&c);\r
 \r
        UsbCommand resp;\r
        SendCommand(&c);\r
 \r
        UsbCommand resp;\r

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

                uint8_t isOK  = resp.arg[0] & 0xff;\r
                uint8_t *data = resp.d.asBytes;\r
 \r
                uint8_t isOK  = resp.arg[0] & 0xff;\r
                uint8_t *data = resp.d.asBytes;\r
 \r


@@ -471,10 +470,9 @@ int CmdHF14AMfDump(const char *Cmd) {
        size_t bytes_read;\r
        for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
                bytes_read = fread( keyA[sectorNo], 1, 6, fin );\r
        size_t bytes_read;\r
        for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
                bytes_read = fread( keyA[sectorNo], 1, 6, fin );\r

-               if ( bytes_read == 0) {\r
+               if ( bytes_read != 6) {\r

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

-                       fin = NULL;\r

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


@@ -482,22 +480,21 @@ int CmdHF14AMfDump(const char *Cmd) {
        // Read keys B from file\r
        for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
                bytes_read = fread( keyB[sectorNo], 1, 6, fin );\r
        // Read keys B from file\r
        for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
                bytes_read = fread( keyB[sectorNo], 1, 6, fin );\r

-               if ( bytes_read == 0) {\r
+               if ( bytes_read != 6) {\r

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

-                       fin = NULL;\r

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

-       fin = NULL;\r

                        \r
        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|------ Reading sector access bits...-----|");\r
        PrintAndLog("|-----------------------------------------|");\r
                        \r
        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|------ Reading sector access bits...-----|");\r
        PrintAndLog("|-----------------------------------------|");\r

-       \r
+       uint8_t tries = 0;\r

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

+               for (tries = 0; tries < 3; tries++) {           \r

                UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};\r
                memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
                clearCommandBuffer();\r
                UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};\r
                memcpy(c.d.asBytes, keyA[sectorNo], 6);\r
                clearCommandBuffer();\r


@@ -511,7 +508,8 @@ int CmdHF14AMfDump(const char *Cmd) {
                                rights[sectorNo][1] = ((data[7] & 0x20)>>3) | ((data[8] & 0x2)<<0) | ((data[8] & 0x20)>>5); // C1C2C3 for data area 1\r
                                rights[sectorNo][2] = ((data[7] & 0x40)>>4) | ((data[8] & 0x4)>>1) | ((data[8] & 0x40)>>6); // C1C2C3 for data area 2\r
                                rights[sectorNo][3] = ((data[7] & 0x80)>>5) | ((data[8] & 0x8)>>2) | ((data[8] & 0x80)>>7); // C1C2C3 for sector trailer\r
                                rights[sectorNo][1] = ((data[7] & 0x20)>>3) | ((data[8] & 0x2)<<0) | ((data[8] & 0x20)>>5); // C1C2C3 for data area 1\r
                                rights[sectorNo][2] = ((data[7] & 0x40)>>4) | ((data[8] & 0x4)>>1) | ((data[8] & 0x40)>>6); // C1C2C3 for data area 2\r
                                rights[sectorNo][3] = ((data[7] & 0x80)>>5) | ((data[8] & 0x8)>>2) | ((data[8] & 0x80)>>7); // C1C2C3 for sector trailer\r

-                       } else {\r
+                                       break;\r
+                               } else if (tries == 2) { // on last try set defaults\r

                                PrintAndLog("Could not get access rights for sector %2d. Trying with defaults...", sectorNo);\r
                                rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;\r
                                rights[sectorNo][3] = 0x01;\r
                                PrintAndLog("Could not get access rights for sector %2d. Trying with defaults...", sectorNo);\r
                                rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;\r
                                rights[sectorNo][3] = 0x01;\r


@@ -522,6 +520,7 @@ int CmdHF14AMfDump(const char *Cmd) {
                        rights[sectorNo][3] = 0x01;\r
                }\r
        }\r
                        rights[sectorNo][3] = 0x01;\r
                }\r
        }\r

+       }\r

        \r
        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|----- Dumping all blocks to file... -----|");\r
        \r
        PrintAndLog("|-----------------------------------------|");\r
        PrintAndLog("|----- Dumping all blocks to file... -----|");\r


@@ -531,7 +530,7 @@ int CmdHF14AMfDump(const char *Cmd) {
        for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {\r
                for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r
                        bool received = false;\r
        for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {\r
                for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r
                        bool received = false;\r

-                       \r
+                       for (tries = 0; tries < 3; tries++) {                   \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
                        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


@@ -548,12 +547,18 @@ int CmdHF14AMfDump(const char *Cmd) {
                                } else if (rights[sectorNo][data_area] == 0x07) {                                                                               // no key would work\r
                                        isOK = false;\r
                                        PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);\r
                                } else if (rights[sectorNo][data_area] == 0x07) {                                                                               // no key would work\r
                                        isOK = false;\r
                                        PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);\r

+                                               tries = 2;\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
                                } 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
+                               }\r
+                               if (received) {\r
+                                       isOK  = resp.arg[0] & 0xff;\r
+                                       if (isOK) break;\r

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


@@ -598,7 +603,6 @@ int CmdHF14AMfDump(const char *Cmd) {
                uint16_t numblocks = FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1);\r
                fwrite(carddata, 1, 16*numblocks, fout);\r
                fclose(fout);\r
                uint16_t numblocks = FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1);\r
                fwrite(carddata, 1, 16*numblocks, fout);\r
                fclose(fout);\r

-               fout = NULL;            \r

                PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);\r
        }\r
                \r
                PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);\r
        }\r
                \r


@@ -644,20 +648,18 @@ int CmdHF14AMfRestore(const char *Cmd) {
        size_t bytes_read;\r
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );\r
        size_t bytes_read;\r
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );\r

-               if ( bytes_read == 0) {\r
+               if ( bytes_read != 6) {\r

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

-                       fkeys = NULL;\r

                        return 2;\r
                }\r
        }\r
 \r
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                bytes_read = fread( keyB[sectorNo], 1, 6, fkeys );\r
                        return 2;\r
                }\r
        }\r
 \r
        for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
                bytes_read = fread( keyB[sectorNo], 1, 6, fkeys );\r

-               if ( bytes_read == 0) {\r
+               if ( bytes_read != 6) {\r

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

-                       fkeys = NULL;\r

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


@@ -675,7 +677,7 @@ int CmdHF14AMfRestore(const char *Cmd) {
                        UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};\r
                        memcpy(c.d.asBytes, key, 6);                    \r
                        bytes_read = fread(bldata, 1, 16, fdump);\r
                        UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};\r
                        memcpy(c.d.asBytes, key, 6);                    \r
                        bytes_read = fread(bldata, 1, 16, fdump);\r

-                       if ( bytes_read == 0) {\r
+                       if ( bytes_read != 16) {\r

                                PrintAndLog("File reading error (dumpdata.bin).");\r
                                fclose(fdump);\r
                                fdump = NULL;                           \r
                                PrintAndLog("File reading error (dumpdata.bin).");\r
                                fclose(fdump);\r
                                fdump = NULL;                           \r


@@ -714,13 +716,12 @@ int CmdHF14AMfRestore(const char *Cmd) {
        }\r
        \r
        fclose(fdump);\r
        }\r
        \r
        fclose(fdump);\r

-       fdump = NULL;   \r

        return 0;\r
 }\r
 \r
 int CmdHF14AMfNested(const char *Cmd) {\r
        int i, j, res, iterations;\r
        return 0;\r
 }\r
 \r
 int CmdHF14AMfNested(const char *Cmd) {\r
        int i, j, res, iterations;\r

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

        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t trgBlockNo = 0;\r
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t trgBlockNo = 0;\r


@@ -790,7 +791,7 @@ int CmdHF14AMfNested(const char *Cmd) {
                switch (isOK) {\r
                        case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r
                        case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\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 (its random number generator is not predictable).\n"); break;\r
+                       case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random number generator is not predictable).\n"); break;\r

                        case -4 : PrintAndLog("No valid key found"); break;\r
                        case -5 : \r
                                key64 = bytes_to_num(keyBlock, 6);\r
                        case -4 : PrintAndLog("No valid key found"); break;\r
                        case -5 : \r
                                key64 = bytes_to_num(keyBlock, 6);\r


@@ -822,7 +823,7 @@ int CmdHF14AMfNested(const char *Cmd) {
                time_t start, end;\r
                time(&start);\r
                \r
                time_t start, end;\r
                time(&start);\r
                \r

-               e_sector = calloc(SectorsCnt, sizeof(sector));\r
+               e_sector = calloc(SectorsCnt, sizeof(sector_t));\r

                if (e_sector == NULL) return 1;\r
                \r
                //test current key and additional standard keys first\r
                if (e_sector == NULL) return 1;\r
                \r
                //test current key and additional standard keys first\r


@@ -1082,7 +1083,7 @@ 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
+       sector_t *e_sector = NULL;\r

        \r
        int i, res;\r
        int     keycnt = 0;\r
        \r
        int i, res;\r
        int     keycnt = 0;\r


@@ -1206,7 +1207,7 @@ int CmdHF14AMfChk(const char *Cmd) {
                                        }\r
                                        memset(keyBlock + 6 * keycnt, 0, 6);\r
                                        num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);\r
                                        }\r
                                        memset(keyBlock + 6 * keycnt, 0, 6);\r
                                        num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);\r

-                                       PrintAndLog("check key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
+                                       PrintAndLog("check key[%2d] %012" PRIx64, 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


@@ -1229,7 +1230,7 @@ int CmdHF14AMfChk(const char *Cmd) {
        }\r
        \r
        // initialize storage for found keys\r
        }\r
        \r
        // initialize storage for found keys\r

-       e_sector = calloc(SectorsCnt, sizeof(sector));\r
+       e_sector = calloc(SectorsCnt, sizeof(sector_t));\r

        if (e_sector == NULL) {\r
                free(keyBlock);\r
                return 1;\r
        if (e_sector == NULL) {\r
                free(keyBlock);\r
                return 1;\r


@@ -1360,18 +1361,16 @@ int CmdHF14AMfChk(const char *Cmd) {
        PrintAndLog("");\r
        return 0;\r
 }\r
        PrintAndLog("");\r
        return 0;\r
 }\r

-#define ATTACK_KEY_COUNT 8\r
-sector *k_sector = NULL;\r
+\r
+sector_t *k_sector = NULL;\r

 uint8_t k_sectorsCount = 16;\r
 uint8_t k_sectorsCount = 16;\r

-void readerAttack(nonces_t data[], bool setEmulatorMem, bool verbose) {\r
+static void emptySectorTable(){\r

 \r
        // initialize storage for found keys\r
        if (k_sector == NULL)\r
 \r
        // initialize storage for found keys\r
        if (k_sector == NULL)\r

-               k_sector = calloc(k_sectorsCount, sizeof(sector));\r
+               k_sector = calloc(k_sectorsCount, sizeof(sector_t));\r

        if (k_sector == NULL) \r
                return;\r
        if (k_sector == NULL) \r
                return;\r

-\r
-       uint64_t key = 0;\r

                \r
        // empty e_sector\r
        for(int i = 0; i < k_sectorsCount; ++i){\r
                \r
        // empty e_sector\r
        for(int i = 0; i < k_sectorsCount; ++i){\r


@@ -1380,67 +1379,47 @@ void readerAttack(nonces_t data[], bool setEmulatorMem, bool verbose) {
                k_sector[i].foundKey[0] = FALSE;\r
                k_sector[i].foundKey[1] = FALSE;\r
        }\r
                k_sector[i].foundKey[0] = FALSE;\r
                k_sector[i].foundKey[1] = FALSE;\r
        }\r

+}\r
+void showSectorTable(){\r
+       if (k_sector != NULL) {\r
+               printKeyTable(k_sectorsCount, k_sector);\r
+               free(k_sector);\r
+               k_sector = NULL;\r
+       }\r
+}\r
+void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) {\r

 \r
 \r

-       printf("enter reader attack\n");\r
-       for (uint8_t i = 0; i < ATTACK_KEY_COUNT; ++i) {\r
-               \r
-               // if no-collected data \r
-               if (data[i].ar2 == 0) continue;\r
-\r
-               // We can probably skip this, mfkey32v2 is more reliable.\r
-#ifdef HFMF_TRYMFK32\r
-               if (tryMfk32(data[i], &key, verbose)) {\r
-                       PrintAndLog("Found Key%s for sector %02d: [%012"llx"]"\r
-                               , (data[i].keytype) ? "B" : "A"\r
-                               , data[i].sector\r
-                               , key\r
-                       );\r
-\r
-                       k_sector[i].Key[data[i].keytype] = key;\r
-                       k_sector[i].foundKey[data[i].keytype] = TRUE;\r
-                       \r
-                       //set emulator memory for keys\r
-                       if (setEmulatorMem) {\r
-                               uint8_t memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};\r
-                               num_to_bytes( k_sector[i].Key[0], 6, memBlock);\r
-                               num_to_bytes( k_sector[i].Key[1], 6, memBlock+10);\r
-                               PrintAndLog("Setting Emulator Memory Block %02d: [%s]"\r
-                                       , ((data[i].sector)*4) + 3\r
-                                       , sprint_hex( memBlock, sizeof(memBlock))\r
-                                       );\r
-                               mfEmlSetMem( memBlock, ((data[i].sector)*4) + 3, 1);\r
-                       }\r
-                       continue;\r
-               }\r
-#endif\r
-               \r
-               //moebius attack                        \r
-               if (tryMfk32_moebius(data[i+ATTACK_KEY_COUNT], &key, verbose)) {\r
-                       uint8_t sectorNum = data[i+ATTACK_KEY_COUNT].sector;\r
-                       uint8_t keyType = data[i+ATTACK_KEY_COUNT].keytype;\r
-\r
-                       PrintAndLog("Found Key%s for sector %02d: [%012"llx"]"\r
-                               , keyType ? "B" : "A"\r
-                               , sectorNum\r
-                               , key\r
-                       );\r
-\r
-                       k_sector[sectorNum].Key[keyType] = key;\r
-                       k_sector[sectorNum].foundKey[keyType] = TRUE;\r
-\r
-                       //set emulator memory for keys\r
-                       if (setEmulatorMem) {\r
-                               uint8_t memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};\r
-                               num_to_bytes( k_sector[sectorNum].Key[0], 6, memBlock);\r
-                               num_to_bytes( k_sector[sectorNum].Key[1], 6, memBlock+10);\r
-                               //iceman,  guessing this will not work so well for 4K tags.\r
-                               PrintAndLog("Setting Emulator Memory Block %02d: [%s]"\r
-                                       , (sectorNum*4) + 3\r
-                                       , sprint_hex( memBlock, sizeof(memBlock))\r
-                                       );\r
-                               mfEmlSetMem( memBlock, (sectorNum*4) + 3, 1);\r
-                       }\r
-                       continue;\r
+       uint64_t key = 0;       \r
+       bool success = FALSE;\r
+       \r
+       if (k_sector == NULL)\r
+               emptySectorTable();\r
+\r
+       success = tryMfk32_moebius(data, &key, verbose);\r
+       if (success) {\r
+               uint8_t sector = data.sector;\r
+               uint8_t keytype = data.keytype;\r
+\r
+               PrintAndLog("Reader is trying authenticate with: Key %s, sector %02d: [%012" PRIx64 "]"\r
+                       , keytype ? "B" : "A"\r
+                       , sector\r
+                       , key\r
+               );\r
+\r
+               k_sector[sector].Key[keytype] = key;\r
+               k_sector[sector].foundKey[keytype] = TRUE;\r
+\r
+               //set emulator memory for keys\r
+               if (setEmulatorMem) {\r
+                       uint8_t memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};\r
+                       num_to_bytes( k_sector[sector].Key[0], 6, memBlock);\r
+                       num_to_bytes( k_sector[sector].Key[1], 6, memBlock+10);\r
+                       //iceman,  guessing this will not work so well for 4K tags.\r
+                       PrintAndLog("Setting Emulator Memory Block %02d: [%s]"\r
+                               , (sector*4) + 3\r
+                               , sprint_hex( memBlock, sizeof(memBlock))\r
+                               );\r
+                       mfEmlSetMem( memBlock, (sector*4) + 3, 1);\r

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


@@ -1451,18 +1430,17 @@ int CmdHF14AMf1kSim(const char *Cmd) {
        uint8_t exitAfterNReads = 0;\r
        uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);\r
        int uidlen = 0;\r
        uint8_t exitAfterNReads = 0;\r
        uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);\r
        int uidlen = 0;\r

-       bool setEmulatorMem = false;\r

        uint8_t cmdp = 0;\r
        uint8_t cmdp = 0;\r

-       bool errors = false;\r
-\r
-       // If set to true, we should show our workings when doing NR_AR_ATTACK.\r
-       bool verbose = false;\r
-\r
+       bool errors = FALSE;\r
+       bool verbose = FALSE;\r
+       bool setEmulatorMem = FALSE;\r
+       nonces_t data[1];\r
+               \r

        while(param_getchar(Cmd, cmdp) != 0x00) {\r
                switch(param_getchar(Cmd, cmdp)) {\r
                case 'e':\r
                case 'E':\r
        while(param_getchar(Cmd, cmdp) != 0x00) {\r
                switch(param_getchar(Cmd, cmdp)) {\r
                case 'e':\r
                case 'E':\r

-                       setEmulatorMem = true;\r
+                       setEmulatorMem = TRUE;\r

                        cmdp++;\r
                        break;\r
                case 'h':\r
                        cmdp++;\r
                        break;\r
                case 'h':\r


@@ -1487,11 +1465,11 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                                case  8: flags = FLAG_4B_UID_IN_DATA; break;\r
                                default: return usage_hf14_mf1ksim();\r
                        }\r
                                case  8: flags = FLAG_4B_UID_IN_DATA; break;\r
                                default: return usage_hf14_mf1ksim();\r
                        }\r

-                       cmdp +=2;\r
+                       cmdp += 2;\r

                        break;\r
                case 'v':\r
                case 'V':\r
                        break;\r
                case 'v':\r
                case 'V':\r

-                       verbose = true;\r
+                       verbose = TRUE;\r

                        cmdp++;\r
                        break;\r
                case 'x':\r
                        cmdp++;\r
                        break;\r
                case 'x':\r


@@ -1501,7 +1479,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                        break;\r
                default:\r
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
                        break;\r
                default:\r
                        PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r

-                       errors = true;\r
+                       errors = TRUE;\r

                        break;\r
                }\r
                if(errors) break;\r
                        break;\r
                }\r
                if(errors) break;\r


@@ -1519,28 +1497,20 @@ int CmdHF14AMf1kSim(const char *Cmd) {
        memcpy(c.d.asBytes, uid, sizeof(uid));\r
        clearCommandBuffer();\r
        SendCommand(&c);\r
        memcpy(c.d.asBytes, uid, sizeof(uid));\r
        clearCommandBuffer();\r
        SendCommand(&c);\r

+       UsbCommand resp;                \r

 \r
 \r

-       if(flags & FLAG_INTERACTIVE) {          \r
+       if(flags & FLAG_INTERACTIVE) {\r

                PrintAndLog("Press pm3-button or send another cmd to abort simulation");\r
 \r
                PrintAndLog("Press pm3-button or send another cmd to abort simulation");\r
 \r

-               nonces_t data[ATTACK_KEY_COUNT*2];\r
-               UsbCommand resp;                \r
-\r

                while( !ukbhit() ){\r
                        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;\r
                while( !ukbhit() ){\r
                        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;\r

-\r

                        if ( !(flags & FLAG_NR_AR_ATTACK) ) break;\r
                        if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;\r
 \r
                        if ( !(flags & FLAG_NR_AR_ATTACK) ) break;\r
                        if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;\r
 \r

-                       memcpy( data, resp.d.asBytes, sizeof(data) );                   \r
-                       readerAttack(data, setEmulatorMem, verbose);\r
-               }\r
-               \r
-               if (k_sector != NULL) {\r
-                       printKeyTable(k_sectorsCount, k_sector );\r
-                       free(k_sector);\r
-                       k_sector = NULL;\r
+                       memcpy(data, resp.d.asBytes, sizeof(data));\r
+                       readerAttack(data[0], setEmulatorMem, verbose);\r

                }\r
                }\r

+               showSectorTable();\r

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


@@ -1616,7 +1586,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 \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

-                                       if (traceLen > bufsize) {\r
+                                       if (traceLen > bufsize || buf == NULL) {\r

                                                uint8_t *p;\r
                                                if (buf == NULL)                                // not yet allocated\r
                                                        p = malloc(traceLen);\r
                                                uint8_t *p;\r
                                                if (buf == NULL)                                // not yet allocated\r
                                                        p = malloc(traceLen);\r


@@ -1737,7 +1707,7 @@ int CmdHF14AMfKeyBrute(const char *Cmd) {
        time(&start);\r
        \r
        if (mfKeyBrute( blockNo, keytype, key, &foundkey))\r
        time(&start);\r
        \r
        if (mfKeyBrute( blockNo, keytype, key, &foundkey))\r

-               PrintAndLog("Found valid key: %012"llx" \n", foundkey);\r
+               PrintAndLog("Found valid key: %012" PRIx64 " \n", foundkey);\r

        else\r
                PrintAndLog("Key not found");\r
        \r
        else\r
                PrintAndLog("Key not found");\r
        \r


@@ -1750,12 +1720,12 @@ int CmdHF14AMfKeyBrute(const char *Cmd) {
        return 0;       \r
 }\r
 \r
        return 0;       \r
 }\r
 \r

-void printKeyTable( uint8_t sectorscnt, sector *e_sector ){\r
+void printKeyTable( uint8_t sectorscnt, sector_t *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("|---|----------------|---|----------------|---|");\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
+               PrintAndLog("|%03d|  %012" PRIx64 "  | %d |  %012" PRIx64 "  | %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
                        e_sector[i].Key[0], e_sector[i].foundKey[0], \r
                        e_sector[i].Key[1], e_sector[i].foundKey[1]\r
                );\r


@@ -1804,7 +1774,6 @@ int CmdHF14AMfESet(const char *Cmd)
 {\r
        uint8_t memBlock[16];\r
        uint8_t blockNo = 0;\r
 {\r
        uint8_t memBlock[16];\r
        uint8_t blockNo = 0;\r

-\r

        memset(memBlock, 0x00, sizeof(memBlock));\r
 \r
        if (strlen(Cmd) < 3 || param_getchar(Cmd, 0) == 'h') {\r
        memset(memBlock, 0x00, sizeof(memBlock));\r
 \r
        if (strlen(Cmd) < 3 || param_getchar(Cmd, 0) == 'h') {\r


@@ -2086,7 +2055,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
                }\r
                keyA = bytes_to_num(data, 6);\r
                keyB = bytes_to_num(data + 10, 6);\r
                }\r
                keyA = bytes_to_num(data, 6);\r
                keyB = bytes_to_num(data + 10, 6);\r

-               PrintAndLog("|%03d|  %012"llx"  |  %012"llx"  |", i, keyA, keyB);\r
+               PrintAndLog("|%03d|  %012" PRIx64 "  |  %012" PRIx64 "  |", i, keyA, keyB);\r

        }\r
        PrintAndLog("|---|----------------|----------------|");\r
        \r
        }\r
        PrintAndLog("|---|----------------|----------------|");\r
        \r