X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/639a571810b8ebc72f08c27c39faf05419124c34..97f86b7a6184dbac91216b3a119d9848beadbaff:/client/fpga_compress.c?ds=sidebyside diff --git a/client/fpga_compress.c b/client/fpga_compress.c index 9bafead9..c67f6769 100644 --- a/client/fpga_compress.c +++ b/client/fpga_compress.c @@ -77,7 +77,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile) uint8_t *fpga_config; uint32_t i; int ret; - uint8_t c; + int c; z_stream compressed_fpga_stream; fpga_config = malloc(num_infiles * FPGA_CONFIG_SIZE); @@ -99,7 +99,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile) for(uint16_t k = 0; k < FPGA_INTERLEAVE_SIZE; k++) { c = fgetc(infile[j]); if (!feof(infile[j])) { - fpga_config[i++] = c; + fpga_config[i++] = c &0xFF; } else if (num_infiles > 1) { fpga_config[i++] = '\0'; } @@ -113,6 +113,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile) compressed_fpga_stream.avail_in = i; compressed_fpga_stream.zalloc = fpga_deflate_malloc; compressed_fpga_stream.zfree = fpga_deflate_free; + compressed_fpga_stream.opaque = Z_NULL; ret = deflateInit2(&compressed_fpga_stream, COMPRESS_LEVEL, @@ -188,6 +189,7 @@ int zlib_decompress(FILE *infile, FILE *outfile) compressed_fpga_stream.avail_out = DECOMPRESS_BUF_SIZE; compressed_fpga_stream.zalloc = fpga_deflate_malloc; compressed_fpga_stream.zfree = fpga_deflate_free; + compressed_fpga_stream.opaque = Z_NULL; ret = inflateInit2(&compressed_fpga_stream, 0);