diff options
| author | takacsd <takacsd@gmail.com> | 2012-11-30 19:43:50 +0100 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2013-02-23 23:32:30 -0800 |
| commit | 63ba7582b80eb81b126c2931e485481c35596aab (patch) | |
| tree | 4de1e956fced5945dee8458338627a96bf747ed3 | |
| parent | 00dfee0b2e235bcdb5321dd3bde199ee716a2f64 (diff) | |
| download | zlib-63ba7582b80eb81b126c2931e485481c35596aab.tar.gz | |
Fix types in contrib/minizip to match result of get_crc_table().
| -rw-r--r-- | contrib/minizip/crypt.h | 8 | ||||
| -rw-r--r-- | contrib/minizip/unzip.c | 2 | ||||
| -rw-r--r-- | contrib/minizip/zip.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/contrib/minizip/crypt.h b/contrib/minizip/crypt.h index a01d08d..1e9e820 100644 --- a/contrib/minizip/crypt.h +++ b/contrib/minizip/crypt.h @@ -32,7 +32,7 @@ /*********************************************************************** * Return the next byte in the pseudo-random sequence */ -static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab) +static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab) { unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an * unpredictable manner on 16-bit systems; not a problem @@ -45,7 +45,7 @@ static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab) /*********************************************************************** * Update the encryption keys with the next byte of plain text */ -static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c) +static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c) { (*(pkeys+0)) = CRC32((*(pkeys+0)), c); (*(pkeys+1)) += (*(pkeys+0)) & 0xff; @@ -62,7 +62,7 @@ static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int * Initialize the encryption keys and the random header according to * the given password. */ -static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab) +static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab) { *(pkeys+0) = 305419896L; *(pkeys+1) = 591751049L; @@ -91,7 +91,7 @@ static int crypthead(const char* passwd, /* password string */ unsigned char* buf, /* where to write header */ int bufSize, unsigned long* pkeys, - const unsigned long* pcrc_32_tab, + const z_crc_t* pcrc_32_tab, unsigned long crcForCrypting) { int n; /* index in random header */ diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c index 26b2e0f..9093504 100644 --- a/contrib/minizip/unzip.c +++ b/contrib/minizip/unzip.c @@ -188,7 +188,7 @@ typedef struct # ifndef NOUNCRYPT unsigned long keys[3]; /* keys defining the pseudo-random sequence */ - const unsigned long* pcrc_32_tab; + const z_crc_t* pcrc_32_tab; # endif } unz64_s; diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c index 147934c..ea54853 100644 --- a/contrib/minizip/zip.c +++ b/contrib/minizip/zip.c @@ -157,7 +157,7 @@ typedef struct ZPOS64_T totalUncompressedData; #ifndef NOCRYPT unsigned long keys[3]; /* keys defining the pseudo-random sequence */ - const unsigned long* pcrc_32_tab; + const z_crc_t* pcrc_32_tab; int crypt_header_size; #endif } curfile64_info; |