Improvements/Fixes to 14443 sniffing/snooping

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 637ef4a1f97a9db98e7a32730e75235096c2ac3b..2dc1ab2bf3480eb609046b3a2eb6f177f3314e6a 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -947,19 +947,28 @@ int CmdHF14AMfChk(const char *Cmd)
        keyBlock = calloc(stKeyBlock, 6);\r
        if (keyBlock == NULL) return 1;\r
 \r
        keyBlock = calloc(stKeyBlock, 6);\r
        if (keyBlock == NULL) return 1;\r
 \r

-       num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 0 * 6)); // Default key (first key used by program if no user defined key)\r
-       num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 1 * 6)); // Blank key\r
-       num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 2 * 6)); // NFCForum MAD key\r
-       num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 3 * 6));\r
-       num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 4 * 6));\r
-       num_to_bytes(0x4d3a99c351dd, 6, (uint8_t*)(keyBlock + 5 * 6));\r
-       num_to_bytes(0x1a982c7e459a, 6, (uint8_t*)(keyBlock + 6 * 6));\r
-       num_to_bytes(0xd3f7d3f7d3f7, 6, (uint8_t*)(keyBlock + 7 * 6));\r
-       num_to_bytes(0x714c5c886e97, 6, (uint8_t*)(keyBlock + 8 * 6));\r
-       num_to_bytes(0x587ee5f9350f, 6, (uint8_t*)(keyBlock + 9 * 6));\r
-       num_to_bytes(0xa0478cc39091, 6, (uint8_t*)(keyBlock + 10 * 6));\r
-       num_to_bytes(0x533cb6c723f6, 6, (uint8_t*)(keyBlock + 11 * 6));\r
-       num_to_bytes(0x8fd0a4f256e9, 6, (uint8_t*)(keyBlock + 12 * 6));\r
+       uint64_t defaultKeys[] =\r
+       {\r
+               0xffffffffffff, // Default key (first key used by program if no user defined key)\r
+               0x000000000000, // Blank key\r
+               0xa0a1a2a3a4a5, // NFCForum MAD key\r
+               0xb0b1b2b3b4b5,\r
+               0xaabbccddeeff,\r
+               0x4d3a99c351dd,\r
+               0x1a982c7e459a,\r
+               0xd3f7d3f7d3f7,\r
+               0x714c5c886e97,\r
+               0x587ee5f9350f,\r
+               0xa0478cc39091,\r
+               0x533cb6c723f6,\r
+               0x8fd0a4f256e9\r
+       };\r
+       int defaultKeysSize = (sizeof(defaultKeys) / 7) - 1;\r
+\r
+       for (int defaultKeyCounter = 0; defaultKeyCounter < defaultKeysSize; defaultKeyCounter++)\r
+       {\r
+               num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));\r
+       }\r

        \r
        if (strlen(Cmd)<3) {\r
                PrintAndLog("Usage:  hf mf chk <block number>/<*card memory> <key type (A/B/?)> [t] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r
        \r
        if (strlen(Cmd)<3) {\r
                PrintAndLog("Usage:  hf mf chk <block number>/<*card memory> <key type (A/B/?)> [t] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r


@@ -1029,13 +1038,7 @@ int CmdHF14AMfChk(const char *Cmd)
                        }\r
                        \r
                        if ( (f = fopen( filename , "r")) ) {\r
                        }\r
                        \r
                        if ( (f = fopen( filename , "r")) ) {\r

-                               while( !feof(f) ){\r
-                                       memset(buf, 0, sizeof(buf));\r
-                                       if (fgets(buf, sizeof(buf), f) == NULL) {\r
-                                               PrintAndLog("File reading error.");\r
-                                               return 2;\r
-                                       }\r
-          \r
+                               while( fgets(buf, sizeof(buf), f) ){\r

                                        if (strlen(buf) < 12 || buf[11] == '\n')\r
                                                continue;\r
                                \r
                                        if (strlen(buf) < 12 || buf[11] == '\n')\r
                                                continue;\r
                                \r


@@ -1063,6 +1066,7 @@ int CmdHF14AMfChk(const char *Cmd)
                                        num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);\r
                                        PrintAndLog("chk custom key[%d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
                                        keycnt++;\r
                                        num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);\r
                                        PrintAndLog("chk custom key[%d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
                                        keycnt++;\r

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

                                }\r
                        } else {\r
                                PrintAndLog("File: %s: not found or locked.", filename);\r
                                }\r
                        } else {\r
                                PrintAndLog("File: %s: not found or locked.", filename);\r


@@ -1075,7 +1079,7 @@ int CmdHF14AMfChk(const char *Cmd)
        \r
        if (keycnt == 0) {\r
                PrintAndLog("No key specified,try default keys");\r
        \r
        if (keycnt == 0) {\r
                PrintAndLog("No key specified,try default keys");\r

-               for (;keycnt <=12; keycnt++)\r
+               for (;keycnt < defaultKeysSize; keycnt++)\r

                        PrintAndLog("chk default key[%d] %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
                        PrintAndLog("chk default key[%d] %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


@@ -1144,7 +1148,7 @@ int CmdHF14AMfChk(const char *Cmd)
 \r
 int CmdHF14AMf1kSim(const char *Cmd)\r
 {\r
 \r
 int CmdHF14AMf1kSim(const char *Cmd)\r
 {\r

-       uint8_t uid[7] = {0, 0, 0, 0,0,0,0};\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 exitAfterNReads = 0;\r
        uint8_t flags = 0;\r
 \r


@@ -1196,7 +1200,7 @@ int CmdHF14AMf1kSim(const char *Cmd)
   memcpy(c.d.asBytes, uid, sizeof(uid));\r
   SendCommand(&c);\r
 \r
   memcpy(c.d.asBytes, uid, sizeof(uid));\r
   SendCommand(&c);\r
 \r

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

   {\r
          UsbCommand resp;\r
          PrintAndLog("Press pm3-button to abort simulation");\r
   {\r
          UsbCommand resp;\r
          PrintAndLog("Press pm3-button to abort simulation");\r


@@ -1843,8 +1847,9 @@ int CmdHF14AMfSniff(const char *Cmd){
        printf("Press the key on pc keyboard to abort the client.\n");\r
        printf("-------------------------------------------------------------------------\n");\r
 \r
        printf("Press the key on pc keyboard to abort the client.\n");\r
        printf("-------------------------------------------------------------------------\n");\r
 \r

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

 \r
        // wait cycle\r
        while (true) {\r
 \r
        // wait cycle\r
        while (true) {\r


@@ -1879,7 +1884,7 @@ int CmdHF14AMfSniff(const char *Cmd){
                                PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);\r
                                num = 0;\r
                                while (bufPtr - buf + 9 < blockLen) {\r
                                PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);\r
                                num = 0;\r
                                while (bufPtr - buf + 9 < blockLen) {\r

-                                 isTag = bufPtr[3] & 0x80 ? true:false;\r
+                                       isTag = bufPtr[3] & 0x80 ? true:false;\r

                                        bufPtr += 4;\r
                                        parity = *((uint32_t *)(bufPtr));\r
                                        bufPtr += 4;\r
                                        bufPtr += 4;\r
                                        parity = *((uint32_t *)(bufPtr));\r
                                        bufPtr += 4;\r


@@ -1891,7 +1896,7 @@ int CmdHF14AMfSniff(const char *Cmd){
                                                sak = bufPtr[11];\r
                                                \r
                                                PrintAndLog("tag select uid:%s atqa:%02x %02x sak:0x%02x", sprint_hex(uid, 7), atqa[0], atqa[1], sak);\r
                                                sak = bufPtr[11];\r
                                                \r
                                                PrintAndLog("tag select uid:%s atqa:%02x %02x sak:0x%02x", sprint_hex(uid, 7), atqa[0], atqa[1], sak);\r

-                                               if (wantLogToFile) {\r
+                                               if (wantLogToFile || wantDecrypt) {\r

                                                        FillFileNameByUID(logHexFileName, uid, ".log", 7);\r
                                                        AddLogCurrentDT(logHexFileName);\r
                                                }                                               \r
                                                        FillFileNameByUID(logHexFileName, uid, ".log", 7);\r
                                                        AddLogCurrentDT(logHexFileName);\r
                                                }                                               \r


@@ -1907,7 +1912,8 @@ int CmdHF14AMfSniff(const char *Cmd){
                        }\r
                } // resp not NILL\r
        } // while (true)\r
                        }\r
                } // resp not NILL\r
        } // while (true)\r

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

 }\r
 \r
 static command_t CommandTable[] =\r
 }\r
 \r
 static command_t CommandTable[] =\r


@@ -1923,7 +1929,7 @@ static command_t CommandTable[] =
   {"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
   {"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. param - <used card nonce>"},\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
   {"nested",   CmdHF14AMfNested,               0, "Test nested authentication"},\r
   {"sniff",            CmdHF14AMfSniff,                0, "Sniff card-reader communication"},\r
   {"sim",                      CmdHF14AMf1kSim,                0, "Simulate MIFARE card"},\r