diff options
Diffstat (limited to '')
-rw-r--r-- | contrib/minizip/crypt.h | 8 |
1 files changed, 4 insertions, 4 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 @@ | |||
32 | /*********************************************************************** | 32 | /*********************************************************************** |
33 | * Return the next byte in the pseudo-random sequence | 33 | * Return the next byte in the pseudo-random sequence |
34 | */ | 34 | */ |
35 | static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab) | 35 | static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab) |
36 | { | 36 | { |
37 | unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an | 37 | unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an |
38 | * unpredictable manner on 16-bit systems; not a problem | 38 | * 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) | |||
45 | /*********************************************************************** | 45 | /*********************************************************************** |
46 | * Update the encryption keys with the next byte of plain text | 46 | * Update the encryption keys with the next byte of plain text |
47 | */ | 47 | */ |
48 | static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c) | 48 | static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c) |
49 | { | 49 | { |
50 | (*(pkeys+0)) = CRC32((*(pkeys+0)), c); | 50 | (*(pkeys+0)) = CRC32((*(pkeys+0)), c); |
51 | (*(pkeys+1)) += (*(pkeys+0)) & 0xff; | 51 | (*(pkeys+1)) += (*(pkeys+0)) & 0xff; |
@@ -62,7 +62,7 @@ static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int | |||
62 | * Initialize the encryption keys and the random header according to | 62 | * Initialize the encryption keys and the random header according to |
63 | * the given password. | 63 | * the given password. |
64 | */ | 64 | */ |
65 | static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab) | 65 | static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab) |
66 | { | 66 | { |
67 | *(pkeys+0) = 305419896L; | 67 | *(pkeys+0) = 305419896L; |
68 | *(pkeys+1) = 591751049L; | 68 | *(pkeys+1) = 591751049L; |
@@ -91,7 +91,7 @@ static int crypthead(const char* passwd, /* password string */ | |||
91 | unsigned char* buf, /* where to write header */ | 91 | unsigned char* buf, /* where to write header */ |
92 | int bufSize, | 92 | int bufSize, |
93 | unsigned long* pkeys, | 93 | unsigned long* pkeys, |
94 | const unsigned long* pcrc_32_tab, | 94 | const z_crc_t* pcrc_32_tab, |
95 | unsigned long crcForCrypting) | 95 | unsigned long crcForCrypting) |
96 | { | 96 | { |
97 | int n; /* index in random header */ | 97 | int n; /* index in random header */ |