]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhfmf.c
removed -fPIC directive
[proxmark3-svn] / client / cmdhfmf.c
index 4da6067a105624710cfb5f8daca24b5df3d4ccef..11288085ecd436c80b3fa4763dc2b48959eca9fc 100644 (file)
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------\r
 //-----------------------------------------------------------------------------\r
-// Copyright (C) 2011 Merlok\r
+// Copyright (C) 2011,2012 Merlok\r
 //\r
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,\r
 // at your option, any later version. See the LICENSE.txt file for the text of\r
 //\r
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,\r
 // at your option, any later version. See the LICENSE.txt file for the text of\r
@@ -9,7 +9,6 @@
 //-----------------------------------------------------------------------------\r
 \r
 #include "cmdhfmf.h"\r
 //-----------------------------------------------------------------------------\r
 \r
 #include "cmdhfmf.h"\r
-#include "proxmark3.h"\r
 \r
 static int CmdHelp(const char *Cmd);\r
 \r
 \r
 static int CmdHelp(const char *Cmd);\r
 \r
@@ -19,7 +18,7 @@ int CmdHF14AMifare(const char *Cmd)
        uint32_t nt = 0;\r
        uint64_t par_list = 0, ks_list = 0, r_key = 0;\r
        uint8_t isOK = 0;\r
        uint32_t nt = 0;\r
        uint64_t par_list = 0, ks_list = 0, r_key = 0;\r
        uint8_t isOK = 0;\r
-       uint8_t keyBlock[6] = {0,0,0,0,0,0};\r
+       uint8_t keyBlock[8] = {0};\r
 \r
        if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, keyBlock, 8)) {\r
                PrintAndLog("Nt must include 8 HEX symbols");\r
 \r
        if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, keyBlock, 8)) {\r
                PrintAndLog("Nt must include 8 HEX symbols");\r
@@ -37,7 +36,6 @@ start:
        // message\r
        printf("-------------------------------------------------------------------------\n");\r
        printf("Executing command. It may take up to 30 min.\n");\r
        // message\r
        printf("-------------------------------------------------------------------------\n");\r
        printf("Executing command. It may take up to 30 min.\n");\r
-       printf("Press the key on proxmark3 device to abort proxmark3.\n");\r
        printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\r
        printf("-------------------------------------------------------------------------\n");\r
        \r
        printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\r
        printf("-------------------------------------------------------------------------\n");\r
        \r
@@ -51,14 +49,14 @@ start:
                        break;\r
                }\r
                \r
                        break;\r
                }\r
                \r
-               UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 2000);\r
-               if (resp != NULL) {\r
-                       isOK  = resp->arg[0] & 0xff;\r
+               UsbCommand resp;\r
+               if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) {\r
+                       isOK  = resp.arg[0] & 0xff;\r
        \r
        \r
-                       uid = (uint32_t)bytes_to_num(resp->d.asBytes +  0, 4);\r
-                       nt =  (uint32_t)bytes_to_num(resp->d.asBytes +  4, 4);\r
-                       par_list = bytes_to_num(resp->d.asBytes +  8, 8);\r
-                       ks_list = bytes_to_num(resp->d.asBytes +  16, 8);\r
+                       uid = (uint32_t)bytes_to_num(resp.d.asBytes +  0, 4);\r
+                       nt =  (uint32_t)bytes_to_num(resp.d.asBytes +  4, 4);\r
+                       par_list = bytes_to_num(resp.d.asBytes +  8, 8);\r
+                       ks_list = bytes_to_num(resp.d.asBytes +  16, 8);\r
        \r
                        printf("\n\n");\r
                        PrintAndLog("isOk:%02x", isOK);\r
        \r
                        printf("\n\n");\r
                        PrintAndLog("isOk:%02x", isOK);\r
@@ -72,18 +70,23 @@ start:
        if (isOK != 1) return 1;\r
        \r
        // execute original function from util nonce2key\r
        if (isOK != 1) return 1;\r
        \r
        // execute original function from util nonce2key\r
-       if (nonce2key(uid, nt, par_list, ks_list, &r_key)) return 2;\r
-       printf("------------------------------------------------------------------\n");\r
-       PrintAndLog("Key found:%012llx \n", r_key);\r
+       if (nonce2key(uid, nt, par_list, ks_list, &r_key))\r
+       {\r
+               isOK = 2;\r
+               PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);    \r
+       } else {\r
+               printf("------------------------------------------------------------------\n");\r
+               PrintAndLog("Key found:%012"llx" \n", r_key);\r
 \r
 \r
-       num_to_bytes(r_key, 6, keyBlock);\r
-       isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);\r
+               num_to_bytes(r_key, 6, keyBlock);\r
+               isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);\r
+       }\r
        if (!isOK) \r
        if (!isOK) \r
