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

Support MZ_ZIP_DECOMPRESS_ONLY and MZ_ZIP_COMPRESS_ONLY only encryption streams. #283

Browse Source
This commit is contained in:
Nathan Moinvaziri 2018-07-22 10:18:53 -07:00
parent 7332bd6002
commit f9ee9d7f08
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mz_strm_aes.c
View File

@ -108,12 +108,20 @@ int32_t mz_stream_aes_open(void *stream, const char *path, int32_t mode)
if (mode & MZ_OPEN_MODE_WRITE)
{
#ifdef MZ_ZIP_DECOMPRESS_ONLY
return MZ_SUPPORT_ERROR;
#else
mz_os_rand(salt_value, salt_length);
#endif
}
else if (mode & MZ_OPEN_MODE_READ)
{
#ifdef MZ_ZIP_COMPRESS_ONLY
return MZ_SUPPORT_ERROR;
#else
if (mz_stream_read(aes->stream.base, salt_value, salt_length) != salt_length)
return MZ_STREAM_ERROR;
#endif
}
key_length = MZ_AES_KEY_LENGTH(aes->encryption_mode);

8
mz_strm_pkcrypt.c
View File

@ -158,6 +158,9 @@ int32_t mz_stream_pkcrypt_open(void *stream, const char *path, int32_t mode)
if (mode & MZ_OPEN_MODE_WRITE)
{
#ifdef MZ_ZIP_DECOMPRESS_ONLY
return MZ_SUPPORT_ERROR;
#else
// First generate RAND_HEAD_LEN - 2 random bytes.
mz_os_rand(header, RAND_HEAD_LEN - 2);
@ -172,9 +175,13 @@ int32_t mz_stream_pkcrypt_open(void *stream, const char *path, int32_t mode)
return MZ_STREAM_ERROR;
pkcrypt->total_out += RAND_HEAD_LEN;
#endif
}
else if (mode & MZ_OPEN_MODE_READ)
{
#ifdef MZ_ZIP_COMPRESS_ONLY
return MZ_SUPPORT_ERROR;
#else
if (mz_stream_read(pkcrypt->stream.base, header, RAND_HEAD_LEN) != RAND_HEAD_LEN)
return MZ_STREAM_ERROR;
@ -190,6 +197,7 @@ int32_t mz_stream_pkcrypt_open(void *stream, const char *path, int32_t mode)
return MZ_PASSWORD_ERROR;
pkcrypt->total_in += RAND_HEAD_LEN;
#endif
}
pkcrypt->initialized = 1;