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 support for PKCRYPT even when native crypto library not found.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2021-01-10 13:12:13 -08:00
parent cda5826856
commit 7598f1b1b3
4 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
CMakeLists.txt
View File

@ -416,9 +416,13 @@ if(WIN32)
list(APPEND MINIZIP_DEF -D_CRT_SECURE_NO_DEPRECATE)
list(APPEND MINIZIP_SRC mz_os_win32.c mz_strm_os_win32.c)
if((MZ_PKCRYPT OR MZ_WZAES) AND NOT MZ_OPENSSL)
list(APPEND MINIZIP_SRC mz_crypt_win32.c)
list(APPEND MINIZIP_LIB crypt32.lib)
if(MZ_PKCRYPT OR MZ_WZAES)
if(NOT MZ_OPENSSL)
message(STATUS "Using CryptoAPI")
list(APPEND MINIZIP_SRC mz_crypt_win32.c)
list(APPEND MINIZIP_LIB crypt32.lib)
endif()
endif()
endif()
if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
@ -446,14 +450,30 @@ if(UNIX)
check_include_file(CommonCrypto/CommonCrypto.h COMMONCRYPTO_FOUND)
if(COMMONCRYPTO_FOUND)
message(STATUS "Using CommonCrypto")
list(APPEND MINIZIP_SRC mz_crypt_apple.c)
set(MZ_LIBBSD OFF)
elseif(MZ_WZAES)
else()
message(STATUS "CommonCrypto library not found")
message(STATUS "WinZIP AES support requires CommonCrypto or OpenSSL")
set(MZ_WZAES OFF)
list(APPEND MINIZIP_DEF -DMZ_ZIP_NO_CRYPTO)
if(MZ_WZAES)
message(STATUS "WinZIP AES support requires CommonCrypto or OpenSSL")
set(MZ_WZAES OFF)
endif()
if(MZ_SIGNING)
message(STATUS "Signing support requires CommonCrypto or OpenSSL")
set(MZ_SIGNING OFF)
endif()
endif()
else()
list(APPEND MINIZIP_DEF -DMZ_ZIP_NO_CRYPTO)
if(MZ_WZAES)
message(STATUS "WinZIP AES support requires OpenSSL")

9
mz_crypt.c
View File

