Fixed writing em410x 40bits UID on T5555/T55x7 tags on 32bits systems

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 4da6067a105624710cfb5f8daca24b5df3d4ccef..8dc59f49a0e08e23f5f6c76140829ebe06faafe1 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1,5 +1,5 @@
 //-----------------------------------------------------------------------------\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
@@ -19,7 +19,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
-       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
@@ -83,7 +83,7 @@ start:
        else\r
        {\r
                PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt); \r
-               c.d.asDwords[0] = nt;\r
+               c.arg[0] = nt;\r
                goto start;\r
        }\r
        \r
@@ -1542,6 +1542,20 @@ int CmdHF14AMfCSave(const char *Cmd) {
        }\r
 }\r
 \r
+int CmdHF14AMfSniff(const char *Cmd){\r
+       \r
+       if (param_getchar(Cmd, 0) == 'h') {\r
+               PrintAndLog("Usage:  hf mf sniff ");\r
+               PrintAndLog("        sample: hf mf sniff ");\r
+               return 0;\r
+       }       \r
+       \r
+  UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};\r
+  SendCommand(&c);\r
+\r
+  return 0;\r
+}\r
+\r
 static command_t CommandTable[] =\r
 {\r
   {"help",             CmdHelp,                                                1, "This help"},\r
@@ -1554,6 +1568,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
+  {"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