github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fpga_compress decompress: truncate output files

Browse source
This commit is contained in:
Philippe Teuwen 2021-06-08 00:17:50 +02:00
commit 0059cec493
1 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

38
tools/fpga_compress/fpga_compress.c
View file

@ -51,7 +51,7 @@ static int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile) {
uint32_t total_size = 0; uint32_t total_size = 0;
do { do {
if (total_size >= num_infiles * FPGA_CONFIG_SIZE) { if (total_size > num_infiles * FPGA_CONFIG_SIZE) {
fprintf(stderr, fprintf(stderr,
"Input files too big (total > %li bytes). These are probably not PM3 FPGA config files.\n" "Input files too big (total > %li bytes). These are probably not PM3 FPGA config files.\n"
, num_infiles * FPGA_CONFIG_SIZE , num_infiles * FPGA_CONFIG_SIZE
@ -144,7 +144,9 @@ typedef struct lz4_stream_s {
// Call it either with opened infile + outsize=0 // Call it either with opened infile + outsize=0
// or with opened infile, opened outfiles, num_outfiles and valid outsize // or with opened infile, opened outfiles, num_outfiles and valid outsize
static int zlib_decompress(FILE *infile, FILE *outfiles[], uint8_t num_outfiles, long *outsize) { static int zlib_decompress(FILE *infile, FILE *outfiles[], uint8_t num_outfiles, long *outsize) {
if (num_outfiles > 10) {
return (EXIT_FAILURE);
}
LZ4_streamDecode_t lz4StreamDecode_body = {{ 0 }}; LZ4_streamDecode_t lz4StreamDecode_body = {{ 0 }};
char outbuf[FPGA_RING_BUFFER_BYTES]; char outbuf[FPGA_RING_BUFFER_BYTES];
@ -187,7 +189,7 @@ static int zlib_decompress(FILE *infile, FILE *outfiles[], uint8_t num_outfiles,
compressed_fpga_stream.next_in = inbuf; compressed_fpga_stream.next_in = inbuf;
compressed_fpga_stream.avail_in = infile_size; compressed_fpga_stream.avail_in = infile_size;
int total_size = 0; long total_size = 0;
while (compressed_fpga_stream.avail_in > 0) { while (compressed_fpga_stream.avail_in > 0) {
int cmp_bytes; int cmp_bytes;
memcpy(&cmp_bytes, compressed_fpga_stream.next_in, sizeof(int)); memcpy(&cmp_bytes, compressed_fpga_stream.next_in, sizeof(int));
@ -209,14 +211,36 @@ static int zlib_decompress(FILE *infile, FILE *outfiles[], uint8_t num_outfiles,
return EXIT_SUCCESS; return EXIT_SUCCESS;
} else { } else {
fclose(infile); fclose(infile);
total_size = 0; // seeking for trailing zeroes
long offset = 0;
long outfilesizes[10] = {0};
for (uint16_t k = 0; k < *outsize / (FPGA_INTERLEAVE_SIZE * num_outfiles); k++) { for (uint16_t k = 0; k < *outsize / (FPGA_INTERLEAVE_SIZE * num_outfiles); k++) {
for (uint16_t j = 0; j < num_outfiles; j++) { for (uint16_t j = 0; j < num_outfiles; j++) {
fwrite(outbufall + total_size, FPGA_INTERLEAVE_SIZE, sizeof(char), outfiles[j]); for (long i = 0; i < FPGA_INTERLEAVE_SIZE; i++) {
total_size += FPGA_INTERLEAVE_SIZE; if (outbufall[offset + i]) {
outfilesizes[j] = (k * FPGA_INTERLEAVE_SIZE) + i + 1;
}
}
offset += FPGA_INTERLEAVE_SIZE;
} }
} }
printf("uncompressed %li input bytes to %i output bytes\n", infile_size, total_size); total_size = 0;
// FPGA bit file ends with 16 zeroes
for (uint16_t j = 0; j < num_outfiles; j++) {
outfilesizes[j] += 16;
total_size += outfilesizes[j];
}
offset = 0;
for (uint16_t k = 0; k < *outsize / (FPGA_INTERLEAVE_SIZE * num_outfiles); k++) {
for (uint16_t j = 0; j < num_outfiles; j++) {
if (k * FPGA_INTERLEAVE_SIZE < outfilesizes[j]) {
uint16_t chunk = outfilesizes[j] - (k * FPGA_INTERLEAVE_SIZE) < FPGA_INTERLEAVE_SIZE ? outfilesizes[j] - (k * FPGA_INTERLEAVE_SIZE) : FPGA_INTERLEAVE_SIZE;
fwrite(outbufall + offset, chunk, sizeof(char), outfiles[j]);
}
offset += FPGA_INTERLEAVE_SIZE;
}
}
printf("uncompressed %li input bytes to %li output bytes\n", infile_size, total_size);
} }
if (*outsize > 0) { if (*outsize > 0) {
for (uint16_t j = 0; j < num_outfiles; j++) { for (uint16_t j = 0; j < num_outfiles; j++) {