CHG: 'hf 14a sim e' - it now has a parameter for setfoundkeys to emulator memory.

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index ea73bf959f4b926957a09d772cd5815da326c80b..36438d7fdd5d09fa073b97fa24ad8bf44b0c0405 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


@@ -214,14 +215,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


@@ -229,10 +230,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


@@ -248,7 +246,7 @@ 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. Starting over darkside attack", r_key);      \r
+                       PrintAndLog("Candidate Key found (%012"llx") - Test authentication failed. [%d] Restarting darkside attack", r_key, res);       \r

                        goto start;\r
                }\r
                PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
                        goto start;\r
                }\r
                PrintAndLog("Found valid key: %012"llx" \n", r_key);\r


@@ -1060,7 +1058,8 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
                        slow ? "Yes" : "No",\r
                        tests);\r
 \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
+       uint64_t foundkey = 0;\r
+       int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key ? trgkey : NULL, nonce_file_read, nonce_file_write, slow, tests, &foundkey);\r

 \r
        if (isOK) {\r
                switch (isOK) {\r
 \r
        if (isOK) {\r
                switch (isOK) {\r


@@ -1365,7 +1364,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, bool showMaths) {\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


@@ -1383,64 +1382,67 @@ void readerAttack(nonces_t data[], bool setEmulatorMem, bool showMaths) {
                k_sector[i].foundKey[1] = FALSE;\r
        }\r
 \r
                k_sector[i].foundKey[1] = FALSE;\r
        }\r
 \r

-       printf("enter reader attack\n");\r
+       if (verbose) printf("enter Moebius attack (mfkey32v2) \n");\r
+       \r

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

-               if (data[i].ar2 > 0) {\r
+               \r
+               // if no-collected data \r
+               if (data[i].ar2 == 0) continue;\r

 \r
 \r

-                       // We can probably skip this, mfkey32v2 is more reliable.\r
+               // We can probably skip this, mfkey32v2 is more reliable.\r

 #ifdef HFMF_TRYMFK32\r
 #ifdef HFMF_TRYMFK32\r

-                       if (tryMfk32(data[i], &key)) {\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
+               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
                        }\r

+                       continue;\r
+               }\r

 #endif\r
 #endif\r

-                       //moebius attack                        \r
-                       if (tryMfk32_moebius(data[i+ATTACK_KEY_COUNT], &key, showMaths)) {\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
+               //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("Reader is trying authenticate with: Key %s, 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
                        }\r

-\r
+                       continue;\r

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


@@ -1456,7 +1458,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
        bool errors = false;\r
 \r
        // If set to true, we should show our workings when doing NR_AR_ATTACK.\r
        bool errors = false;\r
 \r
        // If set to true, we should show our workings when doing NR_AR_ATTACK.\r

-       bool showMaths = false;\r
+       bool verbose = false;\r

 \r
        while(param_getchar(Cmd, cmdp) != 0x00) {\r
                switch(param_getchar(Cmd, cmdp)) {\r
 \r
        while(param_getchar(Cmd, cmdp) != 0x00) {\r
                switch(param_getchar(Cmd, cmdp)) {\r


@@ -1491,7 +1493,7 @@ int CmdHF14AMf1kSim(const char *Cmd) {
                        break;\r
                case 'v':\r
                case 'V':\r
                        break;\r
                case 'v':\r
                case 'V':\r

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

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


@@ -1528,16 +1530,15 @@ int CmdHF14AMf1kSim(const char *Cmd) {
 \r
                while( !ukbhit() ){\r
                        if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;\r
 \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
                        memcpy( data, resp.d.asBytes, sizeof(data) );                   \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, showMaths);\r
+                       readerAttack(data, setEmulatorMem, verbose);\r

                }\r
                \r
                if (k_sector != NULL) {\r
                }\r
                \r
                if (k_sector != NULL) {\r

-                       printKeyTable(k_sectorsCount, k_sector );\r
+                       printKeyTable(k_sectorsCount, k_sector);\r

                        free(k_sector);\r
                        k_sector = NULL;\r
                }\r
                        free(k_sector);\r
                        k_sector = NULL;\r
                }\r