diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-05-13 15:17:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-05-13 15:17:36 (GMT) |
| commit | 2039bf0d5c05d30ab6c46ac9b837ea3d8048a2bb (patch) | |
| tree | d00bae4e3b897ce575c5abe4a286d1429a150aaf /compat/zlib/contrib/minizip/crypt.h | |
| parent | 88e8f319eaabf10945c1b0533d35a14e53994997 (diff) | |
| parent | d1756f468478c8b9e0b652ada83fcef2bd8082c0 (diff) | |
| download | tcl-2039bf0d5c05d30ab6c46ac9b837ea3d8048a2bb.zip tcl-2039bf0d5c05d30ab6c46ac9b837ea3d8048a2bb.tar.gz tcl-2039bf0d5c05d30ab6c46ac9b837ea3d8048a2bb.tar.bz2 | |
merge trunk.
Add back Tcl_AddErrorInfo to stub table (it's still used by Tk 8.6)
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 */ |