diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2024-01-23 08:02:38 -0800 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2024-01-23 08:02:38 -0800 |
| commit | da5937705d1656148b18348e57186aa0592a907d (patch) | |
| tree | f402974318b03c156eab19acddb43113df4563b6 /contrib | |
| parent | 4de0b054a58bfee6974afabd831538dcedc23e22 (diff) | |
| download | zlib-da5937705d1656148b18348e57186aa0592a907d.tar.gz zlib-da5937705d1656148b18348e57186aa0592a907d.tar.bz2 zlib-da5937705d1656148b18348e57186aa0592a907d.zip | |
Permit compiling contrib/minizip/unzip.c with decryption.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/minizip/unzip.c | 4 | ||||
| -rw-r--r-- | contrib/minizip/zip.c | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c index ea05b7d..b5783ca 100644 --- a/contrib/minizip/unzip.c +++ b/contrib/minizip/unzip.c | |||
| @@ -68,10 +68,6 @@ | |||
| 68 | #include <stdlib.h> | 68 | #include <stdlib.h> |
| 69 | #include <string.h> | 69 | #include <string.h> |
| 70 | 70 | ||
| 71 | #ifndef NOUNCRYPT | ||
| 72 | #define NOUNCRYPT | ||
| 73 | #endif | ||
| 74 | |||
| 75 | #include "zlib.h" | 71 | #include "zlib.h" |
| 76 | #include "unzip.h" | 72 | #include "unzip.h" |
| 77 | 73 | ||
diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c index 60bdffa..a6329ae 100644 --- a/contrib/minizip/zip.c +++ b/contrib/minizip/zip.c | |||
| @@ -1027,7 +1027,6 @@ extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file, const char* filename, c | |||
| 1027 | int err = ZIP_OK; | 1027 | int err = ZIP_OK; |
| 1028 | 1028 | ||
| 1029 | # ifdef NOCRYPT | 1029 | # ifdef NOCRYPT |
| 1030 | (crcForCrypting); | ||
| 1031 | if (password != NULL) | 1030 | if (password != NULL) |
| 1032 | return ZIP_PARAMERROR; | 1031 | return ZIP_PARAMERROR; |
| 1033 | # endif | 1032 | # endif |