FIX: 'LF PYRAMID' the crc8_MAXIM and crc16_DNP was calling the wrong crc method....

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index dc8f78982dca416c58f756928932077760d9678a..7114945d6744906fedd8455e1e9a3dc5e12ba0fa 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -31,6 +31,8 @@ int usage_hf14_mf1ksim(void){
        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("      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("samples:");\r
        PrintAndLog("           hf mf sim u 0a0a0a0a");\r
        PrintAndLog("           hf mf sim u 11223344556677");\r
        PrintAndLog("samples:");\r
        PrintAndLog("           hf mf sim u 0a0a0a0a");\r
        PrintAndLog("           hf mf sim u 11223344556677");\r


@@ -212,14 +214,14 @@ start:
                }\r
        }       \r
        printf("\n");\r
                }\r
        }       \r
        printf("\n");\r

+       // error\r
+       if (isOK != 1) return 1;\r

        \r
        \r

-       // par == 0,  and -4\r
-       if (isOK == -4 && par_list == 0) {\r
+       if (par_list == 0 && ks_list != 0) {\r

                // this special attack when parities is zero, uses checkkeys. Which now with block/keytype option also needs. \r
                // but it uses 0|1 instead of 0x60|0x61...\r
                if (nonce2key_ex(blockNo, keytype - 0x60 , uid, nt, nr, ks_list, &r_key) ){\r
                // this special attack when parities is zero, uses checkkeys. Which now with block/keytype option also needs. \r
                // but it uses 0|1 instead of 0x60|0x61...\r
                if (nonce2key_ex(blockNo, keytype - 0x60 , uid, nt, nr, ks_list, &r_key) ){\r

-                       PrintAndLog("Key not found (lfsr_common_prefix list is null).");        \r
-                       PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");\r
+                       PrintAndLog("Trying again with a different reader nonce...");\r

                        c.arg[0] = false;\r
                        goto start;\r
                } else {\r
                        c.arg[0] = false;\r
                        goto start;\r
                } else {\r


@@ -227,10 +229,7 @@ start:
                        goto END;\r
                }\r
        }\r
                        goto END;\r
                }\r
        }\r

-       \r
-       // error\r
-       if (isOK != 1) return 1;\r
-       \r
+\r

        // execute original function from util nonce2key\r
        if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {\r
                isOK = 2;\r
        // execute original function from util nonce2key\r
        if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {\r
                isOK = 2;\r


@@ -1363,7 +1362,7 @@ int CmdHF14AMfChk(const char *Cmd) {
 #define ATTACK_KEY_COUNT 8\r
 sector *k_sector = NULL;\r
 uint8_t k_sectorsCount = 16;\r
 #define ATTACK_KEY_COUNT 8\r
 sector *k_sector = NULL;\r
 uint8_t k_sectorsCount = 16;\r

-void readerAttack(nonces_t data[], bool setEmulatorMem) {\r
+void readerAttack(nonces_t data[], bool setEmulatorMem, bool verbose) {\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


@@ -1384,8 +1383,10 @@ void readerAttack(nonces_t data[], bool setEmulatorMem) {
        printf("enter reader attack\n");\r
        for (uint8_t i = 0; i < ATTACK_KEY_COUNT; ++i) {\r
                if (data[i].ar2 > 0) {\r
        printf("enter reader attack\n");\r
        for (uint8_t i = 0; i < ATTACK_KEY_COUNT; ++i) {\r
                if (data[i].ar2 > 0) {\r

-                       \r
-                       if (tryMfk32(data[i], &key)) {\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
                                PrintAndLog("Found Key%s for sector %02d: [%012"llx"]"\r
                                        , (data[i].keytype) ? "B" : "A"\r
                                        , data[i].sector\r


@@ -1400,22 +1401,43 @@ void readerAttack(nonces_t data[], bool setEmulatorMem) {
                                        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
                                        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

-                                       mfEmlSetMem( memBlock, i*4 + 3, 1);\r

                                        PrintAndLog("Setting Emulator Memory Block %02d: [%s]"\r
                                        PrintAndLog("Setting Emulator Memory Block %02d: [%s]"\r

-                                               , i*4 + 3\r
+                                               , ((data[i].sector)*4) + 3\r

                                                , sprint_hex( memBlock, sizeof(memBlock))\r
                                                );\r
                                                , sprint_hex( memBlock, sizeof(memBlock))\r
                                                );\r

+                                       mfEmlSetMem( memBlock, ((data[i].sector)*4) + 3, 1);\r

                                }\r
                                }\r

-                               break;\r
+                               continue;\r

                        }\r
                        }\r

+#endif\r

                        //moebius attack                        \r
                        //moebius attack                        \r

-                       // if (tryMfk32_moebius(data[i+ATTACK_KEY_COUNT], &key)) {\r
-                               // PrintAndLog("M-Found Key%s for sector %02d: [%012"llx"]"\r
-                                       // ,(data[i+ATTACK_KEY_COUNT].keytype) ? "B" : "A"\r
-                                       // , data[i+ATTACK_KEY_COUNT].sector\r
-                                       // , key\r
-                               // );\r
-                       // }\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("M-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
+                                       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
+                       }\r
+\r

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


@@ -1425,11 +1447,14 @@ int CmdHF14AMf1kSim(const char *Cmd) {
        uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};\r
        uint8_t exitAfterNReads = 0;\r
        uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);\r
        uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};\r
        uint8_t exitAfterNReads = 0;\r
        uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA);\r

-       int uidlen = 0; \r
+       int uidlen = 0;\r

        bool setEmulatorMem = false;\r
        uint8_t cmdp = 0;\r
        bool errors = false;\r
 \r
        bool setEmulatorMem = false;\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

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


@@ -1461,6 +1486,11 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                        }\r
                        cmdp +=2;\r
                        break;\r
                        }\r
                        cmdp +=2;\r
                        break;\r

+               case 'v':\r
+               case 'V':\r
+                       verbose = true;\r
+                       cmdp++;\r
+                       break;\r

                case 'x':\r
                case 'X':\r
                        flags |= FLAG_NR_AR_ATTACK;\r
                case 'x':\r
                case 'X':\r
                        flags |= FLAG_NR_AR_ATTACK;\r


@@ -1500,12 +1530,13 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                        if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;\r
 \r
                        memcpy( data, resp.d.asBytes, sizeof(data) );                   \r
                        if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;\r
 \r
                        memcpy( data, resp.d.asBytes, sizeof(data) );                   \r

-                       readerAttack(data, setEmulatorMem);\r
+                       readerAttack(data, setEmulatorMem, verbose);\r

                }\r
                \r
                if (k_sector != NULL) {\r
                        printKeyTable(k_sectorsCount, k_sector );\r
                        free(k_sector);\r
                }\r
                \r
                if (k_sector != NULL) {\r
                        printKeyTable(k_sectorsCount, k_sector );\r
                        free(k_sector);\r

+                       k_sector = NULL;\r

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