@ -10,6 +10,7 @@
#include "mz.h"
#include "mz_os.h"
#include "mz_crypt.h"
#if defined(HAVE_ZLIB)
@ -40,6 +41,12 @@
/***************************************************************************/
#if defined(MZ_ZIP_NO_CRYPTO)
int32_t mz_crypt_rand(uint8_t *buf, int32_t size) {
return mz_os_rand(buf, size);
}
#endif
uint32_t mz_crypt_crc32_update(uint32_t value, const uint8_t *buf, int32_t size) {
#if defined(HAVE_ZLIB)
return (uint32_t)ZLIB_PREFIX(crc32)((z_crc_t)value, buf, (uInt)size);
@ -104,7 +111,7 @@ uint32_t mz_crypt_crc32_update(uint32_t value, const uint8_t *buf, int32_t size)
#endif
}
#ifndef MZ_ZIP_NO_ENCRYPTION
#if defined(HAVE_WZAES)
int32_t mz_crypt_pbkdf2(uint8_t *password, int32_t password_length, uint8_t *salt,
int32_t salt_length, int32_t iteration_count, uint8_t *key, int32_t key_length) {
void *hmac1 = NULL;

16
mz_zip_rw.c
View File

@ -382,7 +382,7 @@ int32_t mz_zip_reader_entry_open(void *handle) {
}
err = mz_zip_entry_read_open(reader->zip_handle, reader->raw, password);
#ifndef MZ_ZIP_NO_ENCRYPTION
#ifndef MZ_ZIP_NO_CRYPTO
if (err != MZ_OK)
return err;
@ -418,7 +418,7 @@ int32_t mz_zip_reader_entry_close(void *handle) {
mz_zip_reader *reader = (mz_zip_reader *)handle;
int32_t err = MZ_OK;
int32_t err_close = MZ_OK;
#ifndef MZ_ZIP_NO_ENCRYPTION
#ifndef MZ_ZIP_NO_CRYPTO
int32_t err_hash = MZ_OK;
uint8_t computed_hash[MZ_HASH_MAX_SIZE];
uint8_t expected_hash[MZ_HASH_MAX_SIZE];
@ -448,7 +448,7 @@ int32_t mz_zip_reader_entry_read(void *handle, void *buf, int32_t len) {
mz_zip_reader *reader = (mz_zip_reader *)handle;
int32_t read = 0;
read = mz_zip_entry_read(reader->zip_handle, buf, len);
#ifndef MZ_ZIP_NO_ENCRYPTION
#ifndef MZ_ZIP_NO_CRYPTO
if ((read > 0) && (reader->hash != NULL))
mz_crypt_sha_update(reader->hash, buf, read);
#endif
@ -465,7 +465,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_SIGNING)
#if !defined(MZ_ZIP_NO_CRYPTO) && defined(MZ_ZIP_SIGNING)
int32_t mz_zip_reader_entry_sign_verify(void *handle) {
mz_zip_reader *reader = (mz_zip_reader *)handle;
void *file_extra_stream = NULL;
@ -1287,7 +1287,7 @@ int32_t mz_zip_writer_entry_open(void *handle, mz_zip_file *file_info) {
password = password_buf;
}
#ifndef MZ_ZIP_NO_ENCRYPTION
#ifndef MZ_ZIP_NO_CRYPTO
if (mz_zip_attrib_is_dir(writer->file_info.external_fa, writer->file_info.version_madeby) != MZ_OK) {
/* Start calculating sha256 */
mz_crypt_sha_create(&writer->sha256);
@ -1303,7 +1303,7 @@ int32_t mz_zip_writer_entry_open(void *handle, mz_zip_file *file_info) {
return err;
}
#if !defined(MZ_ZIP_NO_ENCRYPTION) && defined(MZ_ZIP_SIGNING)
#if !defined(MZ_ZIP_NO_CRYPTO) && 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) {
mz_zip_writer *writer = (mz_zip_writer *)handle;
@ -1341,7 +1341,7 @@ int32_t mz_zip_writer_entry_sign(void *handle, uint8_t *message, int32_t message
int32_t mz_zip_writer_entry_close(void *handle) {
mz_zip_writer *writer = (mz_zip_writer *)handle;
int32_t err = MZ_OK;
#ifndef MZ_ZIP_NO_ENCRYPTION
#ifndef MZ_ZIP_NO_CRYPTO
const uint8_t *extrafield = NULL;
int32_t extrafield_size = 0;
int16_t field_length_hash = 0;
@ -1408,7 +1408,7 @@ int32_t mz_zip_writer_entry_write(void *handle, const void *buf, int32_t len) {
mz_zip_writer *writer = (mz_zip_writer *)handle;
int32_t written = 0;
written = mz_zip_entry_write(writer->zip_handle, buf, len);
#ifndef MZ_ZIP_NO_ENCRYPTION
#ifndef MZ_ZIP_NO_CRYPTO
if ((written > 0) && (writer->sha256 != NULL))
mz_crypt_sha_update(writer->sha256, buf, written);
#endif

4
test/test.c
View File

@ -615,7 +615,7 @@ int32_t convert_buffer_to_hex_string(uint8_t *buf, int32_t buf_size, char *hex_s
return MZ_OK;
}
#ifndef MZ_ZIP_NO_ENCRYPTION
#ifndef MZ_ZIP_NO_CRYPTO
int32_t test_crypt_sha(void)
{
void *sha1 = NULL;
@ -1046,10 +1046,10 @@ int main(int argc, const char *argv[])
#endif
#endif
#if !defined(MZ_ZIP_NO_ENCRYPTION)
#ifdef HAVE_PKCRYPT
err |= test_stream_pkcrypt();
#endif
#if !defined(MZ_ZIP_NO_CRYPTO)
#ifdef HAVE_WZAES
err |= test_stream_wzaes();
#endif