-               PrintAndLog("Found valid key:%012llx", r_key);\r
+               PrintAndLog("Found valid key:%012"llx, r_key);\r
        else\r
        {\r
        else\r
        {\r
-               PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt); \r
-               c.d.asDwords[0] = nt;\r
+               if (isOK != 2) PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt);  \r
+               c.arg[0] = nt;\r
                goto start;\r
        }\r
        \r
                goto start;\r
        }\r
        \r
@@ -127,11 +130,10 @@ int CmdHF14AMfWrBl(const char *Cmd)
        memcpy(c.d.asBytes, key, 6);\r
        memcpy(c.d.asBytes + 10, bldata, 16);\r
   SendCommand(&c);\r
        memcpy(c.d.asBytes, key, 6);\r
        memcpy(c.d.asBytes + 10, bldata, 16);\r
   SendCommand(&c);\r
-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
-\r
-       if (resp != NULL) {\r
-               uint8_t                isOK  = resp->arg[0] & 0xff;\r
 \r
 \r
+       UsbCommand resp;\r
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+               uint8_t isOK  = resp.arg[0] & 0xff;\r
                PrintAndLog("isOk:%02x", isOK);\r
        } else {\r
                PrintAndLog("Command execute timeout");\r
                PrintAndLog("isOk:%02x", isOK);\r
        } else {\r
                PrintAndLog("Command execute timeout");\r
@@ -171,11 +173,11 @@ int CmdHF14AMfRdBl(const char *Cmd)
   UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r
   SendCommand(&c);\r
   UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r
   SendCommand(&c);\r
-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
 \r
 \r
-       if (resp != NULL) {\r
-               uint8_t                isOK  = resp->arg[0] & 0xff;\r
-               uint8_t              * data  = resp->d.asBytes;\r
+       UsbCommand resp;\r
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+               uint8_t                isOK  = resp.arg[0] & 0xff;\r
+               uint8_t              * data  = resp.d.asBytes;\r
 \r
                if (isOK)\r
                        PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 16));\r
 \r
                if (isOK)\r
                        PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 16));\r
@@ -226,12 +228,12 @@ int CmdHF14AMfRdSc(const char *Cmd)
   UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r
   SendCommand(&c);\r
   UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};\r
        memcpy(c.d.asBytes, key, 6);\r
   SendCommand(&c);\r
-       UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
        PrintAndLog(" ");\r
 \r
        PrintAndLog(" ");\r
 \r
-       if (resp != NULL) {\r
-               isOK  = resp->arg[0] & 0xff;\r
-               data  = resp->d.asBytes;\r
+       UsbCommand resp;\r
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+               isOK  = resp.arg[0] & 0xff;\r
+               data  = resp.d.asBytes;\r
 \r
                PrintAndLog("isOk:%02x", isOK);\r
                if (isOK) \r
 \r
                PrintAndLog("isOk:%02x", isOK);\r
                if (isOK) \r
@@ -242,13 +244,11 @@ int CmdHF14AMfRdSc(const char *Cmd)
                PrintAndLog("Command1 execute timeout");\r
        }\r
 \r
                PrintAndLog("Command1 execute timeout");\r
        }\r
 \r
