summaryrefslogtreecommitdiff
path: root/contrib/minizip
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/minizip')
-rw-r--r--contrib/minizip/ChangeLogUnzip4
-rw-r--r--contrib/minizip/crypt.h28
-rw-r--r--contrib/minizip/ioapi.c2
-rw-r--r--contrib/minizip/ioapi.h2
-rw-r--r--contrib/minizip/iowin32.c2
-rw-r--r--contrib/minizip/iowin32.h2
-rw-r--r--contrib/minizip/miniunz.c2
-rw-r--r--contrib/minizip/minizip.c2
-rw-r--r--contrib/minizip/unzip.c4
-rw-r--r--contrib/minizip/unzip.h2
-rw-r--r--contrib/minizip/zip.c6
-rw-r--r--contrib/minizip/zip.h2
12 files changed, 46 insertions, 12 deletions
diff --git a/contrib/minizip/ChangeLogUnzip b/contrib/minizip/ChangeLogUnzip
index cfabd610..d7d4b6ba 100644
--- a/contrib/minizip/ChangeLogUnzip
+++ b/contrib/minizip/ChangeLogUnzip
@@ -1,3 +1,7 @@
1Change in 1.00: (10 sept 03)
2- rename to 1.00
3- cosmetic code change
4
1Change in 0.22: (19 May 03) 5Change in 0.22: (19 May 03)
2- crypting support (unless you define NOCRYPT) 6- crypting support (unless you define NOCRYPT)
3- append file in existing zipfile 7- append file in existing zipfile
diff --git a/contrib/minizip/crypt.h b/contrib/minizip/crypt.h
index a02bf0bf..9c7a89cb 100644
--- a/contrib/minizip/crypt.h
+++ b/contrib/minizip/crypt.h
@@ -1,3 +1,31 @@
1/* crypt.h -- base code for crypt/uncrypt ZIPfile
2
3
4 Version 1.00, September 10th, 2003
5
6 Copyright (C) 1998-2003 Gilles Vollant
7
8 This code is a modified version of crypting code in Infozip distribution
9
10 The encryption/decryption parts of this source code (as opposed to the
11 non-echoing password parts) were originally written in Europe. The
12 whole source package can be freely distributed, including from the USA.
13 (Prior to January 2000, re-export from the US was a violation of US law.)
14
15 This encryption code is a direct transcription of the algorithm from
16 Roger Schlafly, described by Phil Katz in the file appnote.txt. This
17 file (appnote.txt) is distributed with the PKZIP program (even in the
18 version without encryption capabilities).
19
20 If you don't need crypting in your application, just define symbols
21 NOCRYPT and NOUNCRYPT.
22
23 This code support the "Traditional PKWARE Encryption".
24
25 The new AES encryption added on Zip format by Winzip (see the page
26 http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
27 Encryption is not supported.
28*/
1 29
2#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8)) 30#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
3 31
diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c
index ea9ee302..80443b76 100644
--- a/contrib/minizip/ioapi.c
+++ b/contrib/minizip/ioapi.c
@@ -1,7 +1,7 @@
1/* ioapi.c -- IO base function header for compress/uncompress .zip 1/* ioapi.c -- IO base function header for compress/uncompress .zip
2 files using zlib + zip or unzip API 2 files using zlib + zip or unzip API
3 3
4 Version 0.22, May 19th, 2003 4 Version 1.00, September 10th, 2003
5 5
6 Copyright (C) 1998-2003 Gilles Vollant 6 Copyright (C) 1998-2003 Gilles Vollant
7*/ 7*/
diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h
index 13f4f21f..6bc2a2cc 100644
--- a/contrib/minizip/ioapi.h
+++ b/contrib/minizip/ioapi.h
@@ -1,7 +1,7 @@
1/* ioapi.h -- IO base function header for compress/uncompress .zip 1/* ioapi.h -- IO base function header for compress/uncompress .zip
2 files using zlib + zip or unzip API 2 files using zlib + zip or unzip API
3 3
4 Version 0.22, May 19th, 2003 4 Version 1.00, September 10th, 2003
5 5
6 Copyright (C) 1998-2003 Gilles Vollant 6 Copyright (C) 1998-2003 Gilles Vollant
7*/ 7*/
diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c
index 8e6d43dd..02b27cb7 100644
--- a/contrib/minizip/iowin32.c
+++ b/contrib/minizip/iowin32.c
@@ -2,7 +2,7 @@
2 files using zlib + zip or unzip API 2 files using zlib + zip or unzip API
3 This IO API version uses the Win32 API (for Microsoft Windows) 3 This IO API version uses the Win32 API (for Microsoft Windows)
4 4
5 Version 0.22, May 19th, 2003 5 Version 1.00, September 10th, 2003
6 6
7 Copyright (C) 1998-2003 Gilles Vollant 7 Copyright (C) 1998-2003 Gilles Vollant
8*/ 8*/
diff --git a/contrib/minizip/iowin32.h b/contrib/minizip/iowin32.h
index 94aa1aae..c0ebd507 100644
--- a/contrib/minizip/iowin32.h
+++ b/contrib/minizip/iowin32.h
@@ -2,7 +2,7 @@
2 files using zlib + zip or unzip API 2 files using zlib + zip or unzip API
3 This IO API version uses the Win32 API (for Microsoft Windows) 3 This IO API version uses the Win32 API (for Microsoft Windows)
4 4
5 Version 0.22, May 19th, 2003 5 Version 1.00, September 10th, 2003
6 6
7 Copyright (C) 1998-2003 Gilles Vollant 7 Copyright (C) 1998-2003 Gilles Vollant
8*/ 8*/
diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c
index 57601e1b..c8cf81e3 100644
--- a/contrib/minizip/miniunz.c
+++ b/contrib/minizip/miniunz.c
@@ -140,7 +140,7 @@ int makedir (newdir)
140 140
141void do_banner() 141void do_banner()
142{ 142{
143 printf("MiniUnz 0.22, demo of zLib + Unz package written by Gilles Vollant\n"); 143 printf("MiniUnz 1.00, demo of zLib + Unz package written by Gilles Vollant\n");
144 printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n"); 144 printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
145} 145}
146 146
diff --git a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c
index 7e2ce364..5746f5cf 100644
--- a/contrib/minizip/minizip.c
+++ b/contrib/minizip/minizip.c
@@ -120,7 +120,7 @@ int check_exist_file(filename)
120 120
121void do_banner() 121void do_banner()
122{ 122{
123 printf("MiniZip 0.22, demo of zLib + Zip package written by Gilles Vollant\n"); 123 printf("MiniZip 1.00, demo of zLib + Zip package written by Gilles Vollant\n");
124 printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n"); 124 printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
125} 125}
126 126
diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
index 81c8c28b..f08f624f 100644
--- a/contrib/minizip/unzip.c
+++ b/contrib/minizip/unzip.c
@@ -1,5 +1,5 @@
1/* unzip.c -- IO for uncompress .zip files using zlib 1/* unzip.c -- IO for uncompress .zip files using zlib
2 Version 0.22, May 19th, 2003 2 Version 1.00, September 10th, 2003
3 3
4 Copyright (C) 1998-2003 Gilles Vollant 4 Copyright (C) 1998-2003 Gilles Vollant
5 5
@@ -88,7 +88,7 @@ woven in by Terry Thorsen 1/2003.
88 88
89 89
90const char unz_copyright[] = 90const char unz_copyright[] =
91 " unzip 0.22 Copyright 1998-2003 Gilles Vollant - http://www.winimage.com/zLibDll"; 91 " unzip 1.00 Copyright 1998-2003 Gilles Vollant - http://www.winimage.com/zLibDll";
92 92
93/* unz_file_info_interntal contain internal info about a file in zipfile*/ 93/* unz_file_info_interntal contain internal info about a file in zipfile*/
94typedef struct unz_file_info_internal_s 94typedef struct unz_file_info_internal_s
diff --git a/contrib/minizip/unzip.h b/contrib/minizip/unzip.h
index 4c2f5e16..4e50979d 100644
--- a/contrib/minizip/unzip.h
+++ b/contrib/minizip/unzip.h
@@ -1,5 +1,5 @@
1/* unzip.h -- IO for uncompress .zip files using zlib 1/* unzip.h -- IO for uncompress .zip files using zlib
2 Version 0.22, May 19th, 2003 2 Version 1.00, September 10th, 2003
3 3
4 Copyright (C) 1998-2003 Gilles Vollant 4 Copyright (C) 1998-2003 Gilles Vollant
5 5
diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
index 193c5399..1a713e50 100644
--- a/contrib/minizip/zip.c
+++ b/contrib/minizip/zip.c
@@ -1,5 +1,7 @@
1/* zip.c -- IO on .zip files using zlib 1/* zip.c -- IO on .zip files using zlib
2 Version 0.22, May 19th, 2003 2 Version 1.00, September 10th, 2003
3
4 Copyright (C) 1998-2003 Gilles Vollant
3 5
4 Read zip.h for more info 6 Read zip.h for more info
5*/ 7*/
@@ -75,7 +77,7 @@
75#endif 77#endif
76#endif 78#endif
77const char zip_copyright[] = 79const char zip_copyright[] =
78 " zip 0.22 Copyright 1998-2003 Gilles Vollant - http://www.winimage.com/zLibDll"; 80 " zip 1.00 Copyright 1998-2003 Gilles Vollant - http://www.winimage.com/zLibDll";
79 81
80 82
81#define SIZEDATA_INDATABLOCK (4096-(4*4)) 83#define SIZEDATA_INDATABLOCK (4096-(4*4))
diff --git a/contrib/minizip/zip.h b/contrib/minizip/zip.h
index 5a75fc6f..c37ea218 100644
--- a/contrib/minizip/zip.h
+++ b/contrib/minizip/zip.h
@@ -1,5 +1,5 @@
1/* zip.h -- IO for compress .zip files using zlib 1/* zip.h -- IO for compress .zip files using zlib
2 Version 0.22, May 19th, 2003 2 Version 1.00, September 10th, 2003
3 3
4 Copyright (C) 1998-2003 Gilles Vollant 4 Copyright (C) 1998-2003 Gilles Vollant
5 5