diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-05-02 07:15:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-05-02 07:15:49 (GMT) |
| commit | e338d72a45468bad9139adc4d43a4167d4e244c6 (patch) | |
| tree | 870a6a99179fa39483426248efdf8be62fc04f2e /compat/zlib/contrib/minizip/crypt.h | |
| parent | b9c49065a55f1a7ddbda005962a9d0847045c274 (diff) | |
| parent | ccc37a91935f90ede0be48b9a71b93f54267e608 (diff) | |
| download | tcl-e338d72a45468bad9139adc4d43a4167d4e244c6.zip tcl-e338d72a45468bad9139adc4d43a4167d4e244c6.tar.gz tcl-e338d72a45468bad9139adc4d43a4167d4e244c6.tar.bz2 | |
merge novem
Diffstat (limited to 'compat/zlib/contrib/minizip/crypt.h')
| -rw-r--r-- | compat/zlib/contrib/minizip/crypt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compat/zlib/contrib/minizip/crypt.h b/compat/zlib/contrib/minizip/crypt.h index a01d08d..1e9e820 100644 --- a/compat/zlib/contrib/minizip/crypt.h +++ b/compat/zlib/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 */ |