]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
fix mfu dump getbigbuffer bug 102/head
authormarshmellow42 <marshmellowrf@gmail.com>
Sun, 24 May 2015 02:35:50 +0000 (22:35 -0400)
committermarshmellow42 <marshmellowrf@gmail.com>
Sun, 24 May 2015 02:35:50 +0000 (22:35 -0400)
Thanks @iceman1001 for catching my oops, and fixing it :)

armsrc/mifarecmd.c
client/cmdhfmfu.c

index 0586a25db1b8882678ca3bd3080bcb37437d9293..8355cd1946172da7c7cdf272938179bc95fef66a 100644 (file)
@@ -335,7 +335,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);\r
 \r
        countblocks *= 4;\r
        if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);\r
 \r
        countblocks *= 4;\r
-       cmd_send(CMD_ACK, 1, countblocks, countblocks, 0, 0);\r
+       cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
        LEDsoff();\r
 }\r
index 07c379bc0d63c5ffc77540384ea4246199b231a3..191032984929b77e34a998b0b1b5bdfc29c74fba 100644 (file)
@@ -1106,12 +1106,13 @@ int CmdHF14AMfUDump(const char *Cmd){
                return 1;
        }
 
                return 1;
        }
 
+       uint32_t startindex = resp.arg[2];
        uint32_t bufferSize = resp.arg[1];
        if (bufferSize > sizeof(data)) {
                PrintAndLog("Data exceeded Buffer size!");
                bufferSize = sizeof(data);
        }
        uint32_t bufferSize = resp.arg[1];
        if (bufferSize > sizeof(data)) {
                PrintAndLog("Data exceeded Buffer size!");
                bufferSize = sizeof(data);
        }
-       GetFromBigBuf(data, bufferSize, 0);
+       GetFromBigBuf(data, bufferSize, startindex);
        WaitForResponse(CMD_ACK,NULL);
 
        Pages = bufferSize/4;
        WaitForResponse(CMD_ACK,NULL);
 
        Pages = bufferSize/4;
Impressum, Datenschutz