-               // response2\r
-       resp = WaitForResponseTimeout(CMD_ACK, 500);\r
+  // response2\r
        PrintAndLog(" ");\r
        PrintAndLog(" ");\r
-\r
-       if (resp != NULL) {\r
-               isOK  = resp->arg[0] & 0xff;\r
-               data  = resp->d.asBytes;\r
+       if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+               isOK  = resp.arg[0] & 0xff;\r
+               data  = resp.d.asBytes;\r
 \r
                if (isOK) \r
                        for (i = 0; i < 2; i++) {\r
 \r
                if (isOK) \r
                        for (i = 0; i < 2; i++) {\r
@@ -272,7 +272,7 @@ int CmdHF14AMfDump(const char *Cmd)
        FILE *fin;\r
        FILE *fout;\r
        \r
        FILE *fin;\r
        FILE *fout;\r
        \r
-       UsbCommand *resp;\r
+       UsbCommand resp;\r
        \r
        if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r
                PrintAndLog("Could not find file dumpkeys.bin");\r
        \r
        if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r
                PrintAndLog("Could not find file dumpkeys.bin");\r
@@ -303,11 +303,10 @@ int CmdHF14AMfDump(const char *Cmd)
                UsbCommand c = {CMD_MIFARE_READBL, {4*i + 3, 0, 0}};\r
                memcpy(c.d.asBytes, keyA[i], 6);\r
                SendCommand(&c);\r
                UsbCommand c = {CMD_MIFARE_READBL, {4*i + 3, 0, 0}};\r
                memcpy(c.d.asBytes, keyA[i], 6);\r
                SendCommand(&c);\r
-               resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
 \r
 \r
-               if (resp != NULL) {\r
-                       uint8_t isOK  = resp->arg[0] & 0xff;\r
-                       uint8_t *data  = resp->d.asBytes;\r
+    if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+                       uint8_t isOK  = resp.arg[0] & 0xff;\r
+                       uint8_t *data  = resp.d.asBytes;\r
                        if (isOK){\r
                                rights[i][0] = ((data[7] & 0x10)>>4) | ((data[8] & 0x1)<<1) | ((data[8] & 0x10)>>2);\r
                                rights[i][1] = ((data[7] & 0x20)>>5) | ((data[8] & 0x2)<<0) | ((data[8] & 0x20)>>3);\r
                        if (isOK){\r
                                rights[i][0] = ((data[7] & 0x10)>>4) | ((data[8] & 0x1)<<1) | ((data[8] & 0x10)>>2);\r
                                rights[i][1] = ((data[7] & 0x20)>>5) | ((data[8] & 0x2)<<0) | ((data[8] & 0x20)>>3);\r
@@ -329,20 +328,23 @@ int CmdHF14AMfDump(const char *Cmd)
        PrintAndLog("|----- Dumping all blocks to file... -----|");\r
        PrintAndLog("|-----------------------------------------|");\r
        \r
        PrintAndLog("|----- Dumping all blocks to file... -----|");\r
        PrintAndLog("|-----------------------------------------|");\r
        \r
+  \r
        for (i=0 ; i<16 ; i++) {\r
                for (j=0 ; j<4 ; j++) {\r
        for (i=0 ; i<16 ; i++) {\r
                for (j=0 ; j<4 ; j++) {\r
-                       if (j == 3){\r
+      bool received = false;\r
+      \r
+      if (j == 3){\r
                                UsbCommand c = {CMD_MIFARE_READBL, {i*4 + j, 0, 0}};\r
                                memcpy(c.d.asBytes, keyA[i], 6);\r
                                SendCommand(&c);\r
                                UsbCommand c = {CMD_MIFARE_READBL, {i*4 + j, 0, 0}};\r
                                memcpy(c.d.asBytes, keyA[i], 6);\r
                                SendCommand(&c);\r
-                               resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
+        received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                        }\r
                        else{\r
                                if ((rights[i][j] == 6) | (rights[i][j] == 5)) {\r
                                        UsbCommand c = {CMD_MIFARE_READBL, {i*4+j, 1, 0}};\r
                                        memcpy(c.d.asBytes, keyB[i], 6);\r
                                        SendCommand(&c);\r
                        }\r
                        else{\r
                                if ((rights[i][j] == 6) | (rights[i][j] == 5)) {\r
                                        UsbCommand c = {CMD_MIFARE_READBL, {i*4+j, 1, 0}};\r
                                        memcpy(c.d.asBytes, keyB[i], 6);\r
                                        SendCommand(&c);\r
-                                       resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
+          received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                }\r
                                else if (rights[i][j] == 7) {\r
                                        PrintAndLog("Access rights do not allow reading of sector %d block %d",i,j);\r
                                }\r
                                else if (rights[i][j] == 7) {\r
                                        PrintAndLog("Access rights do not allow reading of sector %d block %d",i,j);\r
@@ -351,13 +353,13 @@ int CmdHF14AMfDump(const char *Cmd)
                                        UsbCommand c = {CMD_MIFARE_READBL, {i*4+j, 0, 0}};\r
                                        memcpy(c.d.asBytes, keyA[i], 6);\r
                                        SendCommand(&c);\r
                                        UsbCommand c = {CMD_MIFARE_READBL, {i*4+j, 0, 0}};\r
                                        memcpy(c.d.asBytes, keyA[i], 6);\r
                                        SendCommand(&c);\r
-                                       resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
+          received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r
                                }\r
                        }\r
 \r
                                }\r
                        }\r
 \r
-                       if (resp != NULL) {\r
-                               uint8_t isOK  = resp->arg[0] & 0xff;\r
-                               uint8_t *data  = resp->d.asBytes;\r
+                       if (received) {\r
+                               uint8_t isOK  = resp.arg[0] & 0xff;\r
+                               uint8_t *data  = resp.d.asBytes;\r
                                if (j == 3) {\r
                                        data[0]  = (keyA[i][0]);\r
                                        data[1]  = (keyA[i][1]);\r
                                if (j == 3) {\r
                                        data[0]  = (keyA[i][0]);\r
                                        data[1]  = (keyA[i][1]);\r
@@ -458,10 +460,10 @@ int CmdHF14AMfRestore(const char *Cmd)
                        \r
                        memcpy(c.d.asBytes + 10, bldata, 16);\r
                        SendCommand(&c);\r
                        \r
                        memcpy(c.d.asBytes + 10, bldata, 16);\r
                        SendCommand(&c);\r
-                       UsbCommand *resp = WaitForResponseTimeout(CMD_ACK, 1500);\r
 \r
 \r
-                       if (resp != NULL) {\r
-                               uint8_t isOK  = resp->arg[0] & 0xff;\r
+                       UsbCommand resp;\r
+      if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
+                               uint8_t isOK  = resp.arg[0] & 0xff;\r
                                PrintAndLog("isOk:%02x", isOK);\r
                        } else {\r
                                PrintAndLog("Command execute timeout");\r
                                PrintAndLog("isOk:%02x", isOK);\r
                        } else {\r
                                PrintAndLog("Command execute timeout");\r
@@ -571,7 +573,7 @@ int CmdHF14AMfNested(const char *Cmd)
                if (res)\r
                        res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);\r
                if (!res) {\r
                if (res)\r
                        res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);\r
                if (!res) {\r
-                       PrintAndLog("Found valid key:%012llx", key64);\r
+                       PrintAndLog("Found valid key:%012"llx, key64);\r
 \r
                        // transfer key to the emulator\r
                        if (transferToEml) {\r
 \r
                        // transfer key to the emulator\r
                        if (transferToEml) {\r
@@ -631,7 +633,7 @@ int CmdHF14AMfNested(const char *Cmd)
                                        if (res)\r
                                                res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);\r
                                        if (!res) {\r
                                        if (res)\r
                                                res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);\r
                                        if (!res) {\r
-                                               PrintAndLog("Found valid key:%012llx", key64);  \r
+                                               PrintAndLog("Found valid key:%012"llx, key64);\r
                                                e_sector[trgBlockNo / 4].foundKey[trgKeyType] = 1;\r
                                                e_sector[trgBlockNo / 4].Key[trgKeyType] = key64;\r
                                        }\r
                                                e_sector[trgBlockNo / 4].foundKey[trgKeyType] = 1;\r
                                                e_sector[trgBlockNo / 4].Key[trgKeyType] = key64;\r
                                        }\r
@@ -644,7 +646,7 @@ int CmdHF14AMfNested(const char *Cmd)
                PrintAndLog("|sec|key A           |res|key B           |res|");\r
                PrintAndLog("|---|----------------|---|----------------|---|");\r
                for (i = 0; i < SectorsCnt; i++) {\r
                PrintAndLog("|sec|key A           |res|key B           |res|");\r
                PrintAndLog("|---|----------------|---|----------------|---|");\r
                for (i = 0; i < SectorsCnt; i++) {\r
-                       PrintAndLog("|%03d|  %012llx  | %d |  %012llx  | %d |", i, \r
+                       PrintAndLog("|%03d|  %012"llx"  | %d |  %012"llx"  | %d |", i,\r
                                e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);\r
                }\r
                PrintAndLog("|---|----------------|---|----------------|---|");\r
                                e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);\r
                }\r
                PrintAndLog("|---|----------------|---|----------------|---|");\r
@@ -841,7 +843,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("chk custom key[%d] %012llx", keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
+                                       PrintAndLog("chk custom key[%d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
                                        keycnt++;\r
                                }\r
                        } else {\r
                                        keycnt++;\r
                                }\r
                        } else {\r
@@ -871,7 +873,7 @@ int CmdHF14AMfChk(const char *Cmd)
                                res = mfCheckKeys(b, t, size, keyBlock +6*c, &key64);\r
                                if (res !=1) {\r
                                        if (!res) {\r
                                res = mfCheckKeys(b, t, size, keyBlock +6*c, &key64);\r
                                if (res !=1) {\r
                                        if (!res) {\r
-                                               PrintAndLog("Found valid key:[%012llx]",key64);\r
+                                               PrintAndLog("Found valid key:[%012"llx"]",key64);\r
                                                if (transferToEml) {\r
                                                        uint8_t block[16];\r
                                                        mfEmlGetMem(block, get_trailer_block(b), 1);\r
                                                if (transferToEml) {\r
                                                        uint8_t block[16];\r
                                                        mfEmlGetMem(block, get_trailer_block(b), 1);\r
@@ -985,10 +987,6 @@ int CmdHF14AMfEGet(const char *Cmd)
        }       \r
        \r
        blockNo = param_get8(Cmd, 0);\r
        }       \r
        \r
        blockNo = param_get8(Cmd, 0);\r
-       if (blockNo >= 32 * 4 + 8 * 16) {\r
-               PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");\r
-               return 1;\r
-       }\r
 \r
        PrintAndLog(" ");\r
        if (!mfEmlGetMem(data, blockNo, 3)) {\r
 \r
        PrintAndLog(" ");\r
        if (!mfEmlGetMem(data, blockNo, 3)) {\r
@@ -1029,10 +1027,6 @@ int CmdHF14AMfESet(const char *Cmd)
        }       \r
        \r
        blockNo = param_get8(Cmd, 0);\r
        }       \r
        \r
        blockNo = param_get8(Cmd, 0);\r
-       if (blockNo >= 32 * 4 + 8 * 16) {\r
-               PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");\r
-               return 1;\r
-       }\r
        \r
        if (param_gethex(Cmd, 1, memBlock, 32)) {\r
                PrintAndLog("block data must include 32 HEX symbols");\r
        \r
        if (param_gethex(Cmd, 1, memBlock, 32)) {\r
                PrintAndLog("block data must include 32 HEX symbols");\r
@@ -1211,7 +1205,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|  %012llx  |  %012llx  |", i, keyA, keyB);\r
+               PrintAndLog("|%03d|  %012"llx"  |  %012"llx"  |", i, keyA, keyB);\r
        }\r
        PrintAndLog("|---|----------------|----------------|");\r
        \r
        }\r
        PrintAndLog("|---|----------------|----------------|");\r
        \r
@@ -1270,10 +1264,6 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
        }       \r
 \r
        blockNo = param_get8(Cmd, 0);\r
        }       \r
 \r
        blockNo = param_get8(Cmd, 0);\r
-       if (blockNo >= 32 * 4 + 8 * 16) {\r
-               PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");\r
-               return 1;\r
-       }\r
 \r
        if (param_gethex(Cmd, 1, memBlock, 32)) {\r
                PrintAndLog("block data must include 32 HEX symbols");\r
 \r
        if (param_gethex(Cmd, 1, memBlock, 32)) {\r
                PrintAndLog("block data must include 32 HEX symbols");\r
@@ -1401,10 +1391,6 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
        }       \r
 \r
        blockNo = param_get8(Cmd, 0);\r
        }       \r
 \r
        blockNo = param_get8(Cmd, 0);\r
-       if (blockNo >= 32 * 4 + 8 * 16) {\r
-               PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");\r
-               return 1;\r
-       }\r
 \r
        PrintAndLog("--block number:%02x ", blockNo);\r
 \r
 \r
        PrintAndLog("--block number:%02x ", blockNo);\r
 \r
@@ -1542,6 +1528,121 @@ int CmdHF14AMfCSave(const char *Cmd) {
        }\r
 }\r
 \r
        }\r
 }\r
 \r
+int CmdHF14AMfSniff(const char *Cmd){\r
+       // params\r
+       bool wantLogToFile = 0;\r
+       bool wantDecrypt = 0;\r
+       //bool wantSaveToEml = 0; TODO\r
+       bool wantSaveToEmlFile = 0;\r
+\r
+       //var \r
+       int res = 0;\r
+       int len = 0;\r
+       int blockLen = 0;\r
+       int num = 0;\r
+       int pckNum = 0;\r
+       uint8_t uid[8];\r
+       uint8_t atqa[2];\r
+       uint8_t sak;\r
+       bool isTag;\r
+       uint32_t parity;\r
+       uint8_t buf[3000];\r
+       uint8_t * bufPtr = buf;\r
+       memset(buf, 0x00, 3000);\r
+       \r
+       if (param_getchar(Cmd, 0) == 'h') {\r
+               PrintAndLog("It continuously get data from the field and saves it to: log, emulator, emulator file.");\r
+               PrintAndLog("You can specify:");\r
+               PrintAndLog("    l - save encrypted sequence to logfile `uid.log`");\r
+               PrintAndLog("    d - decrypt sequence and put it to log file `uid.log`");\r
+               PrintAndLog(" n/a   e - decrypt sequence, collect read and write commands and save the result of the sequence to emulator memory");\r
+               PrintAndLog("    r - decrypt sequence, collect read and write commands and save the result of the sequence to emulator dump file `uid.eml`");\r
+               PrintAndLog("Usage:  hf mf sniff [l][d][e][r]");\r
+               PrintAndLog("  sample: hf mf sniff l d e");\r
+               return 0;\r
+       }       \r
+       \r
+       for (int i = 0; i < 4; i++) {\r
+               char ctmp = param_getchar(Cmd, i);\r
+               if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;\r
+               if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;\r
+               //if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO\r
+               if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;\r
+       }\r
+       \r
+       printf("-------------------------------------------------------------------------\n");\r
+       printf("Executing command. \n");\r
+       printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\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
+\r
+       // wait cycle\r
+       while (true) {\r
+               printf(".");\r
+               fflush(stdout);\r
+               if (ukbhit()) {\r
+                       getchar();\r
+                       printf("\naborted via keyboard!\n");\r
+                       break;\r
+               }\r
+               \r
+    UsbCommand resp;\r
+    if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) {\r
+                       res = resp.arg[0] & 0xff;\r
+                       len = resp.arg[1];\r
+                       num = resp.arg[2];\r
+                       \r
+                       if (res == 0) return 0;\r
+                       if (res == 1) {\r
+                               if (num ==0) {\r
+                                       bufPtr = buf;\r
+                                       memset(buf, 0x00, 3000);\r
+                               }\r
+                               memcpy(bufPtr, resp.d.asBytes, len);\r
+                               bufPtr += len;\r
+                               pckNum++;\r
+                       }\r
+                       if (res == 2) {\r
+                               blockLen = bufPtr - buf;\r
+                               bufPtr = buf;\r
+                               printf(">\n");\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
+                                       bufPtr += 4;\r
+                                       parity = *((uint32_t *)(bufPtr));\r
+                                       bufPtr += 4;\r
+                                       len = bufPtr[0];\r
+                                       bufPtr++;\r
+                                       if ((len == 14) && (bufPtr[0] = 0xff) && (bufPtr[1] = 0xff)) {\r
+                                               memcpy(uid, bufPtr + 2, 7);\r
+                                               memcpy(atqa, bufPtr + 2 + 7, 2);\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
+                                                       FillFileNameByUID(logHexFileName, uid, ".log", 7);\r
+                                                       AddLogCurrentDT(logHexFileName);\r
+                                               }                                               \r
+                                               if (wantDecrypt) mfTraceInit(uid, atqa, sak, wantSaveToEmlFile);\r
+                                       } else {\r
+                                               PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len));\r
+                                               if (wantLogToFile) AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);\r
+                                               if (wantDecrypt) mfTraceDecode(bufPtr, len, parity, wantSaveToEmlFile);\r
+                                       }\r
+                                       bufPtr += len;\r
+                                       num++;\r
+                               }\r
+                       }\r
+               } // resp not NILL\r
+       } // while (true)\r
+  return 0;\r
+}\r
+\r
 static command_t CommandTable[] =\r
 {\r
   {"help",             CmdHelp,                                                1, "This help"},\r
 static command_t CommandTable[] =\r
 {\r
   {"help",             CmdHelp,                                                1, "This help"},\r
@@ -1554,6 +1655,7 @@ static command_t CommandTable[] =
   {"chk",                      CmdHF14AMfChk,                  0, "Test block keys"},\r
   {"mifare",   CmdHF14AMifare,                 0, "Read parity error messages. param - <used card nonce>"},\r
   {"nested",   CmdHF14AMfNested,               0, "Test nested authentication"},\r
   {"chk",                      CmdHF14AMfChk,                  0, "Test block keys"},\r
   {"mifare",   CmdHF14AMifare,                 0, "Read parity error messages. param - <used card nonce>"},\r
   {"nested",   CmdHF14AMfNested,               0, "Test nested authentication"},\r
+  {"sniff",            CmdHF14AMfSniff,                0, "Sniff card-reader communication"},\r
   {"sim",                      CmdHF14AMf1kSim,                0, "Simulate MIFARE card"},\r
   {"eclr",             CmdHF14AMfEClear,               0, "Clear simulator memory block"},\r
   {"eget",             CmdHF14AMfEGet,                 0, "Get simulator memory block"},\r
   {"sim",                      CmdHF14AMf1kSim,                0, "Simulate MIFARE card"},\r
   {"eclr",             CmdHF14AMfEClear,               0, "Clear simulator memory block"},\r
   {"eget",             CmdHF14AMfEGet,                 0, "Get simulator memory block"},\r
@@ -1574,7 +1676,7 @@ static command_t CommandTable[] =
 int CmdHFMF(const char *Cmd)\r
 {\r
        // flush\r
 int CmdHFMF(const char *Cmd)\r
 {\r
        // flush\r
-       while (WaitForResponseTimeout(CMD_ACK, 500) != NULL) ;\r
+       WaitForResponseTimeout(CMD_ACK,NULL,100);\r
 \r
   CmdsParse(CommandTable, Cmd);\r
   return 0;\r
 \r
   CmdsParse(CommandTable, Cmd);\r
   return 0;\r
Impressum, Datenschutz