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

Use general purpose encrypted flag when using password.

Browse Source
This commit is contained in:
Nathan Moinvaziri 2014-10-07 21:23:42 -07:00
parent d71932f416
commit b4b4a8d7dd
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unzip.c
View File

@ -158,7 +158,6 @@ typedef struct
/* private info about it*/
file_in_zip64_read_info_s* pfile_in_zip_read;
/* structure about the current file if we are decompressing it */
int encrypted; /* is the current file encrypted */
int isZip64; /* is the current file zip64 */
#ifndef NOUNCRYPT
unsigned long keys[3]; /* keys defining the pseudo-random sequence */
@ -538,7 +537,6 @@ local unzFile unzOpenInternal(const void *path, zlib_filefunc64_32_def* pzlib_fi
us.byte_before_the_zipfile = central_pos - (us.offset_central_dir + us.size_central_dir);
us.central_pos = central_pos;
us.pfile_in_zip_read = NULL;
us.encrypted = 0;
s = (unz64_s*)ALLOC(sizeof(unz64_s));
if (s != NULL)
@ -1235,16 +1233,14 @@ extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int* method, int* level, in
pfile_in_zip_read_info->stream.avail_in = (uInt)0;
s->pfile_in_zip_read = pfile_in_zip_read_info;
s->encrypted = 0;
#ifndef NOUNCRYPT
if (password != NULL)
if ((password != NULL) && ((s->cur_file_info.flag & 1) != 0))
{
if (ZSEEK64(s->z_filefunc, s->filestream,
s->pfile_in_zip_read->pos_in_zipfile + s->pfile_in_zip_read->byte_before_the_zipfile,
ZLIB_FILEFUNC_SEEK_SET) != 0)
return UNZ_INTERNALERROR;
s->encrypted = 1;
#ifdef HAVE_AES
if (s->cur_file_info.compression_method == AES_METHOD)
{
@ -1278,10 +1274,10 @@ extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int* method, int* level, in
s->pcrc_32_tab = (const unsigned long*)get_crc_table();
init_keys(password, s->keys, s->pcrc_32_tab);
if (ZREAD64(s->z_filefunc, s->filestream, source, 12)<12)
if (ZREAD64(s->z_filefunc, s->filestream, source, 12) < 12)
return UNZ_INTERNALERROR;
for (i = 0; i<12; i++)
for (i = 0; i < 12; i++)
zdecode(s->keys, s->pcrc_32_tab, source[i]);
pfile_in_zip_read_info->rest_read_compressed -= 12;
@ -1396,7 +1392,7 @@ extern int ZEXPORT unzReadCurrentFile(unzFile file, voidp buf, unsigned len)
}
#ifndef NOUNCRYPT
if (s->encrypted)
if ((s->cur_file_info.flag & 1) != 0)
{
#ifdef HAVE_AES
if (s->cur_file_info.compression_method == AES_METHOD)

11
zip.c
View File

@ -149,7 +149,6 @@ typedef struct
Byte buffered_data[Z_BUFSIZE]; /* buffer contain compressed data to be writ*/
uLong dosDate;
uLong crc32;
int encrypt;
int zip64; /* Add ZIP64 extended information in the extra field */
uLong number_disk; /* number of current disk used for spanning ZIP */
ZPOS64_T pos_zip64extrainfo;
@ -1026,7 +1025,6 @@ extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file, const char* filename, c
zi->ci.method = method;
zi->ci.compression_method = method;
zi->ci.crc32 = 0;
zi->ci.encrypt = 0;
zi->ci.stream_initialised = 0;
zi->ci.pos_in_buffered_data = 0;
zi->ci.raw = raw;
@ -1042,6 +1040,8 @@ extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file, const char* filename, c
zi->ci.flag |= 1;
#ifdef HAVE_AES
zi->ci.method = AES_METHOD;
#else
zi->ci.flag |= 0x40;
#endif
}
@ -1268,7 +1268,6 @@ extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file, const char* filename, c
zi->ci.crypt_header_size = 0;
if ((err == Z_OK) && (password != NULL))
{
zi->ci.encrypt = 1;
#ifdef HAVE_AES
if (zi->ci.method == AES_METHOD)
{
@ -1287,9 +1286,9 @@ extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file, const char* filename, c
fcrypt_init(AES_ENCRYPTIONMODE, password, strlen(password), saltvalue, passverify, &zi->ci.aes_ctx);
if (ZWRITE64(zi->z_filefunc, zi->filestream,saltvalue,saltlength) != saltlength)
if (ZWRITE64(zi->z_filefunc, zi->filestream, saltvalue, saltlength) != saltlength)
err = ZIP_ERRNO;
if (ZWRITE64(zi->z_filefunc, zi->filestream,passverify,AES_PWVERIFYSIZE) != AES_PWVERIFYSIZE)
if (ZWRITE64(zi->z_filefunc, zi->filestream, passverify, AES_PWVERIFYSIZE) != AES_PWVERIFYSIZE)
err = ZIP_ERRNO;
zi->ci.crypt_header_size = saltlength + AES_PWVERIFYSIZE + AES_AUTHCODESIZE;
@ -1394,7 +1393,7 @@ local int zip64FlushWriteBuffer(zip64_internal* zi)
uInt max_write = 0;
ZPOS64_T size_available = 0;
if (zi->ci.encrypt != 0)
if ((zi->ci.flag & 1) != 0)
{
#ifndef NOCRYPT
#ifdef HAVE_AES