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 Zip AE-2 and fixed AE-1

Browse Source 
AE-1 was not checking the CRC32.
This commit is contained in:
Steven Christy 2014-03-07 13:53:29 -06:00
parent bb05c753a6
commit 9f8274cf65
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
unzip.c
View File

@ -98,6 +98,7 @@ typedef struct unz_file_info64_internal_s
#ifdef HAVE_AES
uLong aes_encryption_mode;
uLong aes_compression_method;
uLong aes_version;
#endif
} unz_file_info64_internal;
@ -771,6 +772,7 @@ local int unz64local_GetCurrentFileInfoInternal(unzFile file, unz_file_info64 *p
#ifdef HAVE_AES
file_info_internal.aes_compression_method = 0;
file_info_internal.aes_encryption_mode = 0;
file_info_internal.aes_version = 0;
#endif
lSeek += file_info.size_filename;
@ -884,8 +886,10 @@ local int unz64local_GetCurrentFileInfoInternal(unzFile file, unz_file_info64 *p
/* Verify version info */
if (unz64local_getShort(&s->z_filefunc, s->filestream_with_CD, &uL) != UNZ_OK)
err = UNZ_ERRNO;
if (uL != 1)
/* Support AE-1 and AE-2 */
if (uL != 1 && uL != 2)
err = UNZ_ERRNO;
file_info_internal.aes_version = uL;
if (unz64local_getByte(&s->z_filefunc, s->filestream_with_CD, &uL) != UNZ_OK)
err = UNZ_ERRNO;
if ((char)uL != 'A')
@ -1610,6 +1614,17 @@ extern int ZEXPORT unzCloseCurrentFile(unzFile file)
err = UNZ_CRCERROR;
if (memcmp(authcode, rauthcode, AES_AUTHCODESIZE) != 0)
err = UNZ_CRCERROR;
/* AES zip version AE-1 will expect a valid crc as well */
if ( s->cur_file_info_internal.aes_version == 0x0001 )
{
if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
(!pfile_in_zip_read_info->raw))
{
if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
err = UNZ_CRCERROR;
}
}
}
else
#endif