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

Added option to enable signing which is by default turned on. But now at least people don't have to define MZ_ZIP_NO_SIGNING in most projects I see. Signing support now requires MZ_ZIP_SIGNING to be defined.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2019-08-14 20:31:04 -07:00
parent 1e1227b18e
commit 84a398027d
9 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -18,6 +18,7 @@ option(MZ_WZAES "Enables WinZIP AES encryption" ON)
option(MZ_LIBCOMP "Enables Apple compression" OFF)
option(MZ_OPENSSL "Enables OpenSSL for encryption" OFF)
option(MZ_BRG "Enables Brian Gladman's encryption library" OFF)
option(MZ_SIGNING "Enables zip signing support" ON)
option(MZ_COMPRESS_ONLY "Only support compression" OFF)
option(MZ_DECOMPRESS_ONLY "Only support decompression" OFF)
option(MZ_BUILD_TEST "Builds minizip test executable" OFF)
@ -241,6 +242,9 @@ endif()
if(NOT MZ_PKCRYPT AND NOT MZ_WZAES)
add_definitions(-DMZ_ZIP_NO_ENCRYPTION)
endif()
if(MZ_SIGNING)
add_definitions(-DMZ_ZIP_SIGNING)
endif()
# Windows specific
if(WIN32)
@ -366,8 +370,6 @@ endif()
if(MZ_BRG)
list(APPEND MINIZIP_SRC "mz_crypt_brg.c")
add_definitions(-DMZ_ZIP_NO_SIGNING)
set(BRG_SRC
lib/brg/aescrypt.c
lib/brg/aeskey.c

4
Minizip.podspec
View File

@ -34,14 +34,14 @@ DESC
sp.dependency 'Minizip/Core'
sp.source_files = 'mz_strm_wzaes.{c,h}', 'mz_crypt_apple.c'
sp.framework = 'Security'
sp.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'HAVE_WZAES MZ_ZIP_NO_SIGNING' }
sp.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'HAVE_WZAES' }
end
s.subspec 'WZAES_BRG' do |sp|
# Enables Brian Gladman's encryption library for AES
sp.dependency 'Minizip/Core'
sp.source_files = 'lib/brg/*.{c,h}', 'mz_strm_wzaes.{c,h}', 'mz_crypt_brg.c'
sp.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'HAVE_ARC4RANDOM_BUF HAVE_WZAES MZ_ZIP_NO_SIGNING' }
sp.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'HAVE_ARC4RANDOM_BUF HAVE_WZAES' }
end
s.subspec 'BZIP2' do |sp|

11
README.md
View File

