github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-24 06:55:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

chg: hf list load/save: remove explicit filesize record from trace files

Browse source
This commit is contained in:
pwpiwi 2018-03-23 20:11:15 +01:00
commit c2e0297451
1 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

49
client/cmdhf.c
View file

@ -465,31 +465,34 @@ int CmdHFList(const char *Cmd)
uint32_t traceLen = 0; uint32_t traceLen = 0;
if (loadFromFile) { if (loadFromFile) {
#define TRACE_CHUNK_SIZE (1<<16) // 64K to start with. Will be enough for BigBuf and some room for future extensions
FILE *tracefile = NULL; FILE *tracefile = NULL;
size_t bytes_read; size_t bytes_read;
uint8_t buf[4]; trace = malloc(TRACE_CHUNK_SIZE);
if ((tracefile = fopen(filename,"rb")) == NULL) {
PrintAndLog("Could not open file %s", filename);
return 0;
}
bytes_read = fread(buf, 1, 4, tracefile);
if (bytes_read != 4) {
PrintAndLog("File reading error.");
fclose(tracefile);
return 1;
}
traceLen = bytes_to_num(buf, 4); // little endian in file
trace = malloc(traceLen+2);
if (trace == NULL) { if (trace == NULL) {
PrintAndLog("Cannot allocate memory for trace"); PrintAndLog("Cannot allocate memory for trace");
return 2; return 2;
} }
bytes_read = fread(trace, 1, traceLen, tracefile); if ((tracefile = fopen(filename,"rb")) == NULL) {
if (bytes_read != traceLen) { PrintAndLog("Could not open file %s", filename);
PrintAndLog("File reading error."); free(trace);
fclose(tracefile); return 0;
return 1;
} }
while (!feof(tracefile)) {
bytes_read = fread(trace+traceLen, 1, TRACE_CHUNK_SIZE, tracefile);
traceLen += bytes_read;
if (!feof(tracefile)) {
uint8_t *p = realloc(trace, traceLen + TRACE_CHUNK_SIZE);
if (p == NULL) {
PrintAndLog("Cannot allocate memory for trace");
free(trace);
fclose(tracefile);
return 2;
}
trace = p;
}
}
fclose(tracefile);
} else { } else {
trace = malloc(USB_CMD_DATA_SIZE); trace = malloc(USB_CMD_DATA_SIZE);
// Query for the size of the trace // Query for the size of the trace
@ -511,16 +514,14 @@ int CmdHFList(const char *Cmd)
} }
if (saveToFile) { if (saveToFile) {
FILE *traceFile = NULL; FILE *tracefile = NULL;
uint8_t buf[4]; if ((tracefile = fopen(filename,"wb")) == NULL) {
if ((traceFile = fopen(filename,"wb")) == NULL) {
PrintAndLog("Could not create file %s", filename); PrintAndLog("Could not create file %s", filename);
return 1; return 1;
} }
num_to_bytes(traceLen, 4, buf); fwrite(trace, 1, traceLen, tracefile);
fwrite(buf, 1, 4, traceFile);
fwrite(trace, 1, traceLen, traceFile);
PrintAndLog("Recorded Activity (TraceLen = %d bytes) written to file %s", traceLen, filename); PrintAndLog("Recorded Activity (TraceLen = %d bytes) written to file %s", traceLen, filename);
fclose(tracefile);
} else { } else {
PrintAndLog("Recorded Activity (TraceLen = %d bytes)", traceLen); PrintAndLog("Recorded Activity (TraceLen = %d bytes)", traceLen);
PrintAndLog(""); PrintAndLog("");