X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/015520dc4e90a6ef672590049e807d569794ef81..refs/pull/538/head:/client/fpga_compress.c diff --git a/client/fpga_compress.c b/client/fpga_compress.c index aacafc86..a672ab58 100644 --- a/client/fpga_compress.c +++ b/client/fpga_compress.c @@ -28,7 +28,8 @@ Z_HUFFMAN_ONLY (huffman only, no string matching) Z_RLE (distances limited to one) Z_FIXED (prevents the use of dynamic Huffman codes) -*/ +*/ + #define COMPRESS_STRATEGY Z_DEFAULT_STRATEGY // zlib tuning parameters: #define COMPRESS_GOOD_LENGTH 258 @@ -37,14 +38,17 @@ #define COMPRESS_MAX_CHAIN 8192 #define FPGA_INTERLEAVE_SIZE 288 // (the FPGA's internal config frame size is 288 bits. Interleaving with 288 bytes should give best compression) -#define FPGA_CONFIG_SIZE 42336 // our current fpga_[lh]f.bit files are 42175 bytes. Rounded up to next multiple of FPGA_INTERLEAVE_SIZE +#define FPGA_CONFIG_SIZE 42336L // our current fpga_[lh]f.bit files are 42175 bytes. Rounded up to next multiple of FPGA_INTERLEAVE_SIZE +#define HARDNESTED_TABLE_SIZE (sizeof(uint32_t) * ((1L<<19)+1)) static void usage(void) { - fprintf(stderr, "Usage: fpga_compress ... \n"); - fprintf(stderr, " Combine n FPGA bitstream files and compress them into one.\n\n"); - fprintf(stderr, " fpga_compress -d "); - fprintf(stderr, " Decompress . Write result to "); + fprintf(stdout, "Usage: fpga_compress ... \n"); + fprintf(stdout, " Combine n FPGA bitstream files and compress them into one.\n\n"); + fprintf(stdout, " fpga_compress -d "); + fprintf(stdout, " Decompress . Write result to "); + fprintf(stdout, " fpga_compress -t "); + fprintf(stdout, " Compress hardnested table . Write result to "); } @@ -72,22 +76,29 @@ static bool all_feof(FILE *infile[], uint8_t num_infiles) } -int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile) +int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile, bool hardnested_mode) { uint8_t *fpga_config; uint32_t i; - int ret; - uint8_t c; + int32_t ret; + uint8_t c; z_stream compressed_fpga_stream; - fpga_config = malloc(num_infiles * FPGA_CONFIG_SIZE); - + if (hardnested_mode) { + fpga_config = malloc(num_infiles * HARDNESTED_TABLE_SIZE); + } else { + fpga_config = malloc(num_infiles * FPGA_CONFIG_SIZE); + } // read the input files. Interleave them into fpga_config[] i = 0; do { - if (i >= num_infiles * FPGA_CONFIG_SIZE) { - fprintf(stderr, "Input files too big (total > %d bytes). These are probably not PM3 FPGA config files.\n", num_infiles*FPGA_CONFIG_SIZE); + if (i >= num_infiles * (hardnested_mode?HARDNESTED_TABLE_SIZE:FPGA_CONFIG_SIZE)) { + if (hardnested_mode) { + fprintf(stderr, "Input file too big (> %lu bytes). This is probably not a hardnested bitflip state table.\n", HARDNESTED_TABLE_SIZE); + } else { + fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.\n", num_infiles*FPGA_CONFIG_SIZE); + } for(uint16_t j = 0; j < num_infiles; j++) { fclose(infile[j]); } @@ -122,11 +133,11 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile) COMPRESS_STRATEGY); // estimate the size of the compressed output - unsigned int outsize_max = deflateBound(&compressed_fpga_stream, compressed_fpga_stream.avail_in); + uint32_t outsize_max = deflateBound(&compressed_fpga_stream, compressed_fpga_stream.avail_in); uint8_t *outbuf = malloc(outsize_max); compressed_fpga_stream.next_out = outbuf; compressed_fpga_stream.avail_out = outsize_max; - + if (ret == Z_OK) { ret = deflateTune(&compressed_fpga_stream, COMPRESS_GOOD_LENGTH, @@ -139,10 +150,10 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile) ret = deflate(&compressed_fpga_stream, Z_FINISH); } - fprintf(stderr, "compressed %d input bytes to %lu output bytes\n", i, compressed_fpga_stream.total_out); + fprintf(stdout, "compressed %u input bytes to %lu output bytes\n", i, compressed_fpga_stream.total_out); if (ret != Z_STREAM_END) { - fprintf(stderr, "Error in deflate(): %d %s\n", ret, compressed_fpga_stream.msg); + fprintf(stderr, "Error in deflate(): %i %s\n", ret, compressed_fpga_stream.msg); free(outbuf); deflateEnd(&compressed_fpga_stream); for(uint16_t j = 0; j < num_infiles; j++) { @@ -177,7 +188,7 @@ int zlib_decompress(FILE *infile, FILE *outfile) #define DECOMPRESS_BUF_SIZE 1024 uint8_t outbuf[DECOMPRESS_BUF_SIZE]; uint8_t inbuf[DECOMPRESS_BUF_SIZE]; - int ret; + int32_t ret; z_stream compressed_fpga_stream; @@ -197,7 +208,7 @@ int zlib_decompress(FILE *infile, FILE *outfile) compressed_fpga_stream.next_in = inbuf; uint16_t i = 0; do { - int c = fgetc(infile); + int32_t c = fgetc(infile); if (!feof(infile)) { inbuf[i++] = c & 0xFF; compressed_fpga_stream.avail_in++; @@ -232,7 +243,7 @@ int zlib_decompress(FILE *infile, FILE *outfile) fclose(infile); return(EXIT_SUCCESS); } else { - fprintf(stderr, "Error. Inflate() returned error %d, %s", ret, compressed_fpga_stream.msg); + fprintf(stderr, "Error. Inflate() returned error %i, %s", ret, compressed_fpga_stream.msg); fclose(outfile); fclose(infile); return(EXIT_FAILURE); @@ -251,7 +262,8 @@ int main(int argc, char **argv) return(EXIT_FAILURE); } - if (!strcmp(argv[1], "-d")) { // Decompress + if (!strcmp(argv[1], "-d")) { // Decompress + infiles = calloc(1, sizeof(FILE*)); if (argc != 4) { usage(); @@ -269,13 +281,25 @@ int main(int argc, char **argv) } return zlib_decompress(infiles[0], outfile); - } else { // Compress + } else { // Compress - infiles = calloc(argc-2, sizeof(FILE*)); - for (uint16_t i = 0; i < argc-2; i++) { - infiles[i] = fopen(argv[i+1], "rb"); + bool hardnested_mode = false; + int num_input_files = 0; + if (!strcmp(argv[1], "-t")) { // hardnested table + if (argc != 4) { + usage(); + return(EXIT_FAILURE); + } + hardnested_mode = true; + num_input_files = 1; + } else { + num_input_files = argc-2; + } + infiles = calloc(num_input_files, sizeof(FILE*)); + for (uint16_t i = 0; i < num_input_files; i++) { + infiles[i] = fopen(argv[i+hardnested_mode?2:1], "rb"); if (infiles[i] == NULL) { - fprintf(stderr, "Error. Cannot open input file %s", argv[i+1]); + fprintf(stderr, "Error. Cannot open input file %s", argv[i+hardnested_mode?2:1]); return(EXIT_FAILURE); } } @@ -284,6 +308,6 @@ int main(int argc, char **argv) fprintf(stderr, "Error. Cannot open output file %s", argv[argc-1]); return(EXIT_FAILURE); } - return zlib_compress(infiles, argc-2, outfile); + return zlib_compress(infiles, num_input_files, outfile, hardnested_mode); } }