mirror of
https://github.com/zlib-ng/minizip-ng
synced 2025-03-28 21:13:18 +00:00
Fixed libcompression compilation.
This commit is contained in:
Nathan Moinvaziri
parent
0a60d2ca2a
commit
90d31c791d
@ -52,13 +52,12 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/minizip.pc.cmakein ${MINIZIP_PC} @ONL
|
||||
set(PROJECT_NAME libminizip)
|
||||
|
||||
# Ensure correct version of zlib is referenced
|
||||
if(USE_ZLIB)
|
||||
if(USE_ZLIB AND NOT USE_LIBCOMP)
|
||||
set(ZLIB_ROOT ${DEF_ZLIB_ROOT} CACHE PATH "Parent directory of zlib installation")
|
||||
find_package(ZLIB)
|
||||
if(ZLIB_FOUND)
|
||||
message(STATUS "Using ZLIB ${ZLIB_VERSION_STRING}")
|
||||
include_directories(${ZLIB_INCLUDE_DIRS})
|
||||
add_definitions(-DHAVE_ZLIB)
|
||||
else()
|
||||
if (NOT ZLIB_TAG)
|
||||
set(ZLIB_TAG master)
|
||||
@ -107,7 +106,6 @@ if(USE_ZLIB)
|
||||
)
|
||||
|
||||
include_directories(${ZLIB_INCLUDE_DIRS})
|
||||
add_definitions(-DHAVE_ZLIB)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@ -341,12 +339,14 @@ endif()
|
||||
|
||||
# Include ZLIB
|
||||
if(USE_ZLIB)
|
||||
add_definitions(-DHAVE_ZLIB)
|
||||
|
||||
if(USE_LIBCOMP)
|
||||
add_definitions(-DHAVE_APPLE_COMPRESSION)
|
||||
|
||||
list(APPEND MINIZIP_SRC "mz_strm_libcomp.c")
|
||||
list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_libcomp.h")
|
||||
else()
|
||||
else()
|
||||
add_definitions(-DHAVE_ZLIB)
|
||||
|
||||
list(APPEND MINIZIP_SRC "mz_strm_zlib.c")
|
||||
list(APPEND MINIZIP_PUBLIC_HEADERS "mz_strm_zlib.h")
|
||||
|
||||
@ -570,7 +570,7 @@ if (MSVC AND BUILD_SHARED_LIBS)
|
||||
endif ()
|
||||
|
||||
# Link with external libraries
|
||||
if(USE_ZLIB)
|
||||
if(USE_ZLIB AND NOT USE_LIBCOMP)
|
||||
target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES})
|
||||
if(NOT ZLIB_FOUND)
|
||||
add_dependencies(${PROJECT_NAME} zlib)
|
||||
@ -716,4 +716,4 @@ if(BUILD_FUZZ_TEST)
|
||||
install(TARGETS zip_fuzzer RUNTIME DESTINATION "bin")
|
||||
install(TARGETS unzip_fuzzer RUNTIME DESTINATION "bin")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
16
mz_crypt.c
16
mz_crypt.c
@ -14,9 +14,9 @@
|
||||
#include "mz_crypt.h"
|
||||
|
||||
#if defined(HAVE_ZLIB)
|
||||
#include "zlib.h"
|
||||
# include "zlib.h"
|
||||
#elif defined(HAVE_LZMA)
|
||||
#include "lzma.h"
|
||||
# include "lzma.h"
|
||||
#endif
|
||||
|
||||
/***************************************************************************/
|
||||
@ -25,7 +25,7 @@ uint32_t mz_crypt_crc32_update(uint32_t value, const uint8_t *buf, int32_t size)
|
||||
{
|
||||
#if defined(HAVE_ZLIB)
|
||||
// Define z_crc_t in zlib 1.2.5 and less or if using zlib-ng
|
||||
#if defined(ZLIBNG_VERNUM)
|
||||
#ifdef ZLIBNG_VERNUM
|
||||
typedef uint32_t z_crc_t;
|
||||
#elif (ZLIB_VERNUM < 0x1270)
|
||||
typedef unsigned long z_crc_t;
|
||||
@ -123,7 +123,8 @@ int32_t mz_crypt_pbkdf2(uint8_t *password, int32_t password_length, uint8_t *sa
|
||||
mz_crypt_hmac_set_algorithm(hmac3, MZ_HASH_SHA1);
|
||||
|
||||
err = mz_crypt_hmac_init(hmac1, password, password_length);
|
||||
err = mz_crypt_hmac_init(hmac2, password, password_length);
|
||||
if (err == MZ_OK)
|
||||
err = mz_crypt_hmac_init(hmac2, password, password_length);
|
||||
if (err == MZ_OK)
|
||||
err = mz_crypt_hmac_update(hmac2, salt, salt_length);
|
||||
|
||||
@ -145,8 +146,11 @@ int32_t mz_crypt_pbkdf2(uint8_t *password, int32_t password_length, uint8_t *sa
|
||||
for (j = 0, k = 4; j < iteration_count; j += 1)
|
||||
{
|
||||
err = mz_crypt_hmac_update(hmac3, uu, k);
|
||||
err = mz_crypt_hmac_end(hmac3, uu, sizeof(uu));
|
||||
|
||||
if (err == MZ_OK)
|
||||
err = mz_crypt_hmac_end(hmac3, uu, sizeof(uu));
|
||||
if (err != MZ_OK)
|
||||
break;
|
||||
|
||||
for(k = 0; k < MZ_HASH_SHA1_SIZE; k += 1)
|
||||
ux[k] ^= uu[k];
|
||||
|
||||
|
||||
@ -124,7 +124,7 @@ int32_t mz_stream_libcomp_read(void *stream, void *buf, int32_t size)
|
||||
int32_t bytes_to_read = 0;
|
||||
int32_t read = 0;
|
||||
int32_t err = Z_OK;
|
||||
|
||||
int16_t flags = 0;
|
||||
|
||||
libcomp->cstream.dst_ptr = buf;
|
||||
libcomp->cstream.dst_size = (size_t)size;
|
||||
@ -144,8 +144,6 @@ int32_t mz_stream_libcomp_read(void *stream, void *buf, int32_t size)
|
||||
|
||||
if (read < 0)
|
||||
return read;
|
||||
if (read == 0)
|
||||
break;
|
||||
|
||||
libcomp->cstream.src_ptr = libcomp->buffer;
|
||||
libcomp->cstream.src_size = (size_t)read;
|
||||
@ -154,7 +152,7 @@ int32_t mz_stream_libcomp_read(void *stream, void *buf, int32_t size)
|
||||
total_in_before = libcomp->cstream.src_size;
|
||||
total_out_before = libcomp->cstream.dst_size;
|
||||
|
||||
err = compression_stream_process(&libcomp->cstream, 0);
|
||||
err = compression_stream_process(&libcomp->cstream, flags);
|
||||
if (err == COMPRESSION_STATUS_ERROR)
|
||||
{
|
||||
libcomp->error = err;
|
||||
@ -428,13 +426,3 @@ void *mz_stream_zlib_get_interface(void)
|
||||
{
|
||||
return (void *)&mz_stream_zlib_vtbl;
|
||||
}
|
||||
|
||||
static int64_t mz_stream_zlib_crc32(int64_t value, const void *buf, int32_t size)
|
||||
{
|
||||
return (int64_t)crc32((z_crc_t)value, buf, (uint32_t)size);
|
||||
}
|
||||
|
||||
void *mz_stream_zlib_get_crc32_update(void)
|
||||
{
|
||||
return (void *)mz_stream_zlib_crc32;
|
||||
}
|
||||
|
||||
7
mz_zip.c
7
mz_zip.c
@ -23,6 +23,9 @@
|
||||
#ifdef HAVE_BZIP2
|
||||
# include "mz_strm_bzip.h"
|
||||
#endif
|
||||
#ifdef HAVE_APPLE_COMPRESSION
|
||||
# include "mz_strm_libcomp.h"
|
||||
#endif
|
||||
#ifdef HAVE_LZMA
|
||||
# include "mz_strm_lzma.h"
|
||||
#endif
|
||||
@ -1621,7 +1624,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);
|
||||
#ifdef HAVE_ZLIB
|
||||
#if defined(HAVE_ZLIB) || defined(HAVE_APPLE_COMPRESSION)
|
||||
else if (zip->file_info.compression_method == MZ_COMPRESS_METHOD_DEFLATE)
|
||||
mz_stream_zlib_create(&zip->compress_stream);
|
||||
#endif
|
||||
@ -1645,7 +1648,9 @@ static int32_t mz_zip_entry_open_int(void *handle, uint8_t raw, int16_t compress
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifndef HAVE_APPLE_COMPRESSION
|
||||
if (zip->entry_raw || zip->file_info.compression_method == MZ_COMPRESS_METHOD_STORE || zip->file_info.flag & MZ_ZIP_FLAG_ENCRYPTED)
|
||||
#endif
|
||||
{
|
||||
max_total_in = zip->file_info.compressed_size;
|
||||
mz_stream_set_prop_int64(zip->crypt_stream, MZ_STREAM_PROP_TOTAL_IN_MAX, max_total_in);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user