]> cvs.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmf.c
ADD: @donwan581 select keytype for the darkside attack.
[proxmark3-svn] / client / cmdhfmf.c
index 9b43f4118289ae109c2e8e9860ff4cf51146e3dc..1988fa16b74927ddc7aad948feda929408a5d38e 100644 (file)
@@ -9,18 +9,18 @@
 //-----------------------------------------------------------------------------\r
 \r
 #include "cmdhfmf.h"\r
-#include "cmdhfmfhard.h"\r
-#include "nonce2key/nonce2key.h"\r
 \r
 static int CmdHelp(const char *Cmd);\r
 int usage_hf14_mifare(void){\r
-       PrintAndLog("Usage:  hf mf mifare [h] <block number>");\r
+       PrintAndLog("Usage:  hf mf mifare [h] <block number> <A|B>");\r
        PrintAndLog("options:");\r
-       PrintAndLog("           h    this help");\r
-       PrintAndLog("           <block number>  (Optional) target other key A than block 0.");\r
+       PrintAndLog("      h               this help");\r
+       PrintAndLog("      <block number>  (Optional) target other block");\r
+       PrintAndLog("      <A|B>           (optional) target key type");\r
        PrintAndLog("samples:");\r
        PrintAndLog("           hf mf mifare");\r
        PrintAndLog("           hf mf mifare 16");\r
+       PrintAndLog("           hf mf mifare 16 B");\r
        return 0;\r
 }\r
 int usage_hf14_mf1ksim(void){\r
@@ -132,13 +132,18 @@ int CmdHF14AMifare(const char *Cmd) {
        uint64_t par_list = 0, ks_list = 0, r_key = 0;\r
        int16_t isOK = 0;\r
        int tmpchar; \r
-       uint8_t blockNo = 0;\r
+       uint8_t blockNo = 0, keytype = MIFARE_AUTH_KEYA;\r
        \r
        char cmdp = param_getchar(Cmd, 0);      \r
        if ( cmdp == 'H' || cmdp == 'h') return usage_hf14_mifare();\r
        \r
-       blockNo = param_get8(Cmd, 0);\r
-       UsbCommand c = {CMD_READER_MIFARE, {true, blockNo, 0}};\r
+       blockNo = param_get8(Cmd, 0);    \r
+       \r
+       cmdp = param_getchar(Cmd, 1);\r
+       if (cmdp == 'B' || cmdp == 'b')\r
+               keytype = MIFARE_AUTH_KEYB;\r
+       \r
+       UsbCommand c = {CMD_READER_MIFARE, {true, blockNo, keytype}};\r
 \r
        // message\r
        printf("-------------------------------------------------------------------------\n");\r
@@ -1315,45 +1320,121 @@ int CmdHF14AMfChk(const char *Cmd) {
        PrintAndLog("");\r
        return 0;\r
 }\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
 \r
-int CmdHF14AMf1kSim(const char *Cmd) {\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
-       uint8_t pnr = 0;\r
-       uint8_t cmdp = param_getchar(Cmd, 0);\r
-\r
-       if (cmdp == 'h' || cmdp == 'H') return usage_hf14_mf1ksim();\r
-\r
-       cmdp = param_getchar(Cmd, pnr);\r
-       if (cmdp == 'u' || cmdp == 'U') {\r
-               param_gethex_ex(Cmd, pnr+1, uid, &uidlen);\r
-               switch(uidlen){\r
-                       case 20: flags = FLAG_10B_UID_IN_DATA;  break;\r
-                       case 14: flags = FLAG_7B_UID_IN_DATA; break;\r
-                       case  8: flags = FLAG_4B_UID_IN_DATA; break;\r
-                       default: return usage_hf14_mf1ksim();\r
-               }\r
-               pnr +=2;\r
-       }\r
+       // initialize storage for found keys\r
+       if (k_sector == NULL);\r
+               k_sector = calloc(k_sectorsCount, sizeof(sector));\r
+       if (k_sector == NULL) \r
+               return;\r
 \r
-       cmdp = param_getchar(Cmd, pnr); \r
-       if (cmdp == 'n' || cmdp == 'N') {\r
-               exitAfterNReads = param_get8(Cmd, pnr+1);\r
-               pnr += 2;\r
+       uint64_t key = 0;\r
+               \r
+       // empty e_sector\r
+       for(int i = 0; i < k_sectorsCount; ++i){\r
+               k_sector[i].Key[0] = 0xffffffffffff;\r
+               k_sector[i].Key[1] = 0xffffffffffff;\r
+               k_sector[i].foundKey[0] = FALSE;\r
+               k_sector[i].foundKey[1] = FALSE;\r
        }\r
 \r
-       cmdp = param_getchar(Cmd, pnr);         \r
-       if (cmdp == 'i' || cmdp == 'I' ) {\r
-               flags |= FLAG_INTERACTIVE;\r
-               pnr++;\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
+                               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
+                                       mfEmlSetMem( memBlock, i*4 + 3, 1);\r
+                                       PrintAndLog("Setting Emulator Memory Block %02d: [%s]"\r
+                                               , i*4 + 3\r
+                                               , sprint_hex( memBlock, sizeof(memBlock))\r
+                                               );\r
+                               }\r
+                               break;\r
+                       }\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
+               }\r
        }\r
+}\r
+\r
+int CmdHF14AMf1kSim(const char *Cmd) {\r
 \r
-       cmdp = param_getchar(Cmd, pnr); \r
-       if (cmdp == 'x' || cmdp == 'X') {\r
-               flags |= FLAG_NR_AR_ATTACK;\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
+       bool setEmulatorMem = false;\r
+       uint8_t cmdp = 0;\r
+       bool errors = false;\r
+\r
+       while(param_getchar(Cmd, cmdp) != 0x00) {\r
+               switch(param_getchar(Cmd, cmdp)) {\r
+               case 'e':\r
+               case 'E':\r
+                       setEmulatorMem = true;\r
+                       cmdp++;\r
+                       break;\r
+               case 'h':\r
+               case 'H':\r
+                       return usage_hf14_mf1ksim();\r
+               case 'i':\r
+               case 'I':\r
+                       flags |= FLAG_INTERACTIVE;\r
+                       cmdp++;\r
+                       break;\r
+               case 'n':\r
+               case 'N':\r
+                       exitAfterNReads = param_get8(Cmd, cmdp+1);\r
+                       cmdp += 2;\r
+                       break;\r
+               case 'u':\r
+               case 'U':\r
+                       param_gethex_ex(Cmd, cmdp+1, uid, &uidlen);\r
+                       switch(uidlen) {\r
+                               case 20: flags = FLAG_10B_UID_IN_DATA; break;\r
+                               case 14: flags = FLAG_7B_UID_IN_DATA; break;\r
+                               case  8: flags = FLAG_4B_UID_IN_DATA; break;\r
+                               default: return usage_hf14_mf1ksim();\r
+                       }\r
+                       cmdp +=2;\r
+                       break;\r
+               case 'x':\r
+               case 'X':\r
+                       flags |= FLAG_NR_AR_ATTACK;\r
+                       cmdp++;\r
+                       break;\r
+               default:\r
+                       PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
+                       errors = true;\r
+                       break;\r
+               }\r
+               if(errors) break;\r
        }\r
+       //Validations\r
+       if(errors) return usage_hf14_mf1ksim();\r
        \r
        PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) "\r
                                , (uidlen == 0 ) ? "N/A" : sprint_hex(uid, uidlen>>1)\r
@@ -1367,24 +1448,24 @@ int CmdHF14AMf1kSim(const char *Cmd) {
        SendCommand(&c);\r
 \r
        if(flags & FLAG_INTERACTIVE) {          \r
-               uint8_t data[32];\r
-               uint64_t key;\r
-               UsbCommand resp;                \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
 \r
                        if ( !(flags & FLAG_NR_AR_ATTACK) ) break;\r
                        if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;\r
 \r
-                       memset(data, 0x00, sizeof(data));       \r
-                       int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];\r
-\r
-                       memcpy(data, resp.d.asBytes, len);                      \r
-                       key = 0;\r
-                       bool found = tryMfk32(data, &key);\r
-                       found ^= tryMfk32_moebius(data, &key);\r
-                       if ( found ) break;\r
+                       memcpy( data, resp.d.asBytes, sizeof(data) );                   \r
+                       readerAttack(data, setEmulatorMem);\r
+               }\r
+               \r
+               if (k_sector != NULL) {\r
+                       printKeyTable(k_sectorsCount, k_sector );\r
+                       free(k_sector);\r
                }\r
        }\r
        return 0;\r
@@ -1548,7 +1629,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 int CmdHF14AMfDbg(const char *Cmd) {\r
 \r
        char ctmp = param_getchar(Cmd, 0);\r
-       if (strlen(Cmd) < 1  || ctmp == 'h'|| ctmp == 'H') return usage_hf14_dbg();\r
+       if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_hf14_dbg();\r
        \r
        uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10);\r
        if (dbgMode > 4) return usage_hf14_dbg();\r
@@ -1572,7 +1653,6 @@ void printKeyTable( uint8_t sectorscnt, sector *e_sector ){
 }\r
 \r
 // EMULATOR COMMANDS\r
-\r
 int CmdHF14AMfEGet(const char *Cmd)\r
 {\r
        uint8_t blockNo = 0;\r
@@ -1586,7 +1666,7 @@ int CmdHF14AMfEGet(const char *Cmd)
        \r
        blockNo = param_get8(Cmd, 0);\r
 \r
-       PrintAndLog(" ");\r
+       PrintAndLog("");\r
        if (!mfEmlGetMem(data, blockNo, 1)) {\r
                PrintAndLog("data[%3d]:%s", blockNo, sprint_hex(data, 16));\r
        } else {\r
Impressum, Datenschutz