]> cvs.zerfleddert.de Git - proxmark3-svn/blobdiff - client/fpga_compress.c
Fix issue #342
[proxmark3-svn] / client / fpga_compress.c
index 5c16829236f9298540c1e8e8a361fe23a93a14af..28154243825350d527f569ac4390c57933ca530a 100644 (file)
 #define MAX(a,b) ((a)>(b)?(a):(b))
 
 // zlib configuration
-#define COMPRESS_LEVEL                 9               // use best possible compression
-#define COMPRESS_WINDOW_BITS   15              // default = max = 15 for a window of 2^15 = 32KBytes
-#define COMPRESS_MEM_LEVEL             9               // determines the amount of memory allocated during compression. Default = 8.
+#define COMPRESS_LEVEL           9  // use best possible compression
+#define COMPRESS_WINDOW_BITS    15  // default = max = 15 for a window of 2^15 = 32KBytes
+#define COMPRESS_MEM_LEVEL       9  // determines the amount of memory allocated during compression. Default = 8.
 /* COMPRESS_STRATEGY can be 
        Z_DEFAULT_STRATEGY (the default), 
        Z_FILTERED (more huffmann, less string matching),
        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
+*/
+
+#define        COMPRESS_STRATEGY       Z_DEFAULT_STRATEGY
 // zlib tuning parameters:
-#define COMPRESS_GOOD_LENGTH           258
-#define        COMPRESS_MAX_LAZY                       258     
-#define        COMPRESS_MAX_NICE_LENGTH        258
-#define        COMPRESS_MAX_CHAIN                      8192
+#define COMPRESS_GOOD_LENGTH           258
+#define COMPRESS_MAX_LAZY              258
+#define COMPRESS_MAX_NICE_LENGTH       258
+#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_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
 
 static void usage(void)
 {
@@ -76,8 +77,8 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
 {
        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);
@@ -85,6 +86,16 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
        // 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 > %u 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]);
+                       }
+                       free(fpga_config);
+                       return(EXIT_FAILURE);
+               }
+
                for(uint16_t j = 0; j < num_infiles; j++) {
                        for(uint16_t k = 0; k < FPGA_INTERLEAVE_SIZE; k++) {
                                c = fgetc(infile[j]);
@@ -96,13 +107,6 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
                        }
                }
 
-               if (i > num_infiles * FPGA_CONFIG_SIZE) {
-                       fprintf(stderr, "Input files too big (total > %lu bytes). These are probably not PM3 FPGA config files.", num_infiles*FPGA_CONFIG_SIZE);
-                       for(uint16_t j = 0; j < num_infiles; j++) {
-                               fclose(infile[j]);
-                       }
-                       return -1;
-               }
        } while (!all_feof(infile, num_infiles));
 
        // initialize zlib structures
@@ -110,7 +114,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,
                                                Z_DEFLATED,
@@ -119,11 +123,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,
@@ -136,10 +140,10 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
                ret = deflate(&compressed_fpga_stream, Z_FINISH);
        }
        
-       fprintf(stderr, "compressed %lu input bytes to %lu output bytes\n", i, compressed_fpga_stream.total_out);
+       fprintf(stderr, "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++) {
@@ -148,7 +152,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
                fclose(outfile);
                free(infile);
                free(fpga_config);
-               return -1;
+               return(EXIT_FAILURE);
                }
                
        for (i = 0; i < compressed_fpga_stream.total_out; i++) {
@@ -164,7 +168,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
        free(infile);
        free(fpga_config);
        
-       return 0;
+       return(EXIT_SUCCESS);
        
 }
 
@@ -174,7 +178,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;
 
@@ -185,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);
        
@@ -193,9 +198,9 @@ int zlib_decompress(FILE *infile, FILE *outfile)
                        compressed_fpga_stream.next_in = inbuf;
                        uint16_t i = 0;
                        do {
-                               uint8_t c = fgetc(infile);
+                               int32_t c = fgetc(infile);
                                if (!feof(infile)) {
-                                       inbuf[i++] = c;
+                                       inbuf[i++] = c & 0xFF;
                                        compressed_fpga_stream.avail_in++;
                                } else {
                                        break;
@@ -226,12 +231,12 @@ int zlib_decompress(FILE *infile, FILE *outfile)
                }
                fclose(outfile);
                fclose(infile);
-               return 0;
+               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 -1;
+               return(EXIT_FAILURE);
        }
        
 }
@@ -244,41 +249,41 @@ int main(int argc, char **argv)
        
        if (argc == 1 || argc == 2) {
                usage();
-               return -1;
+               return(EXIT_FAILURE);
        }
        
-       if (!strcmp(argv[1], "-d")) {                   // Decompress
+       if (!strcmp(argv[1], "-d")) { // Decompress
                infiles = calloc(1, sizeof(FILE*));
                if (argc != 4) {
                        usage();
-                       return -1;
+                       return(EXIT_FAILURE);
                } 
                infiles[0] = fopen(argv[2], "rb");
                if (infiles[0] == NULL) {
                        fprintf(stderr, "Error. Cannot open input file %s", argv[2]);
-                       return -1;
+                       return(EXIT_FAILURE);
                }
                outfile = fopen(argv[3], "wb");
                if (outfile == NULL) {
                        fprintf(stderr, "Error. Cannot open output file %s", argv[3]);
-                       return -1;
+                       return(EXIT_FAILURE);
                }
                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");
                        if (infiles[i] == NULL) {
                                fprintf(stderr, "Error. Cannot open input file %s", argv[i+1]);
-                               return -1;
+                               return(EXIT_FAILURE);
                        }
                }
                outfile = fopen(argv[argc-1], "wb");
                if (outfile == NULL) {
                        fprintf(stderr, "Error. Cannot open output file %s", argv[argc-1]);
-                       return -1;
+                       return(EXIT_FAILURE);
                }
                return zlib_compress(infiles, argc-2, outfile);
        }
Impressum, Datenschutz