Fixed bug with iclass dump which prevented saving to file

[proxmark3-svn] / client / cmdhficlass.c

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index ee7c0d6ce5d8cd07a07d2c504b6509768486ab9b..b458ae03bc73f3947f4a16d91a04a86e80792501 100644 (file)
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -16,7 +16,6 @@
 #include <sys/stat.h>
 #include "iso14443crc.h" // Can also be used for iClass, using 0xE012 as CRC-type
 #include "data.h"
-//#include "proxusb.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "cmdparser.h"
@@ -330,8 +329,8 @@ int CmdHFiClassReader_Dump(const char *Cmd)
        printvar("MAC", MAC, 4);
 
        uint8_t iclass_data[32000] = {0};
-       uint8_t iclass_datalen = 0;
-       uint8_t iclass_blocksFailed = 0;//Set to 1 if dump was incomplete
+       uint32_t iclass_datalen = 0;
+       uint32_t iclass_blocksFailed = 0;//Set to 1 if dump was incomplete
 
        UsbCommand d = {CMD_READER_ICLASS_REPLAY, {readerType}};
        memcpy(d.d.asBytes, MAC, 4);
@@ -347,11 +346,11 @@ int CmdHFiClassReader_Dump(const char *Cmd)
                }
                if(WaitForResponseTimeout(CMD_ACK,&resp,4500))
                {
-                       uint64_t dataLength = resp.arg[0];
+                       uint32_t dataLength = resp.arg[0];
                        iclass_blocksFailed |= resp.arg[1];
-
                        if(dataLength > 0)
                        {
+                               PrintAndLog("Got %d bytes data (total so far %d)" ,dataLength,iclass_datalen);
                                memcpy(iclass_data, resp.d.asBytes,dataLength);
                                iclass_datalen += dataLength;
                        }else
@@ -369,7 +368,6 @@ int CmdHFiClassReader_Dump(const char *Cmd)
                                                         CSN[0],CSN[1],CSN[2],CSN[3],
                                                         CSN[4],CSN[5],CSN[6],CSN[7]);
                                        saveFile(filename,"bin",iclass_data, iclass_datalen );
-
                                }
                                //Aaaand we're finished
                                return 0;