c/minizip-ng
1
0
Fork 0
mirror of https://github.com/zlib-ng/minizip-ng synced 2025-03-28 21:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/nmoinvaz/minizip into dev

Browse Source
This commit is contained in:
Nathan Moinvaziri 2018-11-21 19:14:14 -08:00
commit d31c5de5b0
11 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -22,7 +22,7 @@ matrix:
env: TOOL="-DUSE_LZMA=OFF" BUILDDIR="../build"
- os: linux
compiler: clang
env: TOOL="-DUSE_AES=OFF" BUILDDIR="../build"
env: TOOL="-DUSE_WZAES=OFF" BUILDDIR="../build"
- os: linux
compiler: clang
env: TOOL="-DUSE_PKCRYPT=OFF" BUILDDIR="../build"
@ -34,7 +34,7 @@ matrix:
env: TOOL="-DDECOMPRESS_ONLY=ON" BUILDDIR="../build"
- os: linux
compiler: clang
env: TOOL="-DUSE_PKCRYPT=OFF -DUSE_AES=OFF" BUILDDIR="../build"
env: TOOL="-DUSE_PKCRYPT=OFF -DUSE_WZAES=OFF" BUILDDIR="../build"
- os: linux
compiler: clang
env: TOOL="-DUSE_OPENSSL=ON" BUILDDIR="../build"

23
CMakeLists.txt
View File

@ -13,7 +13,7 @@ option(USE_ZLIB "Enables ZLIB compression" ON)
option(USE_BZIP2 "Enables BZIP2 compression" ON)
option(USE_LZMA "Enables LZMA compression" ON)
option(USE_PKCRYPT "Enables PKWARE traditional encryption" ON)
option(USE_AES "Enables AES encryption" ON)
option(USE_WZAES "Enables WinZIP AES encryption" ON)
option(USE_LIBCOMP "Enables Apple compression" OFF)
option(USE_OPENSSL "Enables OpenSSL for encryption" OFF)
option(USE_BRG "Enables Brian Gladman's encryption library" OFF)
@ -163,7 +163,7 @@ endif()
if(DECOMPRESS_ONLY)
add_definitions(-DMZ_ZIP_NO_COMPRESSION)
endif()
if(NOT USE_PKCRYPT AND NOT USE_AES)
if(NOT USE_PKCRYPT AND NOT USE_WZAES)
add_definitions(-DMZ_ZIP_NO_ENCRYPTION)
endif()
@ -198,7 +198,7 @@ if(WIN32)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
list(APPEND MINIZIP_SRC "mz_os_win32.c" "mz_strm_os_win32.c")
if (USE_PKCRYPT OR USE_AES)
if (USE_PKCRYPT OR USE_WZAES)
if (NOT USE_OPENSSL AND NOT OPENSSL_FOUND AND NOT USE_BRG)
list(APPEND MINIZIP_SRC "mz_crypt_win32.c")
endif()
@ -213,7 +213,7 @@ if(UNIX)
add_definitions(-D_POSIX_C_SOURCE=200112L)
list(APPEND MINIZIP_SRC "mz_os_posix.c" "mz_strm_os_posix.c")
if ((USE_PKCRYPT OR USE_AES) AND NOT (USE_OPENSSL AND OPENSSL_FOUND))
if ((USE_PKCRYPT OR USE_WZAES) AND NOT (USE_OPENSSL AND OPENSSL_FOUND))
if (APPLE AND NOT USE_BRG)
list(APPEND MINIZIP_SRC "mz_crypt_apple.c")
@ -296,9 +296,9 @@ if(USE_PKCRYPT)
list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_pkcrypt.h")
endif()
# Include AES
if(USE_AES)
add_definitions(-DHAVE_AES)
# Include WinZIP AES
if(USE_WZAES)
add_definitions(-DHAVE_WZAES)
list(APPEND MINIZIP_SRC "mz_strm_wzaes.c")
list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_wzaes.h")
@ -341,7 +341,7 @@ endif()
# Include ZLIB
if(USE_ZLIB)
if(USE_LIBCOMP)
add_definitions(-DHAVE_APPLE_COMPRESSION)
add_definitions(-DHAVE_LIBCOMP)
list(APPEND MINIZIP_SRC "mz_strm_libcomp.c")
list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_libcomp.h")
@ -696,11 +696,12 @@ if(BUILD_UNIT_TEST)
if(USE_PKCRYPT)
create_compress_tests("pkcrypt" "-p;1234567890")
endif()
if(USE_AES)
create_compress_tests("winzipaes" "-s;-p;1234567890")
if(USE_WZAES)
create_compress_tests("wzaes" "-s;-p;1234567890")
endif()
if(USE_OPENSSL AND OPENSSL_FOUND)
create_compress_tests("signing" "-h;ia.p12;-w;test")
create_compress_tests("signed" "-h;ia.p12;-w;test")
create_compress_tests("secure" "-z;-h;ia.p12;-w;test")
endif()
endif()