@ -18,12 +18,12 @@ Maintained by Nathan Moinvaziri.
## History
Minizip was originally developed by [Gilles Vollant](https://www.winimage.com/zLibDll/minizip.html) in 1998. It was first included in the zlib distribution as an additional code contribution starting in zlib 1.1.2. Since that time, it has been continually improved upon and contributed to by many people. The original [project](https://github.com/madler/zlib/tree/master/contrib/minizip) can still be found in the zlib distribution that is maintained by Mark Adler.
Minizip was originally developed by [Gilles Vollant](https://www.winimage.com/zLibDll/minizip.html) in 1998. It was first included in the zlib distribution as an additional code contribution starting in zlib 1.1.2. Since that time, it has been continually improved upon and contributed to by many people. The original [project](https://github.com/madler/zlib/tree/master/contrib/minizip) can still be found in the zlib distribution that is maintained by Mark Adler.
My work with the minizip library started in 2006 when I fixed a few bugs I found and submitted them to
Gilles Vollant. In 2010, I implemented WinZip AES encryption, disk splitting, and
I/O buffering that were necessary for another project I was working on. Shortly after, I created this public repository
so I could share my improvements with the community. In early 2017, I began the work to refactor and rewrite
My work with the minizip library started in 2006 when I fixed a few bugs I found and submitted them to
Gilles Vollant. In 2010, I implemented WinZip AES encryption, disk splitting, and
I/O buffering that were necessary for another project I was working on. Shortly after, I created this public repository
so I could share my improvements with the community. In early 2017, I began the work to refactor and rewrite
the library as version 2 because it had become difficult to maintain and code readability suffered over the years.
## Features
@ -76,6 +76,7 @@ cmake --build .
| MZ_LIBCOMP | Enables Apple compression | OFF |
| MZ_OPENSSL | Enables OpenSSL encryption | OFF |
| MZ_BRG | Enables Brian Gladman's library | OFF |
| MZ_SIGNING | Enabled zip signing support | ON |
| MZ_COMPRESS_ONLY | Only support compression | OFF |
| MZ_DECOMPRESS_ONLY | Only support decompression | OFF |
| MZ_BUILD_TEST | Builds minizip test executable | OFF |

4
minizip.c
View File

@ -668,7 +668,7 @@ int main(int argc, const char *argv[])
#endif
else if (((c == 'h') || (c == 'H')) && (i + 1 < argc))
{
#ifndef MZ_ZIP_NO_SIGNING
#ifdef MZ_ZIP_SIGNING
options.cert_path = argv[i + 1];
printf("%s ", argv[i + 1]);
#else
@ -678,7 +678,7 @@ int main(int argc, const char *argv[])
}
else if (((c == 'w') || (c == 'W')) && (i + 1 < argc))
{
#ifndef MZ_ZIP_NO_SIGNING
#ifdef MZ_ZIP_SIGNING
options.cert_pwd = argv[i + 1];
printf("%s ", argv[i + 1]);
#else

2
mz_crypt_apple.c
View File

@ -406,7 +406,7 @@ void mz_crypt_hmac_delete(void **handle)
/***************************************************************************/
#if !defined(MZ_ZIP_NO_SIGNING)
#if defined(MZ_ZIP_SIGNING)
int32_t mz_crypt_sign(uint8_t *message, int32_t message_size, uint8_t *cert_data, int32_t cert_data_size,
const char *cert_pwd, uint8_t **signature, int32_t *signature_size)
{

2
mz_crypt_brg.c
View File

@ -417,7 +417,7 @@ void mz_crypt_hmac_delete(void **handle)
/***************************************************************************/
#if !defined(MZ_ZIP_NO_SIGNING)
#if defined(MZ_ZIP_SIGNING)
int32_t mz_crypt_sign(uint8_t *message, int32_t message_size, uint8_t *cert_data, int32_t cert_data_size,
const char *cert_pwd, uint8_t **signature, int32_t *signature_size)
{

2
mz_crypt_openssl.c
View File

@ -461,7 +461,7 @@ void mz_crypt_hmac_delete(void **handle)
/***************************************************************************/
#if !defined(MZ_ZIP_NO_SIGNING)
#if defined(MZ_ZIP_SIGNING)
int32_t mz_crypt_sign(uint8_t *message, int32_t message_size, uint8_t *cert_data, int32_t cert_data_size,
const char *cert_pwd, uint8_t **signature, int32_t *signature_size)
{

2
mz_crypt_win32.c
View File

@ -559,7 +559,7 @@ void mz_crypt_hmac_delete(void **handle)
/***************************************************************************/
#if !defined(MZ_ZIP_NO_SIGNING)
#if defined(MZ_ZIP_SIGNING)
int32_t mz_crypt_sign(uint8_t *message, int32_t message_size, uint8_t *cert_data, int32_t cert_data_size,
const char *cert_pwd, uint8_t **signature, int32_t *signature_size)
{

6
mz_zip_rw.c
View File

@ -421,7 +421,7 @@ int32_t mz_zip_reader_entry_open(void *handle)
if (err == MZ_OK)
mz_crypt_sha_begin(reader->hash);
#ifndef MZ_ZIP_NO_SIGNING
#ifdef MZ_ZIP_SIGNING
if (err == MZ_OK)
{
if (mz_zip_reader_entry_has_sign(handle) == MZ_OK)
@ -498,7 +498,7 @@ int32_t mz_zip_reader_entry_has_sign(void *handle)
reader->file_info->extrafield_size, MZ_ZIP_EXTENSION_SIGN, NULL);
}
#if !defined(MZ_ZIP_NO_ENCRYPTION) && !defined(MZ_ZIP_NO_SIGNING)
#if !defined(MZ_ZIP_NO_ENCRYPTION) && defined(MZ_ZIP_SIGNING)
int32_t mz_zip_reader_entry_sign_verify(void *handle)
{
mz_zip_reader *reader = (mz_zip_reader *)handle;
@ -1473,7 +1473,7 @@ int32_t mz_zip_writer_entry_write(void *handle, const void *buf, int32_t len)
return written;
}
#if !defined(MZ_ZIP_NO_ENCRYPTION) && !defined(MZ_ZIP_NO_SIGNING)
#if !defined(MZ_ZIP_NO_ENCRYPTION) && defined(MZ_ZIP_SIGNING)
int32_t mz_zip_writer_entry_sign(void *handle, uint8_t *message, int32_t message_size,
uint8_t *cert_data, int32_t cert_data_size, const char *cert_pwd)
{