Check-in [ce2ae07c02]
Overview
SHA1:ce2ae07c024b815fd25fb49c902807ea202ec693
Date: 2015-08-30 03:21:44
User: rkeene
Comment:Updated to use older mechanism for activating gzip support in zlib, to support zlib older than zlib 1.2.4
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2015-09-25
19:17
[976efa3ffc] Added uninstall script for CACKey on Mac OS X, to be made available for download by popular demand. (user: kvanals, tags: trunk)
2015-08-30
03:21
[ce2ae07c02] Updated to use older mechanism for activating gzip support in zlib, to support zlib older than zlib 1.2.4 (user: rkeene, tags: trunk)
2015-07-27
15:41
[79322b800c] Simplified test code for AFL and added it to the Makefile (user: rkeene, tags: trunk)
Changes

Modified cackey.c from [486977c92e] to [7fc12e8cff].

  2615   2615   					gzip_stream.next_in  = curr_id->certificate;
  2616   2616   					gzip_stream.avail_in = curr_id->certificate_len;
  2617   2617   					gzip_stream.next_out = tmpbuf;
  2618   2618   					gzip_stream.avail_out = tmpbuflen;
  2619   2619   
  2620   2620   					uncompress_ret = inflateInit(&gzip_stream);
  2621   2621   					if (uncompress_ret == Z_OK) {
  2622         -						uncompress_ret = inflateReset2(&gzip_stream, 31);
         2622  +						/* Try again as a gzip buffer */
         2623  +						uncompress_ret = inflateEnd(&gzip_stream);
         2624  +						if (uncompress_ret == Z_OK) {
         2625  +							gzip_stream.zalloc = NULL;
         2626  +							gzip_stream.zfree = NULL;
         2627  +							gzip_stream.opaque = NULL;
         2628  +
         2629  +							gzip_stream.next_in  = curr_id->certificate;
         2630  +							gzip_stream.avail_in = curr_id->certificate_len;
         2631  +							gzip_stream.next_out = tmpbuf;
         2632  +							gzip_stream.avail_out = tmpbuflen;
         2633  +							uncompress_ret = inflateInit2(&gzip_stream, 31);
         2634  +						}
  2623   2635   					}
  2624   2636   					if (uncompress_ret == Z_OK) {
  2625   2637   						uncompress_ret = inflate(&gzip_stream, 0);
  2626   2638   					}
  2627   2639   					if (uncompress_ret == Z_STREAM_END) {
  2628   2640   						uncompress_ret = inflateEnd(&gzip_stream);
  2629   2641   					} else {