-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update embedded copy of minizip library
- Loading branch information
Showing
32 changed files
with
5,894 additions
and
2,213 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
lib_LTLIBRARIES = libminizip.la | ||
|
||
if COND_DEMOS | ||
bin_PROGRAMS = miniunzip minizip | ||
endif | ||
|
||
zlib_top_srcdir = $(top_srcdir)/../.. | ||
zlib_top_builddir = $(top_builddir)/../.. | ||
|
||
AM_CPPFLAGS = -I$(zlib_top_srcdir) | ||
AM_LDFLAGS = -L$(zlib_top_builddir) | ||
|
||
if WIN32 | ||
iowin32_src = iowin32.c | ||
iowin32_h = iowin32.h | ||
endif | ||
|
||
libminizip_la_SOURCES = \ | ||
ioapi.c \ | ||
mztools.c \ | ||
unzip.c \ | ||
zip.c \ | ||
${iowin32_src} | ||
|
||
libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz | ||
|
||
minizip_includedir = $(includedir)/minizip | ||
minizip_include_HEADERS = \ | ||
crypt.h \ | ||
ioapi.h \ | ||
mztools.h \ | ||
unzip.h \ | ||
zip.h \ | ||
${iowin32_h} | ||
|
||
pkgconfigdir = $(libdir)/pkgconfig | ||
pkgconfig_DATA = minizip.pc | ||
|
||
EXTRA_PROGRAMS = miniunzip minizip | ||
|
||
miniunzip_SOURCES = miniunz.c | ||
miniunzip_LDADD = libminizip.la | ||
|
||
minizip_SOURCES = minizip.c | ||
minizip_LDADD = libminizip.la -lz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
|
||
MiniZip 1.1 was derrived from MiniZip at version 1.01f | ||
|
||
Change in 1.0 (Okt 2009) | ||
- **TODO - Add history** | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
MiniZip - Copyright (c) 1998-2010 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson | ||
|
||
Introduction | ||
--------------------- | ||
MiniZip 1.1 is built from MiniZip 1.0 by Gilles Vollant ( http://www.winimage.com/zLibDll/minizip.html ) | ||
|
||
When adding ZIP64 support into minizip it would result into risk of breaking compatibility with minizip 1.0. | ||
All possible work was done for compatibility. | ||
|
||
|
||
Background | ||
--------------------- | ||
When adding ZIP64 support Mathias Svensson found that Even Rouault have added ZIP64 | ||
support for unzip.c into minizip for a open source project called gdal ( http://www.gdal.org/ ) | ||
|
||
That was used as a starting point. And after that ZIP64 support was added to zip.c | ||
some refactoring and code cleanup was also done. | ||
|
||
|
||
Changed from MiniZip 1.0 to MiniZip 1.1 | ||
--------------------------------------- | ||
* Added ZIP64 support for unzip ( by Even Rouault ) | ||
* Added ZIP64 support for zip ( by Mathias Svensson ) | ||
* Reverted some changed that Even Rouault did. | ||
* Bunch of patches received from Gulles Vollant that he received for MiniZip from various users. | ||
* Added unzip patch for BZIP Compression method (patch create by Daniel Borca) | ||
* Added BZIP Compress method for zip | ||
* Did some refactoring and code cleanup | ||
|
||
|
||
Credits | ||
|
||
Gilles Vollant - Original MiniZip author | ||
Even Rouault - ZIP64 unzip Support | ||
Daniel Borca - BZip Compression method support in unzip | ||
Mathias Svensson - ZIP64 zip support | ||
Mathias Svensson - BZip Compression method support in zip | ||
|
||
Resources | ||
|
||
ZipLayout http://result42.com/projects/ZipFileLayout | ||
Command line tool for Windows that shows the layout and information of the headers in a zip archive. | ||
Used when debugging and validating the creation of zip files using MiniZip64 | ||
|
||
|
||
ZIP App Note http://www.pkware.com/documents/casestudies/APPNOTE.TXT | ||
Zip File specification | ||
|
||
|
||
Notes. | ||
* To be able to use BZip compression method in zip64.c or unzip64.c the BZIP2 lib is needed and HAVE_BZIP2 need to be defined. | ||
|
||
License | ||
---------------------------------------------------------- | ||
Condition of use and distribution are the same than zlib : | ||
|
||
This software is provided 'as-is', without any express or implied | ||
warranty. In no event will the authors be held liable for any damages | ||
arising from the use of this software. | ||
|
||
Permission is granted to anyone to use this software for any purpose, | ||
including commercial applications, and to alter it and redistribute it | ||
freely, subject to the following restrictions: | ||
|
||
1. The origin of this software must not be misrepresented; you must not | ||
claim that you wrote the original software. If you use this software | ||
in a product, an acknowledgment in the product documentation would be | ||
appreciated but is not required. | ||
2. Altered source versions must be plainly marked as such, and must not be | ||
misrepresented as being the original software. | ||
3. This notice may not be removed or altered from any source distribution. | ||
|
||
---------------------------------------------------------- | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
# -*- Autoconf -*- | ||
# Process this file with autoconf to produce a configure script. | ||
|
||
AC_INIT([minizip], [1.2.11], [bugzilla.redhat.com]) | ||
AC_CONFIG_SRCDIR([minizip.c]) | ||
AM_INIT_AUTOMAKE([foreign]) | ||
LT_INIT | ||
|
||
AC_MSG_CHECKING([whether to build example programs]) | ||
AC_ARG_ENABLE([demos], AC_HELP_STRING([--enable-demos], [build example programs])) | ||
AM_CONDITIONAL([COND_DEMOS], [test "$enable_demos" = yes]) | ||
if test "$enable_demos" = yes | ||
then | ||
AC_MSG_RESULT([yes]) | ||
else | ||
AC_MSG_RESULT([no]) | ||
fi | ||
|
||
case "${host}" in | ||
*-mingw* | mingw*) | ||
WIN32="yes" | ||
;; | ||
*) | ||
;; | ||
esac | ||
AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) | ||
|
||
|
||
AC_SUBST([HAVE_UNISTD_H], [0]) | ||
AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], []) | ||
AC_CONFIG_FILES([Makefile minizip.pc]) | ||
AC_OUTPUT |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,131 @@ | ||
/* crypt.h -- base code for crypt/uncrypt ZIPfile | ||
Version 1.01e, February 12th, 2005 | ||
Copyright (C) 1998-2005 Gilles Vollant | ||
This code is a modified version of crypting code in Infozip distribution | ||
The encryption/decryption parts of this source code (as opposed to the | ||
non-echoing password parts) were originally written in Europe. The | ||
whole source package can be freely distributed, including from the USA. | ||
(Prior to January 2000, re-export from the US was a violation of US law.) | ||
This encryption code is a direct transcription of the algorithm from | ||
Roger Schlafly, described by Phil Katz in the file appnote.txt. This | ||
file (appnote.txt) is distributed with the PKZIP program (even in the | ||
version without encryption capabilities). | ||
If you don't need crypting in your application, just define symbols | ||
NOCRYPT and NOUNCRYPT. | ||
This code support the "Traditional PKWARE Encryption". | ||
The new AES encryption added on Zip format by Winzip (see the page | ||
http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong | ||
Encryption is not supported. | ||
*/ | ||
|
||
#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8)) | ||
|
||
/*********************************************************************** | ||
* Return the next byte in the pseudo-random sequence | ||
*/ | ||
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 | ||
* with any known compiler so far, though */ | ||
|
||
temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2; | ||
return (int)(((temp * (temp ^ 1)) >> 8) & 0xff); | ||
} | ||
|
||
/*********************************************************************** | ||
* Update the encryption keys with the next byte of plain text | ||
*/ | ||
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; | ||
(*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1; | ||
{ | ||
register int keyshift = (int)((*(pkeys+1)) >> 24); | ||
(*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift); | ||
} | ||
return c; | ||
} | ||
|
||
|
||
/*********************************************************************** | ||
* Initialize the encryption keys and the random header according to | ||
* the given password. | ||
*/ | ||
static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab) | ||
{ | ||
*(pkeys+0) = 305419896L; | ||
*(pkeys+1) = 591751049L; | ||
*(pkeys+2) = 878082192L; | ||
while (*passwd != '\0') { | ||
update_keys(pkeys,pcrc_32_tab,(int)*passwd); | ||
passwd++; | ||
} | ||
} | ||
|
||
#define zdecode(pkeys,pcrc_32_tab,c) \ | ||
(update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab))) | ||
|
||
#define zencode(pkeys,pcrc_32_tab,c,t) \ | ||
(t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c)) | ||
|
||
#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED | ||
|
||
#define RAND_HEAD_LEN 12 | ||
/* "last resort" source for second part of crypt seed pattern */ | ||
# ifndef ZCR_SEED2 | ||
# define ZCR_SEED2 3141592654UL /* use PI as default pattern */ | ||
# endif | ||
|
||
static int crypthead(const char* passwd, /* password string */ | ||
unsigned char* buf, /* where to write header */ | ||
int bufSize, | ||
unsigned long* pkeys, | ||
const z_crc_t* pcrc_32_tab, | ||
unsigned long crcForCrypting) | ||
{ | ||
int n; /* index in random header */ | ||
int t; /* temporary */ | ||
int c; /* random byte */ | ||
unsigned char header[RAND_HEAD_LEN-2]; /* random header */ | ||
static unsigned calls = 0; /* ensure different random header each time */ | ||
|
||
if (bufSize<RAND_HEAD_LEN) | ||
return 0; | ||
|
||
/* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the | ||
* output of rand() to get less predictability, since rand() is | ||
* often poorly implemented. | ||
*/ | ||
if (++calls == 1) | ||
{ | ||
srand((unsigned)(time(NULL) ^ ZCR_SEED2)); | ||
} | ||
init_keys(passwd, pkeys, pcrc_32_tab); | ||
for (n = 0; n < RAND_HEAD_LEN-2; n++) | ||
{ | ||
c = (rand() >> 7) & 0xff; | ||
header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t); | ||
} | ||
/* Encrypt random header (last two bytes is high word of crc) */ | ||
init_keys(passwd, pkeys, pcrc_32_tab); | ||
for (n = 0; n < RAND_HEAD_LEN-2; n++) | ||
{ | ||
buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t); | ||
} | ||
buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t); | ||
buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t); | ||
return n; | ||
} | ||
|
||
#endif |
Oops, something went wrong.