2
README.md
View File

@ -73,7 +73,7 @@ cmake --build .
| USE_BZIP2 | Enables BZIP2 compression | ON |
| USE_LZMA | Enables LZMA compression | ON |
| USE_PKCRYPT | Enables PKWARE traditional encryption | ON |
| USE_AES | Enables WinZIP AES encryption | ON |
| USE_WZAES | Enables WinZIP AES encryption | ON |
| USE_LIBCOMP | Enables Apple compression | OFF |
| USE_OPENSSL | Enables OpenSSL encryption | OFF |
| USE_BRG | Enables Brian Gladman's library | OFF |

2
minizip.c
View File

@ -584,7 +584,7 @@ int main(int argc, const char *argv[])
err = MZ_SUPPORT_ERROR;
#endif
else if ((c == 's') || (c == 'S'))
#ifdef HAVE_AES
#ifdef HAVE_WZAES
options.aes = 1;
#else
err = MZ_SUPPORT_ERROR;

2
mz_compat.c
View File

@ -191,7 +191,7 @@ int ZEXPORT zipOpenNewFileInZip5(zipFile file, const char *filename, const zip_f
file_info.zip64 = MZ_ZIP64_FORCE;
else
file_info.zip64 = MZ_ZIP64_DISABLE;
#ifdef HAVE_AES
#ifdef HAVE_WZAES
if ((password != NULL) || (raw && (file_info.flag & MZ_ZIP_FLAG_ENCRYPTED)))
file_info.aes_version = MZ_AES_VERSION;
#endif

2
mz_os.h
View File

@ -28,7 +28,7 @@ extern "C" {
#ifdef HAVE_LZMA
#define MZ_VERSION_MADEBY_ZIP_VERSION (63)
#elif HAVE_AES
#elif HAVE_WZAES
#define MZ_VERSION_MADEBY_ZIP_VERSION (51)
#elif HAVE_BZIP2
#define MZ_VERSION_MADEBY_ZIP_VERSION (46)

6
mz_strm_libcomp.c
View File

@ -121,7 +121,7 @@ int32_t mz_stream_libcomp_read(void *stream, void *buf, int32_t size)
int32_t out_bytes = 0;
int32_t bytes_to_read = 0;
int32_t read = 0;
int32_t err = Z_OK;
int32_t err = MZ_OK;
int16_t flags = 0;
libcomp->cstream.dst_ptr = buf;
@ -200,7 +200,7 @@ static int32_t mz_stream_libcomp_deflate(void *stream, int flush)
uint64_t total_out_before = 0;
uint64_t total_out_after = 0;
uint32_t out_bytes = 0;
int32_t err = Z_OK;
int32_t err = MZ_OK;
do
@ -302,7 +302,7 @@ int32_t mz_stream_libcomp_close(void *stream)
libcomp->initialized = 0;
if (libcomp->error != Z_OK)
if (libcomp->error != MZ_OK)
return MZ_CLOSE_ERROR;
return MZ_OK;
}

24
mz_zip.c
View File

@ -23,7 +23,7 @@
#ifdef HAVE_BZIP2
# include "mz_strm_bzip.h"
#endif
#ifdef HAVE_APPLE_COMPRESSION
#ifdef HAVE_LIBCOMP
# include "mz_strm_libcomp.h"
#endif
#ifdef HAVE_LZMA
@ -33,7 +33,7 @@
#ifdef HAVE_PKCRYPT
# include "mz_strm_pkcrypt.h"
#endif
#ifdef HAVE_AES
#ifdef HAVE_WZAES
# include "mz_strm_wzaes.h"
#endif
#ifdef HAVE_ZLIB
@ -371,7 +371,7 @@ static int32_t mz_zip_entry_read_header(void *stream, uint8_t local, mz_zip_file
/* Skip variable data */
mz_stream_seek(file_extra_stream, field_length - 12, MZ_SEEK_CUR);
}
#ifdef HAVE_AES
#ifdef HAVE_WZAES
/* Read AES extra field */
else if ((field_type == MZ_ZIP_EXTENSION_AES) && (field_length == 7))
{
@ -578,7 +578,7 @@ static int32_t mz_zip_entry_write_header(void *stream, uint8_t local, mz_zip_fil
while (err_mem == MZ_OK);
}
#ifdef HAVE_AES
#ifdef HAVE_WZAES
if (!skip_aes)
{
if ((file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version))
@ -618,7 +618,7 @@ static int32_t mz_zip_entry_write_header(void *stream, uint8_t local, mz_zip_fil
version_needed = 20;
if (zip64)
version_needed = 45;
#ifdef HAVE_AES
#ifdef HAVE_WZAES
if ((file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version))
version_needed = 51;
#endif
@ -633,7 +633,7 @@ static int32_t mz_zip_entry_write_header(void *stream, uint8_t local, mz_zip_fil
err = mz_stream_write_uint16(stream, file_info->flag);
if (err == MZ_OK)
{
#ifdef HAVE_AES
#ifdef HAVE_WZAES
if ((file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version))
err = mz_stream_write_uint16(stream, MZ_COMPRESS_METHOD_AES);
else
@ -802,7 +802,7 @@ static int32_t mz_zip_entry_write_header(void *stream, uint8_t local, mz_zip_fil
err = mz_stream_write_uint64(stream, ntfs_time);
}
}
#ifdef HAVE_AES
#ifdef HAVE_WZAES
/* Write AES extra field */
if ((err == MZ_OK) && (!skip_aes) && (file_info->flag & MZ_ZIP_FLAG_ENCRYPTED) && (file_info->aes_version))
{
@ -1572,7 +1572,7 @@ static int32_t mz_zip_entry_open_int(void *handle, uint8_t raw, int16_t compress
if ((err == MZ_OK) && (use_crypt))
{
#ifdef HAVE_AES
#ifdef HAVE_WZAES
if (zip->file_info.aes_version)
{
mz_stream_wzaes_create(&zip->crypt_stream);
@ -1625,7 +1625,7 @@ static int32_t mz_zip_entry_open_int(void *handle, uint8_t raw, int16_t compress
{
if (zip->entry_raw || zip->file_info.compression_method == MZ_COMPRESS_METHOD_STORE)
mz_stream_raw_create(&zip->compress_stream);
#if defined(HAVE_ZLIB) || defined(HAVE_APPLE_COMPRESSION)
#if defined(HAVE_ZLIB) || defined(HAVE_LIBCOMP)
else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_DEFLATE)
mz_stream_zlib_create(&zip->compress_stream);
#endif
@ -1649,7 +1649,7 @@ static int32_t mz_zip_entry_open_int(void *handle, uint8_t raw, int16_t compress
}
else
{
#ifndef HAVE_APPLE_COMPRESSION
#ifndef HAVE_LIBCOMP
if (zip->entry_raw || zip->file_info.compression_method == MZ_COMPRESS_METHOD_STORE || zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED)
#endif
{
@ -1856,7 +1856,7 @@ int32_t mz_zip_entry_write_open(void *handle, const mz_zip_file *file_info, int1
zip->file_info.crc = 0;
zip->file_info.compressed_size = 0;
#ifdef HAVE_AES
#ifdef HAVE_WZAES
if (zip->file_info.aes_version && zip->file_info.aes_encryption_mode == 0)
zip->file_info.aes_encryption_mode = MZ_AES_ENCRYPTION_MODE_256;
#endif
@ -1985,7 +1985,7 @@ int32_t mz_zip_entry_close_raw(void *handle, int64_t uncompressed_size, uint32_t
/* If entire entry was not read verification will fail */
if ((total_in > 0) && (!zip->entry_raw))
{
#ifdef HAVE_AES
#ifdef HAVE_WZAES
/* AES zip version AE-1 will expect a valid crc as well */
if (zip->file_info.aes_version <= 0x0001)
#endif

2
mz_zip.h
View File

@ -43,7 +43,7 @@ typedef struct mz_zip_file_s
uint16_t internal_fa; /* internal file attributes */
uint32_t external_fa; /* external file attributes */
uint16_t zip64; /* zip64 extension mode */
#ifdef HAVE_AES
#ifdef HAVE_WZAES
uint16_t aes_version; /* winzip aes extension if not 0 */
uint8_t aes_encryption_mode; /* winzip aes encryption mode */
#endif

2
mz_zip_rw.c
View File

@ -1660,7 +1660,7 @@ int32_t mz_zip_writer_add_file(void *handle, const char *path, const char *filen
if (writer->zip_cd)
file_info.flag |= MZ_ZIP_FLAG_MASK_LOCAL_INFO;
#ifdef HAVE_AES
#ifdef HAVE_WZAES
if (writer->aes)
file_info.aes_version = MZ_AES_VERSION;
#endif

6
test/test.c
View File

@ -21,7 +21,7 @@
#endif
#include "mz_strm_mem.h"
#include "mz_strm_os.h"
#ifdef HAVE_AES
#ifdef HAVE_WZAES
#include "mz_strm_wzaes.h"
#endif
#ifdef HAVE_ZLIB
@ -257,7 +257,7 @@ void test_stream_pkcrypt(void)
test_encrypt("pkcrypt", mz_stream_pkcrypt_create, "hello");
}
#endif
#ifdef HAVE_AES
#ifdef HAVE_WZAES
void test_stream_wzaes(void)
{
int32_t iteration_count = 1000;
@ -335,7 +335,7 @@ void test_stream_mem(void)
file_info.compression_method = MZ_COMPRESS_METHOD_DEFLATE;
file_info.filename = text_name;
file_info.uncompressed_size = text_size;
#ifdef HAVE_AES
#ifdef HAVE_WZAES
file_info.aes_version = MZ_AES_VERSION;
#endif