2011-12-20 03:30:59 +04:00
|
|
|
/*-
|
|
|
|
* Copyright (c) 2008 Anselm Strauss
|
|
|
|
* Copyright (c) 2009 Joerg Sonnenberger
|
2015-10-21 11:47:34 +03:00
|
|
|
* Copyright (c) 2011-2012,2014 Michihiro NAKAJIMA
|
2011-12-20 03:30:59 +04:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
|
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Development supported by Google Summer of Code 2008.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "archive_platform.h"
|
|
|
|
__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_zip.c 201168 2009-12-29 06:15:32Z kientzle $");
|
|
|
|
|
|
|
|
#ifdef HAVE_ERRNO_H
|
|
|
|
#include <errno.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_LANGINFO_H
|
|
|
|
#include <langinfo.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_STDLIB_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_STRING_H
|
|
|
|
#include <string.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_ZLIB_H
|
2011-12-20 22:14:29 +04:00
|
|
|
#include <cm_zlib.h>
|
2011-12-20 03:30:59 +04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "archive.h"
|
2015-10-21 11:47:34 +03:00
|
|
|
#include "archive_cryptor_private.h"
|
2011-12-20 03:30:59 +04:00
|
|
|
#include "archive_endian.h"
|
|
|
|
#include "archive_entry.h"
|
|
|
|
#include "archive_entry_locale.h"
|
2015-10-21 11:47:34 +03:00
|
|
|
#include "archive_hmac_private.h"
|
2011-12-20 03:30:59 +04:00
|
|
|
#include "archive_private.h"
|
2015-10-21 11:47:34 +03:00
|
|
|
#include "archive_random_private.h"
|
2011-12-20 03:30:59 +04:00
|
|
|
#include "archive_write_private.h"
|
|
|
|
|
|
|
|
#ifndef HAVE_ZLIB_H
|
|
|
|
#include "archive_crc32.h"
|
|
|
|
#endif
|
|
|
|
|
2015-10-21 11:47:34 +03:00
|
|
|
#define ZIP_ENTRY_FLAG_ENCRYPTED (1<<0)
|
2014-03-18 07:43:07 +04:00
|
|
|
#define ZIP_ENTRY_FLAG_LENGTH_AT_END (1<<3)
|
|
|
|
#define ZIP_ENTRY_FLAG_UTF8_NAME (1 << 11)
|
|
|
|
|
2011-12-20 03:30:59 +04:00
|
|
|
enum compression {
|
2014-03-18 07:43:07 +04:00
|
|
|
COMPRESSION_UNSPECIFIED = -1,
|
|
|
|
COMPRESSION_STORE = 0,
|
2011-12-20 03:30:59 +04:00
|
|
|
COMPRESSION_DEFLATE = 8
|
2014-03-18 07:43:07 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef HAVE_ZLIB_H
|
|
|
|
#define COMPRESSION_DEFAULT COMPRESSION_DEFLATE
|
|
|
|
#else
|
|
|
|
#define COMPRESSION_DEFAULT COMPRESSION_STORE
|
|
|
|
#endif
|
|
|
|
|
2015-10-21 11:47:34 +03:00
|
|
|
enum encryption {
|
|
|
|
ENCRYPTION_NONE = 0,
|
|
|
|
ENCRYPTION_TRADITIONAL, /* Traditional PKWARE encryption. */
|
|
|
|
ENCRYPTION_WINZIP_AES128, /* WinZIP AES-128 encryption. */
|
|
|
|
ENCRYPTION_WINZIP_AES256, /* WinZIP AES-256 encryption. */
|
|
|
|
};
|
|
|
|
|
|
|
|
#define TRAD_HEADER_SIZE 12
|
|
|
|
/*
|
|
|
|
* See "WinZip - AES Encryption Information"
|
|
|
|
* http://www.winzip.com/aes_info.htm
|
|
|
|
*/
|
|
|
|
/* Value used in compression method. */
|
|
|
|
#define WINZIP_AES_ENCRYPTION 99
|
|
|
|
/* A WinZip AES header size which is stored at the beginning of
|
|
|
|
* file contents. */
|
|
|
|
#define WINZIP_AES128_HEADER_SIZE (8 + 2)
|
|
|
|
#define WINZIP_AES256_HEADER_SIZE (16 + 2)
|
|
|
|
/* AES vendor version. */
|
|
|
|
#define AES_VENDOR_AE_1 0x0001
|
|
|
|
#define AES_VENDOR_AE_2 0x0002
|
|
|
|
/* Authentication code size. */
|
|
|
|
#define AUTH_CODE_SIZE 10
|
|
|
|
/**/
|
|
|
|
#define MAX_DERIVED_KEY_BUF_SIZE (AES_MAX_KEY_SIZE * 2 + 2)
|
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
struct cd_segment {
|
|
|
|
struct cd_segment *next;
|
|
|
|
size_t buff_size;
|
|
|
|
unsigned char *buff;
|
|
|
|
unsigned char *p;
|
|
|
|
};
|
|
|
|
|
2015-10-21 11:47:34 +03:00
|
|
|
struct trad_enc_ctx {
|
|
|
|
uint32_t keys[3];
|
|
|
|
};
|
2014-03-18 07:43:07 +04:00
|
|
|
|
|
|
|
struct zip {
|
|
|
|
|
|
|
|
int64_t entry_offset;
|
|
|
|
int64_t entry_compressed_size;
|
|
|
|
int64_t entry_uncompressed_size;
|
|
|
|
int64_t entry_compressed_written;
|
|
|
|
int64_t entry_uncompressed_written;
|
|
|
|
int64_t entry_uncompressed_limit;
|
|
|
|
struct archive_entry *entry;
|
|
|
|
uint32_t entry_crc32;
|
|
|
|
enum compression entry_compression;
|
2015-10-21 11:47:34 +03:00
|
|
|
enum encryption entry_encryption;
|
2014-03-18 07:43:07 +04:00
|
|
|
int entry_flags;
|
|
|
|
int entry_uses_zip64;
|
|
|
|
int experiments;
|
2015-10-21 11:47:34 +03:00
|
|
|
struct trad_enc_ctx tctx;
|
|
|
|
char tctx_valid;
|
|
|
|
unsigned char trad_chkdat;
|
|
|
|
unsigned aes_vendor;
|
|
|
|
archive_crypto_ctx cctx;
|
|
|
|
char cctx_valid;
|
|
|
|
archive_hmac_sha1_ctx hctx;
|
|
|
|
char hctx_valid;
|
2014-03-18 07:43:07 +04:00
|
|
|
|
|
|
|
unsigned char *file_header;
|
|
|
|
size_t file_header_extra_offset;
|
|
|
|
unsigned long (*crc32func)(unsigned long crc, const void *buff, size_t len);
|
|
|
|
|
|
|
|
struct cd_segment *central_directory;
|
|
|
|
struct cd_segment *central_directory_last;
|
|
|
|
size_t central_directory_bytes;
|
|
|
|
size_t central_directory_entries;
|
|
|
|
|
|
|
|
int64_t written_bytes; /* Overall position in file. */
|
|
|
|
|
|
|
|
struct archive_string_conv *opt_sconv;
|
|
|
|
struct archive_string_conv *sconv_default;
|
|
|
|
enum compression requested_compression;
|
2015-10-21 11:47:34 +03:00
|
|
|
int deflate_compression_level;
|
2014-03-18 07:43:07 +04:00
|
|
|
int init_default_conversion;
|
2015-10-21 11:47:34 +03:00
|
|
|
enum encryption encryption_type;
|
2014-03-18 07:43:07 +04:00
|
|
|
|
|
|
|
#define ZIP_FLAG_AVOID_ZIP64 1
|
|
|
|
#define ZIP_FLAG_FORCE_ZIP64 2
|
2015-10-21 11:47:34 +03:00
|
|
|
#define ZIP_FLAG_EXPERIMENT_xl 4
|
2014-03-18 07:43:07 +04:00
|
|
|
int flags;
|
|
|
|
|
|
|
|
#ifdef HAVE_ZLIB_H
|
|
|
|
z_stream stream;
|
2015-10-21 11:47:34 +03:00
|
|
|
#endif
|
2014-03-18 07:43:07 +04:00
|
|
|
size_t len_buf;
|
|
|
|
unsigned char *buf;
|
2011-12-20 03:30:59 +04:00
|
|
|
};
|
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
/* Don't call this min or MIN, since those are already defined
|
|
|
|
on lots of platforms (but not all). */
|
|
|
|
#define zipmin(a, b) ((a) > (b) ? (b) : (a))
|
|
|
|
|
2011-12-31 22:54:34 +04:00
|
|
|
static ssize_t archive_write_zip_data(struct archive_write *,
|
|
|
|
const void *buff, size_t s);
|
2011-12-20 03:30:59 +04:00
|
|
|
static int archive_write_zip_close(struct archive_write *);
|
|
|
|
static int archive_write_zip_free(struct archive_write *);
|
|
|
|
static int archive_write_zip_finish_entry(struct archive_write *);
|
2011-12-31 22:54:34 +04:00
|
|
|
static int archive_write_zip_header(struct archive_write *,
|
|
|
|
struct archive_entry *);
|
2011-12-20 03:30:59 +04:00
|
|
|
static int archive_write_zip_options(struct archive_write *,
|
|
|
|
const char *, const char *);
|
|
|
|
static unsigned int dos_time(const time_t);
|
|
|
|
static size_t path_length(struct archive_entry *);
|
|
|
|
static int write_path(struct archive_entry *, struct archive_write *);
|
2014-03-18 07:43:07 +04:00
|
|
|
static void copy_path(struct archive_entry *, unsigned char *);
|
|
|
|
static struct archive_string_conv *get_sconv(struct archive_write *, struct zip *);
|
2015-10-21 11:47:34 +03:00
|
|
|
static int trad_enc_init(struct trad_enc_ctx *, const char *, size_t);
|
|
|
|
static unsigned trad_enc_encrypt_update(struct trad_enc_ctx *, const uint8_t *,
|
|
|
|
size_t, uint8_t *, size_t);
|
|
|
|
static int init_traditional_pkware_encryption(struct archive_write *);
|
|
|
|
static int is_traditional_pkware_encryption_supported(void);
|
|
|
|
static int init_winzip_aes_encryption(struct archive_write *);
|
|
|
|
static int is_winzip_aes_encryption_supported(int encryption);
|
2011-12-20 03:30:59 +04:00
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
static unsigned char *
|
|
|
|
cd_alloc(struct zip *zip, size_t length)
|
|
|
|
{
|
|
|
|
unsigned char *p;
|
|
|
|
|
|
|
|
if (zip->central_directory == NULL
|
|
|
|
|| (zip->central_directory_last->p + length
|
|
|
|
> zip->central_directory_last->buff + zip->central_directory_last->buff_size)) {
|
|
|
|
struct cd_segment *segment = calloc(1, sizeof(*segment));
|
|
|
|
if (segment == NULL)
|
|
|
|
return NULL;
|
|
|
|
segment->buff_size = 64 * 1024;
|
|
|
|
segment->buff = malloc(segment->buff_size);
|
|
|
|
if (segment->buff == NULL) {
|
|
|
|
free(segment);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
segment->p = segment->buff;
|
2011-12-20 03:30:59 +04:00
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
if (zip->central_directory == NULL) {
|
|
|
|
zip->central_directory
|
|
|
|
= zip->central_directory_last
|
|
|
|
= segment;
|
|
|
|
} else {
|
|
|
|
zip->central_directory_last->next = segment;
|
|
|
|
zip->central_directory_last = segment;
|
|
|
|
}
|
|
|
|
}
|
2011-12-20 03:30:59 +04:00
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
p = zip->central_directory_last->p;
|
|
|
|
zip->central_directory_last->p += length;
|
|
|
|
zip->central_directory_bytes += length;
|
|
|
|
return (p);
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long
|
|
|
|
real_crc32(unsigned long crc, const void *buff, size_t len)
|
|
|
|
{
|
2015-10-21 11:47:34 +03:00
|
|
|
return crc32(crc, buff, (unsigned int)len);
|
2014-03-18 07:43:07 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long
|
|
|
|
fake_crc32(unsigned long crc, const void *buff, size_t len)
|
|
|
|
{
|
|
|
|
(void)crc; /* UNUSED */
|
|
|
|
(void)buff; /* UNUSED */
|
|
|
|
(void)len; /* UNUSED */
|
|
|
|
return 0;
|
|
|
|
}
|
2011-12-20 03:30:59 +04:00
|
|
|
|
|
|
|
static int
|
|
|
|
archive_write_zip_options(struct archive_write *a, const char *key,
|
|
|
|
const char *val)
|
|
|
|
{
|
|
|
|
struct zip *zip = a->format_data;
|
|
|
|
int ret = ARCHIVE_FAILED;
|
|
|
|
|
|
|
|
if (strcmp(key, "compression") == 0) {
|
2014-03-18 07:43:07 +04:00
|
|
|
/*
|
|
|
|
* Set compression to use on all future entries.
|
|
|
|
* This only affects regular files.
|
|
|
|
*/
|
2011-12-20 03:30:59 +04:00
|
|
|
if (val == NULL || val[0] == 0) {
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"%s: compression option needs a compression name",
|
|
|
|
a->format_name);
|
|
|
|
} else if (strcmp(val, "deflate") == 0) {
|
|
|
|
#ifdef HAVE_ZLIB_H
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->requested_compression = COMPRESSION_DEFLATE;
|
2011-12-20 03:30:59 +04:00
|
|
|
ret = ARCHIVE_OK;
|
|
|
|
#else
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"deflate compression not supported");
|
|
|
|
#endif
|
|
|
|
} else if (strcmp(val, "store") == 0) {
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->requested_compression = COMPRESSION_STORE;
|
2011-12-20 03:30:59 +04:00
|
|
|
ret = ARCHIVE_OK;
|
|
|
|
}
|
2013-02-09 21:17:57 +04:00
|
|
|
return (ret);
|
2015-10-21 11:47:34 +03:00
|
|
|
} else if (strcmp(key, "compression-level") == 0) {
|
|
|
|
if (val == NULL || !(val[0] >= '0' && val[0] <= '9') || val[1] != '\0') {
|
|
|
|
return ARCHIVE_WARN;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (val[0] == '0') {
|
|
|
|
zip->requested_compression = COMPRESSION_STORE;
|
|
|
|
return ARCHIVE_OK;
|
|
|
|
} else {
|
|
|
|
#ifdef HAVE_ZLIB_H
|
|
|
|
zip->requested_compression = COMPRESSION_DEFLATE;
|
|
|
|
zip->deflate_compression_level = val[0] - '0';
|
|
|
|
return ARCHIVE_OK;
|
|
|
|
#else
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"deflate compression not supported");
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
} else if (strcmp(key, "encryption") == 0) {
|
|
|
|
if (val == NULL) {
|
|
|
|
zip->encryption_type = ENCRYPTION_NONE;
|
|
|
|
ret = ARCHIVE_OK;
|
|
|
|
} else if (val[0] == '1' || strcmp(val, "traditional") == 0
|
|
|
|
|| strcmp(val, "zipcrypt") == 0
|
|
|
|
|| strcmp(val, "ZipCrypt") == 0) {
|
|
|
|
if (is_traditional_pkware_encryption_supported()) {
|
|
|
|
zip->encryption_type = ENCRYPTION_TRADITIONAL;
|
|
|
|
ret = ARCHIVE_OK;
|
|
|
|
} else {
|
|
|
|
archive_set_error(&a->archive,
|
|
|
|
ARCHIVE_ERRNO_MISC,
|
|
|
|
"encryption not supported");
|
|
|
|
}
|
|
|
|
} else if (strcmp(val, "aes128") == 0) {
|
|
|
|
if (is_winzip_aes_encryption_supported(
|
|
|
|
ENCRYPTION_WINZIP_AES128)) {
|
|
|
|
zip->encryption_type = ENCRYPTION_WINZIP_AES128;
|
|
|
|
ret = ARCHIVE_OK;
|
|
|
|
} else {
|
|
|
|
archive_set_error(&a->archive,
|
|
|
|
ARCHIVE_ERRNO_MISC,
|
|
|
|
"encryption not supported");
|
|
|
|
}
|
|
|
|
} else if (strcmp(val, "aes256") == 0) {
|
|
|
|
if (is_winzip_aes_encryption_supported(
|
|
|
|
ENCRYPTION_WINZIP_AES256)) {
|
|
|
|
zip->encryption_type = ENCRYPTION_WINZIP_AES256;
|
|
|
|
ret = ARCHIVE_OK;
|
|
|
|
} else {
|
|
|
|
archive_set_error(&a->archive,
|
|
|
|
ARCHIVE_ERRNO_MISC,
|
|
|
|
"encryption not supported");
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"%s: unknown encryption '%s'",
|
|
|
|
a->format_name, val);
|
|
|
|
}
|
|
|
|
return (ret);
|
2014-03-18 07:43:07 +04:00
|
|
|
} else if (strcmp(key, "experimental") == 0) {
|
|
|
|
if (val == NULL || val[0] == 0) {
|
2015-10-21 11:47:34 +03:00
|
|
|
zip->flags &= ~ ZIP_FLAG_EXPERIMENT_xl;
|
2014-03-18 07:43:07 +04:00
|
|
|
} else {
|
2015-10-21 11:47:34 +03:00
|
|
|
zip->flags |= ZIP_FLAG_EXPERIMENT_xl;
|
2014-03-18 07:43:07 +04:00
|
|
|
}
|
|
|
|
return (ARCHIVE_OK);
|
|
|
|
} else if (strcmp(key, "fakecrc32") == 0) {
|
|
|
|
/*
|
|
|
|
* FOR TESTING ONLY: disable CRC calculation to speed up
|
|
|
|
* certain complex tests.
|
|
|
|
*/
|
|
|
|
if (val == NULL || val[0] == 0) {
|
|
|
|
zip->crc32func = real_crc32;
|
|
|
|
} else {
|
|
|
|
zip->crc32func = fake_crc32;
|
|
|
|
}
|
|
|
|
return (ARCHIVE_OK);
|
2011-12-20 03:30:59 +04:00
|
|
|
} else if (strcmp(key, "hdrcharset") == 0) {
|
2014-03-18 07:43:07 +04:00
|
|
|
/*
|
|
|
|
* Set the character set used in translating filenames.
|
|
|
|
*/
|
2011-12-20 03:30:59 +04:00
|
|
|
if (val == NULL || val[0] == 0) {
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"%s: hdrcharset option needs a character-set name",
|
|
|
|
a->format_name);
|
|
|
|
} else {
|
|
|
|
zip->opt_sconv = archive_string_conversion_to_charset(
|
|
|
|
&a->archive, val, 0);
|
|
|
|
if (zip->opt_sconv != NULL)
|
|
|
|
ret = ARCHIVE_OK;
|
|
|
|
else
|
|
|
|
ret = ARCHIVE_FATAL;
|
|
|
|
}
|
2013-02-09 21:17:57 +04:00
|
|
|
return (ret);
|
2014-03-18 07:43:07 +04:00
|
|
|
} else if (strcmp(key, "zip64") == 0) {
|
|
|
|
/*
|
|
|
|
* Bias decisions about Zip64: force them to be
|
|
|
|
* generated in certain cases where they are not
|
|
|
|
* forbidden or avoid them in certain cases where they
|
|
|
|
* are not strictly required.
|
|
|
|
*/
|
|
|
|
if (val != NULL && *val != '\0') {
|
|
|
|
zip->flags |= ZIP_FLAG_FORCE_ZIP64;
|
|
|
|
zip->flags &= ~ZIP_FLAG_AVOID_ZIP64;
|
|
|
|
} else {
|
|
|
|
zip->flags &= ~ZIP_FLAG_FORCE_ZIP64;
|
|
|
|
zip->flags |= ZIP_FLAG_AVOID_ZIP64;
|
|
|
|
}
|
|
|
|
return (ARCHIVE_OK);
|
2013-02-09 21:17:57 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Note: The "warn" return is just to inform the options
|
|
|
|
* supervisor that we didn't handle it. It will generate
|
|
|
|
* a suitable error if no one used this option. */
|
|
|
|
return (ARCHIVE_WARN);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
archive_write_zip_set_compression_deflate(struct archive *_a)
|
|
|
|
{
|
|
|
|
struct archive_write *a = (struct archive_write *)_a;
|
|
|
|
int ret = ARCHIVE_FAILED;
|
2014-03-18 07:43:07 +04:00
|
|
|
|
2013-02-09 21:17:57 +04:00
|
|
|
archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
|
2014-03-18 07:43:07 +04:00
|
|
|
ARCHIVE_STATE_NEW | ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
|
2013-02-09 21:17:57 +04:00
|
|
|
"archive_write_zip_set_compression_deflate");
|
|
|
|
if (a->archive.archive_format != ARCHIVE_FORMAT_ZIP) {
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Can only use archive_write_zip_set_compression_deflate"
|
|
|
|
" with zip format");
|
|
|
|
ret = ARCHIVE_FATAL;
|
|
|
|
} else {
|
|
|
|
#ifdef HAVE_ZLIB_H
|
|
|
|
struct zip *zip = a->format_data;
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->requested_compression = COMPRESSION_DEFLATE;
|
2013-02-09 21:17:57 +04:00
|
|
|
ret = ARCHIVE_OK;
|
|
|
|
#else
|
2011-12-20 03:30:59 +04:00
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
2013-02-09 21:17:57 +04:00
|
|
|
"deflate compression not supported");
|
2014-03-18 07:43:07 +04:00
|
|
|
ret = ARCHIVE_FAILED;
|
2013-02-09 21:17:57 +04:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
archive_write_zip_set_compression_store(struct archive *_a)
|
|
|
|
{
|
|
|
|
struct archive_write *a = (struct archive_write *)_a;
|
|
|
|
struct zip *zip = a->format_data;
|
|
|
|
int ret = ARCHIVE_FAILED;
|
2014-03-18 07:43:07 +04:00
|
|
|
|
2013-02-09 21:17:57 +04:00
|
|
|
archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
|
2014-03-18 07:43:07 +04:00
|
|
|
ARCHIVE_STATE_NEW | ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA,
|
2013-02-09 21:17:57 +04:00
|
|
|
"archive_write_zip_set_compression_deflate");
|
|
|
|
if (a->archive.archive_format != ARCHIVE_FORMAT_ZIP) {
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Can only use archive_write_zip_set_compression_store"
|
|
|
|
" with zip format");
|
|
|
|
ret = ARCHIVE_FATAL;
|
|
|
|
} else {
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->requested_compression = COMPRESSION_STORE;
|
2013-02-09 21:17:57 +04:00
|
|
|
ret = ARCHIVE_OK;
|
|
|
|
}
|
2011-12-20 03:30:59 +04:00
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
archive_write_set_format_zip(struct archive *_a)
|
|
|
|
{
|
|
|
|
struct archive_write *a = (struct archive_write *)_a;
|
|
|
|
struct zip *zip;
|
|
|
|
|
|
|
|
archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,
|
|
|
|
ARCHIVE_STATE_NEW, "archive_write_set_format_zip");
|
|
|
|
|
|
|
|
/* If another format was already registered, unregister it. */
|
|
|
|
if (a->format_free != NULL)
|
|
|
|
(a->format_free)(a);
|
|
|
|
|
|
|
|
zip = (struct zip *) calloc(1, sizeof(*zip));
|
|
|
|
if (zip == NULL) {
|
2011-12-31 22:54:34 +04:00
|
|
|
archive_set_error(&a->archive, ENOMEM,
|
|
|
|
"Can't allocate zip data");
|
2011-12-20 03:30:59 +04:00
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
2014-03-18 07:43:07 +04:00
|
|
|
|
|
|
|
/* "Unspecified" lets us choose the appropriate compression. */
|
|
|
|
zip->requested_compression = COMPRESSION_UNSPECIFIED;
|
2015-10-21 11:47:34 +03:00
|
|
|
#ifdef HAVE_ZLIB_H
|
|
|
|
zip->deflate_compression_level = Z_DEFAULT_COMPRESSION;
|
|
|
|
#endif
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->crc32func = real_crc32;
|
2011-12-20 03:30:59 +04:00
|
|
|
|
2015-10-21 11:47:34 +03:00
|
|
|
/* A buffer used for both compression and encryption. */
|
2011-12-20 03:30:59 +04:00
|
|
|
zip->len_buf = 65536;
|
|
|
|
zip->buf = malloc(zip->len_buf);
|
|
|
|
if (zip->buf == NULL) {
|
2013-02-09 21:17:57 +04:00
|
|
|
free(zip);
|
2011-12-31 22:54:34 +04:00
|
|
|
archive_set_error(&a->archive, ENOMEM,
|
|
|
|
"Can't allocate compression buffer");
|
2011-12-20 03:30:59 +04:00
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
|
|
|
|
|
|
|
a->format_data = zip;
|
|
|
|
a->format_name = "zip";
|
|
|
|
a->format_options = archive_write_zip_options;
|
|
|
|
a->format_write_header = archive_write_zip_header;
|
|
|
|
a->format_write_data = archive_write_zip_data;
|
|
|
|
a->format_finish_entry = archive_write_zip_finish_entry;
|
|
|
|
a->format_close = archive_write_zip_close;
|
|
|
|
a->format_free = archive_write_zip_free;
|
|
|
|
a->archive.archive_format = ARCHIVE_FORMAT_ZIP;
|
|
|
|
a->archive.archive_format_name = "ZIP";
|
|
|
|
|
|
|
|
return (ARCHIVE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
is_all_ascii(const char *p)
|
|
|
|
{
|
|
|
|
const unsigned char *pp = (const unsigned char *)p;
|
|
|
|
|
|
|
|
while (*pp) {
|
|
|
|
if (*pp++ > 127)
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
|
|
|
|
{
|
2014-03-18 07:43:07 +04:00
|
|
|
unsigned char local_header[32];
|
2015-10-21 11:47:34 +03:00
|
|
|
unsigned char local_extra[144];
|
2014-03-18 07:43:07 +04:00
|
|
|
struct zip *zip = a->format_data;
|
|
|
|
unsigned char *e;
|
|
|
|
unsigned char *cd_extra;
|
|
|
|
size_t filename_length;
|
2014-04-15 06:19:05 +04:00
|
|
|
const char *slink = NULL;
|
|
|
|
size_t slink_size = 0;
|
2014-03-18 07:43:07 +04:00
|
|
|
struct archive_string_conv *sconv = get_sconv(a, zip);
|
2011-12-20 03:30:59 +04:00
|
|
|
int ret, ret2 = ARCHIVE_OK;
|
|
|
|
mode_t type;
|
2014-03-18 07:43:07 +04:00
|
|
|
int version_needed = 10;
|
2011-12-20 03:30:59 +04:00
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
/* Ignore types of entries that we don't support. */
|
2011-12-20 03:30:59 +04:00
|
|
|
type = archive_entry_filetype(entry);
|
2011-12-31 22:54:34 +04:00
|
|
|
if (type != AE_IFREG && type != AE_IFDIR && type != AE_IFLNK) {
|
2011-12-20 03:30:59 +04:00
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Filetype not supported");
|
|
|
|
return ARCHIVE_FAILED;
|
2013-02-09 21:17:57 +04:00
|
|
|
};
|
2011-12-20 03:30:59 +04:00
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
/* If we're not using Zip64, reject large files. */
|
|
|
|
if (zip->flags & ZIP_FLAG_AVOID_ZIP64) {
|
|
|
|
/* Reject entries over 4GB. */
|
|
|
|
if (archive_entry_size_is_set(entry)
|
2015-10-21 17:12:35 +03:00
|
|
|
&& (archive_entry_size(entry) >
|
|
|
|
ARCHIVE_LITERAL_LL(0xffffffff))) {
|
2014-03-18 07:43:07 +04:00
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Files > 4GB require Zip64 extensions");
|
|
|
|
return ARCHIVE_FAILED;
|
|
|
|
}
|
|
|
|
/* Reject entries if archive is > 4GB. */
|
2015-10-21 17:12:35 +03:00
|
|
|
if (zip->written_bytes > ARCHIVE_LITERAL_LL(0xffffffff)) {
|
2014-03-18 07:43:07 +04:00
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Archives > 4GB require Zip64 extensions");
|
|
|
|
return ARCHIVE_FAILED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Only regular files can have size > 0. */
|
|
|
|
if (type != AE_IFREG)
|
2011-12-20 03:30:59 +04:00
|
|
|
archive_entry_set_size(entry, 0);
|
|
|
|
|
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
/* Reset information from last entry. */
|
|
|
|
zip->entry_offset = zip->written_bytes;
|
|
|
|
zip->entry_uncompressed_limit = INT64_MAX;
|
|
|
|
zip->entry_compressed_size = 0;
|
|
|
|
zip->entry_uncompressed_size = 0;
|
|
|
|
zip->entry_compressed_written = 0;
|
|
|
|
zip->entry_uncompressed_written = 0;
|
|
|
|
zip->entry_flags = 0;
|
|
|
|
zip->entry_uses_zip64 = 0;
|
|
|
|
zip->entry_crc32 = zip->crc32func(0, NULL, 0);
|
2015-10-21 11:47:34 +03:00
|
|
|
zip->entry_encryption = 0;
|
2014-03-18 07:43:07 +04:00
|
|
|
if (zip->entry != NULL) {
|
|
|
|
archive_entry_free(zip->entry);
|
|
|
|
zip->entry = NULL;
|
2011-12-20 03:30:59 +04:00
|
|
|
}
|
|
|
|
|
2015-10-21 11:47:34 +03:00
|
|
|
if (zip->cctx_valid)
|
|
|
|
archive_encrypto_aes_ctr_release(&zip->cctx);
|
|
|
|
if (zip->hctx_valid)
|
|
|
|
archive_hmac_sha1_cleanup(&zip->hctx);
|
|
|
|
zip->tctx_valid = zip->cctx_valid = zip->hctx_valid = 0;
|
|
|
|
|
|
|
|
if (type == AE_IFREG
|
|
|
|
&&(!archive_entry_size_is_set(entry)
|
|
|
|
|| archive_entry_size(entry) > 0)) {
|
|
|
|
switch (zip->encryption_type) {
|
|
|
|
case ENCRYPTION_TRADITIONAL:
|
|
|
|
case ENCRYPTION_WINZIP_AES128:
|
|
|
|
case ENCRYPTION_WINZIP_AES256:
|
|
|
|
zip->entry_flags |= ZIP_ENTRY_FLAG_ENCRYPTED;
|
|
|
|
zip->entry_encryption = zip->encryption_type;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-02-09 21:17:57 +04:00
|
|
|
#if defined(_WIN32) && !defined(__CYGWIN__)
|
|
|
|
/* Make sure the path separators in pahtname, hardlink and symlink
|
|
|
|
* are all slash '/', not the Windows path separator '\'. */
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->entry = __la_win_entry_in_posix_pathseparator(entry);
|
|
|
|
if (zip->entry == entry)
|
|
|
|
zip->entry = archive_entry_clone(entry);
|
2013-02-09 21:17:57 +04:00
|
|
|
#else
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->entry = archive_entry_clone(entry);
|
2013-02-09 21:17:57 +04:00
|
|
|
#endif
|
2014-03-18 07:43:07 +04:00
|
|
|
if (zip->entry == NULL) {
|
2013-02-09 21:17:57 +04:00
|
|
|
archive_set_error(&a->archive, ENOMEM,
|
|
|
|
"Can't allocate zip header data");
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
2014-03-18 07:43:07 +04:00
|
|
|
|
2011-12-20 03:30:59 +04:00
|
|
|
if (sconv != NULL) {
|
|
|
|
const char *p;
|
|
|
|
size_t len;
|
|
|
|
|
|
|
|
if (archive_entry_pathname_l(entry, &p, &len, sconv) != 0) {
|
|
|
|
if (errno == ENOMEM) {
|
|
|
|
archive_set_error(&a->archive, ENOMEM,
|
|
|
|
"Can't allocate memory for Pathname");
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
|
|
|
archive_set_error(&a->archive,
|
|
|
|
ARCHIVE_ERRNO_FILE_FORMAT,
|
2013-02-09 21:17:57 +04:00
|
|
|
"Can't translate Pathname '%s' to %s",
|
2011-12-20 03:30:59 +04:00
|
|
|
archive_entry_pathname(entry),
|
|
|
|
archive_string_conversion_charset_name(sconv));
|
|
|
|
ret2 = ARCHIVE_WARN;
|
|
|
|
}
|
|
|
|
if (len > 0)
|
2014-03-18 07:43:07 +04:00
|
|
|
archive_entry_set_pathname(zip->entry, p);
|
2013-02-09 21:17:57 +04:00
|
|
|
|
|
|
|
/*
|
2014-03-18 07:43:07 +04:00
|
|
|
* There is no standard for symlink handling; we convert
|
|
|
|
* it using the same character-set translation that we use
|
|
|
|
* for filename.
|
2013-02-09 21:17:57 +04:00
|
|
|
*/
|
|
|
|
if (type == AE_IFLNK) {
|
|
|
|
if (archive_entry_symlink_l(entry, &p, &len, sconv)) {
|
|
|
|
if (errno == ENOMEM) {
|
|
|
|
archive_set_error(&a->archive, ENOMEM,
|
|
|
|
"Can't allocate memory "
|
|
|
|
" for Symlink");
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
2014-03-18 07:43:07 +04:00
|
|
|
/* No error if we can't convert. */
|
2013-02-09 21:17:57 +04:00
|
|
|
} else if (len > 0)
|
2014-03-18 07:43:07 +04:00
|
|
|
archive_entry_set_symlink(zip->entry, p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If filename isn't ASCII and we can use UTF-8, set the UTF-8 flag. */
|
|
|
|
if (!is_all_ascii(archive_entry_pathname(zip->entry))) {
|
|
|
|
if (zip->opt_sconv != NULL) {
|
|
|
|
if (strcmp(archive_string_conversion_charset_name(
|
|
|
|
zip->opt_sconv), "UTF-8") == 0)
|
|
|
|
zip->entry_flags |= ZIP_ENTRY_FLAG_UTF8_NAME;
|
|
|
|
#if HAVE_NL_LANGINFO
|
|
|
|
} else if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) {
|
|
|
|
zip->entry_flags |= ZIP_ENTRY_FLAG_UTF8_NAME;
|
|
|
|
#endif
|
2013-02-09 21:17:57 +04:00
|
|
|
}
|
2011-12-20 03:30:59 +04:00
|
|
|
}
|
2014-03-18 07:43:07 +04:00
|
|
|
filename_length = path_length(zip->entry);
|
2011-12-20 03:30:59 +04:00
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
/* Determine appropriate compression and size for this entry. */
|
2011-12-31 22:54:34 +04:00
|
|
|
if (type == AE_IFLNK) {
|
2014-04-15 06:19:05 +04:00
|
|
|
slink = archive_entry_symlink(zip->entry);
|
|
|
|
if (slink != NULL)
|
|
|
|
slink_size = strlen(slink);
|
2011-12-31 22:54:34 +04:00
|
|
|
else
|
2014-04-15 06:19:05 +04:00
|
|
|
slink_size = 0;
|
|
|
|
zip->entry_uncompressed_limit = slink_size;
|
|
|
|
zip->entry_compressed_size = slink_size;
|
|
|
|
zip->entry_uncompressed_size = slink_size;
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->entry_crc32 = zip->crc32func(zip->entry_crc32,
|
2014-04-15 06:19:05 +04:00
|
|
|
(const unsigned char *)slink, slink_size);
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->entry_compression = COMPRESSION_STORE;
|
|
|
|
version_needed = 20;
|
|
|
|
} else if (type != AE_IFREG) {
|
|
|
|
zip->entry_compression = COMPRESSION_STORE;
|
|
|
|
zip->entry_uncompressed_limit = 0;
|
|
|
|
version_needed = 20;
|
|
|
|
} else if (archive_entry_size_is_set(zip->entry)) {
|
2015-10-21 11:47:34 +03:00
|
|
|
int64_t size = archive_entry_size(zip->entry);
|
|
|
|
int64_t additional_size = 0;
|
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->entry_uncompressed_limit = size;
|
|
|
|
zip->entry_compression = zip->requested_compression;
|
|
|
|
if (zip->entry_compression == COMPRESSION_UNSPECIFIED) {
|
|
|
|
zip->entry_compression = COMPRESSION_DEFAULT;
|
|
|
|
}
|
|
|
|
if (zip->entry_compression == COMPRESSION_STORE) {
|
|
|
|
zip->entry_compressed_size = size;
|
|
|
|
zip->entry_uncompressed_size = size;
|
|
|
|
version_needed = 10;
|
|
|
|
} else {
|
|
|
|
zip->entry_uncompressed_size = size;
|
|
|
|
version_needed = 20;
|
|
|
|
}
|
2015-10-21 11:47:34 +03:00
|
|
|
|
|
|
|
if (zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED) {
|
|
|
|
switch (zip->entry_encryption) {
|
|
|
|
case ENCRYPTION_TRADITIONAL:
|
|
|
|
additional_size = TRAD_HEADER_SIZE;
|
|
|
|
version_needed = 20;
|
|
|
|
break;
|
|
|
|
case ENCRYPTION_WINZIP_AES128:
|
|
|
|
additional_size = WINZIP_AES128_HEADER_SIZE
|
|
|
|
+ AUTH_CODE_SIZE;
|
|
|
|
version_needed = 20;
|
|
|
|
break;
|
|
|
|
case ENCRYPTION_WINZIP_AES256:
|
|
|
|
additional_size = WINZIP_AES256_HEADER_SIZE
|
|
|
|
+ AUTH_CODE_SIZE;
|
|
|
|
version_needed = 20;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (zip->entry_compression == COMPRESSION_STORE)
|
|
|
|
zip->entry_compressed_size += additional_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set Zip64 extension in any of the following cases
|
|
|
|
* (this was suggested by discussion on info-zip-dev
|
|
|
|
* mailing list):
|
|
|
|
* = Zip64 is being forced by user
|
|
|
|
* = File is over 4GiB uncompressed
|
|
|
|
* (including encryption header, if any)
|
|
|
|
* = File is close to 4GiB and is being compressed
|
|
|
|
* (compression might make file larger)
|
|
|
|
*/
|
|
|
|
if ((zip->flags & ZIP_FLAG_FORCE_ZIP64)
|
2015-10-21 17:12:35 +03:00
|
|
|
|| (zip->entry_uncompressed_size + additional_size >
|
|
|
|
ARCHIVE_LITERAL_LL(0xffffffff))
|
|
|
|
|| (zip->entry_uncompressed_size >
|
|
|
|
ARCHIVE_LITERAL_LL(0xff000000)
|
2015-10-21 11:47:34 +03:00
|
|
|
&& zip->entry_compression != COMPRESSION_STORE)) {
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->entry_uses_zip64 = 1;
|
|
|
|
version_needed = 45;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We may know the size, but never the CRC. */
|
|
|
|
zip->entry_flags |= ZIP_ENTRY_FLAG_LENGTH_AT_END;
|
2011-12-31 22:54:34 +04:00
|
|
|
} else {
|
2015-10-21 11:47:34 +03:00
|
|
|
/* We don't know the size. In this case, we prefer
|
|
|
|
* deflate (it has a clear end-of-data marker which
|
|
|
|
* makes length-at-end more reliable) and will
|
|
|
|
* enable Zip64 extensions unless we're told not to.
|
|
|
|
*/
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->entry_compression = COMPRESSION_DEFAULT;
|
|
|
|
zip->entry_flags |= ZIP_ENTRY_FLAG_LENGTH_AT_END;
|
|
|
|
if ((zip->flags & ZIP_FLAG_AVOID_ZIP64) == 0) {
|
|
|
|
zip->entry_uses_zip64 = 1;
|
|
|
|
version_needed = 45;
|
|
|
|
} else if (zip->entry_compression == COMPRESSION_STORE) {
|
|
|
|
version_needed = 10;
|
|
|
|
} else {
|
|
|
|
version_needed = 20;
|
|
|
|
}
|
2015-10-21 11:47:34 +03:00
|
|
|
|
|
|
|
if (zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED) {
|
|
|
|
switch (zip->entry_encryption) {
|
|
|
|
case ENCRYPTION_TRADITIONAL:
|
|
|
|
case ENCRYPTION_WINZIP_AES128:
|
|
|
|
case ENCRYPTION_WINZIP_AES256:
|
|
|
|
if (version_needed < 20)
|
|
|
|
version_needed = 20;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2011-12-31 22:54:34 +04:00
|
|
|
}
|
2014-03-18 07:43:07 +04:00
|
|
|
|
|
|
|
/* Format the local header. */
|
|
|
|
memset(local_header, 0, sizeof(local_header));
|
|
|
|
memcpy(local_header, "PK\003\004", 4);
|
|
|
|
archive_le16enc(local_header + 4, version_needed);
|
|
|
|
archive_le16enc(local_header + 6, zip->entry_flags);
|
2015-10-21 11:47:34 +03:00
|
|
|
if (zip->entry_encryption == ENCRYPTION_WINZIP_AES128
|
|
|
|
|| zip->entry_encryption == ENCRYPTION_WINZIP_AES256)
|
|
|
|
archive_le16enc(local_header + 8, WINZIP_AES_ENCRYPTION);
|
|
|
|
else
|
|
|
|
archive_le16enc(local_header + 8, zip->entry_compression);
|
|
|
|
archive_le32enc(local_header + 10,
|
|
|
|
dos_time(archive_entry_mtime(zip->entry)));
|
2014-03-18 07:43:07 +04:00
|
|
|
archive_le32enc(local_header + 14, zip->entry_crc32);
|
|
|
|
if (zip->entry_uses_zip64) {
|
|
|
|
/* Zip64 data in the local header "must" include both
|
|
|
|
* compressed and uncompressed sizes AND those fields
|
|
|
|
* are included only if these are 0xffffffff;
|
|
|
|
* THEREFORE these must be set this way, even if we
|
|
|
|
* know one of them is smaller. */
|
2014-04-03 23:09:28 +04:00
|
|
|
archive_le32enc(local_header + 18, ARCHIVE_LITERAL_LL(0xffffffff));
|
|
|
|
archive_le32enc(local_header + 22, ARCHIVE_LITERAL_LL(0xffffffff));
|
2011-12-20 03:30:59 +04:00
|
|
|
} else {
|
2015-10-21 11:47:34 +03:00
|
|
|
archive_le32enc(local_header + 18, (uint32_t)zip->entry_compressed_size);
|
|
|
|
archive_le32enc(local_header + 22, (uint32_t)zip->entry_uncompressed_size);
|
|
|
|
}
|
|
|
|
archive_le16enc(local_header + 26, (uint16_t)filename_length);
|
|
|
|
|
|
|
|
if (zip->entry_encryption == ENCRYPTION_TRADITIONAL) {
|
|
|
|
if (zip->entry_flags & ZIP_ENTRY_FLAG_LENGTH_AT_END)
|
|
|
|
zip->trad_chkdat = local_header[11];
|
|
|
|
else
|
|
|
|
zip->trad_chkdat = local_header[17];
|
2014-03-18 07:43:07 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Format as much of central directory file header as we can: */
|
|
|
|
zip->file_header = cd_alloc(zip, 46);
|
|
|
|
/* If (zip->file_header == NULL) XXXX */
|
|
|
|
++zip->central_directory_entries;
|
|
|
|
memset(zip->file_header, 0, 46);
|
|
|
|
memcpy(zip->file_header, "PK\001\002", 4);
|
|
|
|
/* "Made by PKZip 2.0 on Unix." */
|
|
|
|
archive_le16enc(zip->file_header + 4, 3 * 256 + version_needed);
|
|
|
|
archive_le16enc(zip->file_header + 6, version_needed);
|
|
|
|
archive_le16enc(zip->file_header + 8, zip->entry_flags);
|
2015-10-21 11:47:34 +03:00
|
|
|
if (zip->entry_encryption == ENCRYPTION_WINZIP_AES128
|
|
|
|
|| zip->entry_encryption == ENCRYPTION_WINZIP_AES256)
|
|
|
|
archive_le16enc(zip->file_header + 10, WINZIP_AES_ENCRYPTION);
|
|
|
|
else
|
|
|
|
archive_le16enc(zip->file_header + 10, zip->entry_compression);
|
|
|
|
archive_le32enc(zip->file_header + 12,
|
|
|
|
dos_time(archive_entry_mtime(zip->entry)));
|
|
|
|
archive_le16enc(zip->file_header + 28, (uint16_t)filename_length);
|
2014-03-18 07:43:07 +04:00
|
|
|
/* Following Info-Zip, store mode in the "external attributes" field. */
|
|
|
|
archive_le32enc(zip->file_header + 38,
|
2014-04-15 17:07:48 +04:00
|
|
|
((uint32_t)archive_entry_mode(zip->entry)) << 16);
|
2014-03-18 07:43:07 +04:00
|
|
|
e = cd_alloc(zip, filename_length);
|
|
|
|
/* If (e == NULL) XXXX */
|
|
|
|
copy_path(zip->entry, e);
|
|
|
|
|
|
|
|
/* Format extra data. */
|
|
|
|
memset(local_extra, 0, sizeof(local_extra));
|
|
|
|
e = local_extra;
|
|
|
|
|
|
|
|
/* First, extra blocks that are the same between
|
|
|
|
* the local file header and the central directory.
|
|
|
|
* We format them once and then duplicate them. */
|
|
|
|
|
|
|
|
/* UT timestamp, length depends on what timestamps are set. */
|
|
|
|
memcpy(e, "UT", 2);
|
|
|
|
archive_le16enc(e + 2,
|
|
|
|
1
|
|
|
|
+ (archive_entry_mtime_is_set(entry) ? 4 : 0)
|
|
|
|
+ (archive_entry_atime_is_set(entry) ? 4 : 0)
|
|
|
|
+ (archive_entry_ctime_is_set(entry) ? 4 : 0));
|
|
|
|
e += 4;
|
|
|
|
*e++ =
|
|
|
|
(archive_entry_mtime_is_set(entry) ? 1 : 0)
|
|
|
|
| (archive_entry_atime_is_set(entry) ? 2 : 0)
|
|
|
|
| (archive_entry_ctime_is_set(entry) ? 4 : 0);
|
|
|
|
if (archive_entry_mtime_is_set(entry)) {
|
|
|
|
archive_le32enc(e, (uint32_t)archive_entry_mtime(entry));
|
|
|
|
e += 4;
|
|
|
|
}
|
|
|
|
if (archive_entry_atime_is_set(entry)) {
|
|
|
|
archive_le32enc(e, (uint32_t)archive_entry_atime(entry));
|
|
|
|
e += 4;
|
|
|
|
}
|
|
|
|
if (archive_entry_ctime_is_set(entry)) {
|
|
|
|
archive_le32enc(e, (uint32_t)archive_entry_ctime(entry));
|
|
|
|
e += 4;
|
|
|
|
}
|
2011-12-20 03:30:59 +04:00
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
/* ux Unix extra data, length 11, version 1 */
|
|
|
|
/* TODO: If uid < 64k, use 2 bytes, ditto for gid. */
|
|
|
|
memcpy(e, "ux\013\000\001", 5);
|
|
|
|
e += 5;
|
|
|
|
*e++ = 4; /* Length of following UID */
|
|
|
|
archive_le32enc(e, (uint32_t)archive_entry_uid(entry));
|
|
|
|
e += 4;
|
|
|
|
*e++ = 4; /* Length of following GID */
|
|
|
|
archive_le32enc(e, (uint32_t)archive_entry_gid(entry));
|
|
|
|
e += 4;
|
|
|
|
|
2015-10-21 11:47:34 +03:00
|
|
|
/* AES extra data field: WinZIP AES information, ID=0x9901 */
|
|
|
|
if ((zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED)
|
|
|
|
&& (zip->entry_encryption == ENCRYPTION_WINZIP_AES128
|
|
|
|
|| zip->entry_encryption == ENCRYPTION_WINZIP_AES256)) {
|
|
|
|
|
|
|
|
memcpy(e, "\001\231\007\000\001\000AE", 8);
|
|
|
|
/* AES vendoer version AE-2 does not store a CRC.
|
|
|
|
* WinZip 11 uses AE-1, which does store the CRC,
|
|
|
|
* but it does not store the CRC when the file size
|
|
|
|
* is less than 20 bytes. So we simulate what
|
|
|
|
* WinZip 11 does.
|
|
|
|
* NOTE: WinZip 9.0 and 10.0 uses AE-2 by default. */
|
|
|
|
if (archive_entry_size_is_set(zip->entry)
|
|
|
|
&& archive_entry_size(zip->entry) < 20) {
|
|
|
|
archive_le16enc(e+4, AES_VENDOR_AE_2);
|
|
|
|
zip->aes_vendor = AES_VENDOR_AE_2;/* no CRC. */
|
|
|
|
} else
|
|
|
|
zip->aes_vendor = AES_VENDOR_AE_1;
|
|
|
|
e += 8;
|
|
|
|
/* AES encryption strength. */
|
|
|
|
*e++ = (zip->entry_encryption == ENCRYPTION_WINZIP_AES128)?1:3;
|
|
|
|
/* Actual compression method. */
|
|
|
|
archive_le16enc(e, zip->entry_compression);
|
|
|
|
e += 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy UT ,ux, and AES-extra into central directory as well. */
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->file_header_extra_offset = zip->central_directory_bytes;
|
|
|
|
cd_extra = cd_alloc(zip, e - local_extra);
|
|
|
|
memcpy(cd_extra, local_extra, e - local_extra);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Following extra blocks vary between local header and
|
|
|
|
* central directory. These are the local header versions.
|
|
|
|
* Central directory versions get formatted in
|
|
|
|
* archive_write_zip_finish_entry() below.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* "[Zip64 entry] in the local header MUST include BOTH
|
|
|
|
* original [uncompressed] and compressed size fields." */
|
|
|
|
if (zip->entry_uses_zip64) {
|
|
|
|
unsigned char *zip64_start = e;
|
|
|
|
memcpy(e, "\001\000\020\000", 4);
|
|
|
|
e += 4;
|
|
|
|
archive_le64enc(e, zip->entry_uncompressed_size);
|
|
|
|
e += 8;
|
|
|
|
archive_le64enc(e, zip->entry_compressed_size);
|
|
|
|
e += 8;
|
2015-10-21 11:47:34 +03:00
|
|
|
archive_le16enc(zip64_start + 2, (uint16_t)(e - (zip64_start + 4)));
|
2014-03-18 07:43:07 +04:00
|
|
|
}
|
|
|
|
|
2015-10-21 11:47:34 +03:00
|
|
|
if (zip->flags & ZIP_FLAG_EXPERIMENT_xl) {
|
|
|
|
/* Experimental 'xl' extension to improve streaming. */
|
2014-03-18 07:43:07 +04:00
|
|
|
unsigned char *external_info = e;
|
|
|
|
int included = 7;
|
2015-10-21 11:47:34 +03:00
|
|
|
memcpy(e, "xl\000\000", 4); // 0x6c65 + 2-byte length
|
2014-03-18 07:43:07 +04:00
|
|
|
e += 4;
|
|
|
|
e[0] = included; /* bitmap of included fields */
|
|
|
|
e += 1;
|
|
|
|
if (included & 1) {
|
|
|
|
archive_le16enc(e, /* "Version created by" */
|
|
|
|
3 * 256 + version_needed);
|
|
|
|
e += 2;
|
2011-12-20 03:30:59 +04:00
|
|
|
}
|
2014-03-18 07:43:07 +04:00
|
|
|
if (included & 2) {
|
|
|
|
archive_le16enc(e, 0); /* internal file attributes */
|
|
|
|
e += 2;
|
|
|
|
}
|
|
|
|
if (included & 4) {
|
|
|
|
archive_le32enc(e, /* external file attributes */
|
2014-04-15 17:07:48 +04:00
|
|
|
((uint32_t)archive_entry_mode(zip->entry)) << 16);
|
2014-03-18 07:43:07 +04:00
|
|
|
e += 4;
|
|
|
|
}
|
|
|
|
if (included & 8) {
|
|
|
|
// Libarchive does not currently support file comments.
|
|
|
|
}
|
2015-10-21 11:47:34 +03:00
|
|
|
archive_le16enc(external_info + 2, (uint16_t)(e - (external_info + 4)));
|
2011-12-20 03:30:59 +04:00
|
|
|
}
|
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
/* Update local header with size of extra data and write it all out: */
|
2015-10-21 11:47:34 +03:00
|
|
|
archive_le16enc(local_header + 28, (uint16_t)(e - local_extra));
|
2014-03-18 07:43:07 +04:00
|
|
|
|
|
|
|
ret = __archive_write_output(a, local_header, 30);
|
2011-12-20 03:30:59 +04:00
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ARCHIVE_FATAL);
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->written_bytes += 30;
|
2011-12-20 03:30:59 +04:00
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
ret = write_path(zip->entry, a);
|
2011-12-20 03:30:59 +04:00
|
|
|
if (ret <= ARCHIVE_OK)
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
zip->written_bytes += ret;
|
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
ret = __archive_write_output(a, local_extra, e - local_extra);
|
2011-12-20 03:30:59 +04:00
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ARCHIVE_FATAL);
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->written_bytes += e - local_extra;
|
2011-12-31 22:54:34 +04:00
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
/* For symlinks, write the body now. */
|
2014-04-15 06:19:05 +04:00
|
|
|
if (slink != NULL) {
|
|
|
|
ret = __archive_write_output(a, slink, slink_size);
|
2011-12-31 22:54:34 +04:00
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ARCHIVE_FATAL);
|
2014-04-15 06:19:05 +04:00
|
|
|
zip->entry_compressed_written += slink_size;
|
|
|
|
zip->entry_uncompressed_written += slink_size;
|
|
|
|
zip->written_bytes += slink_size;
|
2011-12-31 22:54:34 +04:00
|
|
|
}
|
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
#ifdef HAVE_ZLIB_H
|
|
|
|
if (zip->entry_compression == COMPRESSION_DEFLATE) {
|
|
|
|
zip->stream.zalloc = Z_NULL;
|
|
|
|
zip->stream.zfree = Z_NULL;
|
|
|
|
zip->stream.opaque = Z_NULL;
|
|
|
|
zip->stream.next_out = zip->buf;
|
|
|
|
zip->stream.avail_out = (uInt)zip->len_buf;
|
2015-10-21 11:47:34 +03:00
|
|
|
if (deflateInit2(&zip->stream, zip->deflate_compression_level,
|
2014-03-18 07:43:07 +04:00
|
|
|
Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
|
|
|
|
archive_set_error(&a->archive, ENOMEM,
|
|
|
|
"Can't init deflate compressor");
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return (ret2);
|
2011-12-20 03:30:59 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t
|
|
|
|
archive_write_zip_data(struct archive_write *a, const void *buff, size_t s)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct zip *zip = a->format_data;
|
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
if ((int64_t)s > zip->entry_uncompressed_limit)
|
|
|
|
s = (size_t)zip->entry_uncompressed_limit;
|
|
|
|
zip->entry_uncompressed_written += s;
|
2011-12-20 03:30:59 +04:00
|
|
|
|
|
|
|
if (s == 0) return 0;
|
|
|
|
|
2015-10-21 11:47:34 +03:00
|
|
|
if (zip->entry_flags & ZIP_ENTRY_FLAG_ENCRYPTED) {
|
|
|
|
switch (zip->entry_encryption) {
|
|
|
|
case ENCRYPTION_TRADITIONAL:
|
|
|
|
/* Initialize traditoinal PKWARE encryption context. */
|
|
|
|
if (!zip->tctx_valid) {
|
|
|
|
ret = init_traditional_pkware_encryption(a);
|
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ret);
|
|
|
|
zip->tctx_valid = 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ENCRYPTION_WINZIP_AES128:
|
|
|
|
case ENCRYPTION_WINZIP_AES256:
|
|
|
|
if (!zip->cctx_valid) {
|
|
|
|
ret = init_winzip_aes_encryption(a);
|
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ret);
|
|
|
|
zip->cctx_valid = zip->hctx_valid = 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
switch (zip->entry_compression) {
|
2011-12-20 03:30:59 +04:00
|
|
|
case COMPRESSION_STORE:
|
2015-10-21 11:47:34 +03:00
|
|
|
if (zip->tctx_valid || zip->cctx_valid) {
|
|
|
|
const uint8_t *rb = (const uint8_t *)buff;
|
|
|
|
const uint8_t * const re = rb + s;
|
|
|
|
|
|
|
|
while (rb < re) {
|
|
|
|
size_t l;
|
|
|
|
|
|
|
|
if (zip->tctx_valid) {
|
|
|
|
l = trad_enc_encrypt_update(&zip->tctx,
|
|
|
|
rb, re - rb,
|
|
|
|
zip->buf, zip->len_buf);
|
|
|
|
} else {
|
|
|
|
l = zip->len_buf;
|
|
|
|
ret = archive_encrypto_aes_ctr_update(
|
|
|
|
&zip->cctx,
|
|
|
|
rb, re - rb, zip->buf, &l);
|
|
|
|
if (ret < 0) {
|
|
|
|
archive_set_error(&a->archive,
|
|
|
|
ARCHIVE_ERRNO_MISC,
|
|
|
|
"Failed to encrypt file");
|
|
|
|
return (ARCHIVE_FAILED);
|
|
|
|
}
|
|
|
|
archive_hmac_sha1_update(&zip->hctx,
|
|
|
|
zip->buf, l);
|
|
|
|
}
|
|
|
|
ret = __archive_write_output(a, zip->buf, l);
|
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ret);
|
|
|
|
zip->entry_compressed_written += l;
|
|
|
|
zip->written_bytes += l;
|
|
|
|
rb += l;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ret = __archive_write_output(a, buff, s);
|
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ret);
|
|
|
|
zip->written_bytes += s;
|
|
|
|
zip->entry_compressed_written += s;
|
|
|
|
}
|
2014-03-18 07:43:07 +04:00
|
|
|
break;
|
2011-12-20 03:30:59 +04:00
|
|
|
#if HAVE_ZLIB_H
|
|
|
|
case COMPRESSION_DEFLATE:
|
|
|
|
zip->stream.next_in = (unsigned char*)(uintptr_t)buff;
|
2013-02-09 21:17:57 +04:00
|
|
|
zip->stream.avail_in = (uInt)s;
|
2011-12-20 03:30:59 +04:00
|
|
|
do {
|
|
|
|
ret = deflate(&zip->stream, Z_NO_FLUSH);
|
|
|
|
if (ret == Z_STREAM_ERROR)
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
if (zip->stream.avail_out == 0) {
|
2015-10-21 11:47:34 +03:00
|
|
|
if (zip->tctx_valid) {
|
|
|
|
trad_enc_encrypt_update(&zip->tctx,
|
|
|
|
zip->buf, zip->len_buf,
|
|
|
|
zip->buf, zip->len_buf);
|
|
|
|
} else if (zip->cctx_valid) {
|
|
|
|
size_t outl = zip->len_buf;
|
|
|
|
ret = archive_encrypto_aes_ctr_update(
|
|
|
|
&zip->cctx,
|
|
|
|
zip->buf, zip->len_buf,
|
|
|
|
zip->buf, &outl);
|
|
|
|
if (ret < 0) {
|
|
|
|
archive_set_error(&a->archive,
|
|
|
|
ARCHIVE_ERRNO_MISC,
|
|
|
|
"Failed to encrypt file");
|
|
|
|
return (ARCHIVE_FAILED);
|
|
|
|
}
|
|
|
|
archive_hmac_sha1_update(&zip->hctx,
|
|
|
|
zip->buf, zip->len_buf);
|
|
|
|
}
|
2011-12-31 22:54:34 +04:00
|
|
|
ret = __archive_write_output(a, zip->buf,
|
|
|
|
zip->len_buf);
|
2011-12-20 03:30:59 +04:00
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ret);
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->entry_compressed_written += zip->len_buf;
|
2011-12-20 03:30:59 +04:00
|
|
|
zip->written_bytes += zip->len_buf;
|
|
|
|
zip->stream.next_out = zip->buf;
|
2013-02-09 21:17:57 +04:00
|
|
|
zip->stream.avail_out = (uInt)zip->len_buf;
|
2011-12-20 03:30:59 +04:00
|
|
|
}
|
|
|
|
} while (zip->stream.avail_in != 0);
|
2014-03-18 07:43:07 +04:00
|
|
|
break;
|
2011-12-20 03:30:59 +04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
default:
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Invalid ZIP compression type");
|
|
|
|
return ARCHIVE_FATAL;
|
|
|
|
}
|
2014-03-18 07:43:07 +04:00
|
|
|
|
|
|
|
zip->entry_uncompressed_limit -= s;
|
2015-10-21 11:47:34 +03:00
|
|
|
if (!zip->cctx_valid || zip->aes_vendor != AES_VENDOR_AE_2)
|
|
|
|
zip->entry_crc32 =
|
|
|
|
zip->crc32func(zip->entry_crc32, buff, (unsigned)s);
|
2014-03-18 07:43:07 +04:00
|
|
|
return (s);
|
|
|
|
|
2011-12-20 03:30:59 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
archive_write_zip_finish_entry(struct archive_write *a)
|
|
|
|
{
|
|
|
|
struct zip *zip = a->format_data;
|
2014-03-18 07:43:07 +04:00
|
|
|
int ret;
|
2011-12-20 03:30:59 +04:00
|
|
|
|
|
|
|
#if HAVE_ZLIB_H
|
2014-03-18 07:43:07 +04:00
|
|
|
if (zip->entry_compression == COMPRESSION_DEFLATE) {
|
2011-12-20 03:30:59 +04:00
|
|
|
for (;;) {
|
2014-03-18 07:43:07 +04:00
|
|
|
size_t remainder;
|
2015-10-21 11:47:34 +03:00
|
|
|
|
2011-12-20 03:30:59 +04:00
|
|
|
ret = deflate(&zip->stream, Z_FINISH);
|
|
|
|
if (ret == Z_STREAM_ERROR)
|
|
|
|
return (ARCHIVE_FATAL);
|
2014-03-18 07:43:07 +04:00
|
|
|
remainder = zip->len_buf - zip->stream.avail_out;
|
2015-10-21 11:47:34 +03:00
|
|
|
if (zip->tctx_valid) {
|
|
|
|
trad_enc_encrypt_update(&zip->tctx,
|
|
|
|
zip->buf, remainder, zip->buf, remainder);
|
|
|
|
} else if (zip->cctx_valid) {
|
|
|
|
size_t outl = remainder;
|
|
|
|
ret = archive_encrypto_aes_ctr_update(
|
|
|
|
&zip->cctx, zip->buf, remainder,
|
|
|
|
zip->buf, &outl);
|
|
|
|
if (ret < 0) {
|
|
|
|
archive_set_error(&a->archive,
|
|
|
|
ARCHIVE_ERRNO_MISC,
|
|
|
|
"Failed to encrypt file");
|
|
|
|
return (ARCHIVE_FAILED);
|
|
|
|
}
|
|
|
|
archive_hmac_sha1_update(&zip->hctx,
|
|
|
|
zip->buf, remainder);
|
|
|
|
}
|
2014-03-18 07:43:07 +04:00
|
|
|
ret = __archive_write_output(a, zip->buf, remainder);
|
2011-12-20 03:30:59 +04:00
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ret);
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->entry_compressed_written += remainder;
|
|
|
|
zip->written_bytes += remainder;
|
2011-12-20 03:30:59 +04:00
|
|
|
zip->stream.next_out = zip->buf;
|
|
|
|
if (zip->stream.avail_out != 0)
|
|
|
|
break;
|
2013-02-09 21:17:57 +04:00
|
|
|
zip->stream.avail_out = (uInt)zip->len_buf;
|
2011-12-20 03:30:59 +04:00
|
|
|
}
|
|
|
|
deflateEnd(&zip->stream);
|
2014-03-18 07:43:07 +04:00
|
|
|
}
|
2011-12-20 03:30:59 +04:00
|
|
|
#endif
|
2015-10-21 11:47:34 +03:00
|
|
|
if (zip->hctx_valid) {
|
|
|
|
uint8_t hmac[20];
|
|
|
|
size_t hmac_len = 20;
|
|
|
|
|
|
|
|
archive_hmac_sha1_final(&zip->hctx, hmac, &hmac_len);
|
|
|
|
ret = __archive_write_output(a, hmac, AUTH_CODE_SIZE);
|
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ret);
|
|
|
|
zip->entry_compressed_written += AUTH_CODE_SIZE;
|
|
|
|
zip->written_bytes += AUTH_CODE_SIZE;
|
|
|
|
}
|
2014-03-18 07:43:07 +04:00
|
|
|
|
|
|
|
/* Write trailing data descriptor. */
|
|
|
|
if ((zip->entry_flags & ZIP_ENTRY_FLAG_LENGTH_AT_END) != 0) {
|
|
|
|
char d[24];
|
|
|
|
memcpy(d, "PK\007\010", 4);
|
2015-10-21 11:47:34 +03:00
|
|
|
if (zip->cctx_valid && zip->aes_vendor == AES_VENDOR_AE_2)
|
|
|
|
archive_le32enc(d + 4, 0);/* no CRC.*/
|
|
|
|
else
|
|
|
|
archive_le32enc(d + 4, zip->entry_crc32);
|
2014-03-18 07:43:07 +04:00
|
|
|
if (zip->entry_uses_zip64) {
|
2015-10-21 11:47:34 +03:00
|
|
|
archive_le64enc(d + 8,
|
|
|
|
(uint64_t)zip->entry_compressed_written);
|
|
|
|
archive_le64enc(d + 16,
|
|
|
|
(uint64_t)zip->entry_uncompressed_written);
|
2014-03-18 07:43:07 +04:00
|
|
|
ret = __archive_write_output(a, d, 24);
|
|
|
|
zip->written_bytes += 24;
|
|
|
|
} else {
|
2015-10-21 11:47:34 +03:00
|
|
|
archive_le32enc(d + 8,
|
|
|
|
(uint32_t)zip->entry_compressed_written);
|
|
|
|
archive_le32enc(d + 12,
|
|
|
|
(uint32_t)zip->entry_uncompressed_written);
|
2014-03-18 07:43:07 +04:00
|
|
|
ret = __archive_write_output(a, d, 16);
|
|
|
|
zip->written_bytes += 16;
|
|
|
|
}
|
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ARCHIVE_FATAL);
|
2011-12-20 03:30:59 +04:00
|
|
|
}
|
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
/* Append Zip64 extra data to central directory information. */
|
2014-04-03 23:09:28 +04:00
|
|
|
if (zip->entry_compressed_written > ARCHIVE_LITERAL_LL(0xffffffff)
|
|
|
|
|| zip->entry_uncompressed_written > ARCHIVE_LITERAL_LL(0xffffffff)
|
|
|
|
|| zip->entry_offset > ARCHIVE_LITERAL_LL(0xffffffff)) {
|
2014-03-18 07:43:07 +04:00
|
|
|
unsigned char zip64[32];
|
|
|
|
unsigned char *z = zip64, *zd;
|
|
|
|
memcpy(z, "\001\000\000\000", 4);
|
|
|
|
z += 4;
|
2014-04-03 23:09:28 +04:00
|
|
|
if (zip->entry_uncompressed_written >= ARCHIVE_LITERAL_LL(0xffffffff)) {
|
2014-03-18 07:43:07 +04:00
|
|
|
archive_le64enc(z, zip->entry_uncompressed_written);
|
|
|
|
z += 8;
|
|
|
|
}
|
2014-04-03 23:09:28 +04:00
|
|
|
if (zip->entry_compressed_written >= ARCHIVE_LITERAL_LL(0xffffffff)) {
|
2014-03-18 07:43:07 +04:00
|
|
|
archive_le64enc(z, zip->entry_compressed_written);
|
|
|
|
z += 8;
|
|
|
|
}
|
2014-04-03 23:09:28 +04:00
|
|
|
if (zip->entry_offset >= ARCHIVE_LITERAL_LL(0xffffffff)) {
|
2014-03-18 07:43:07 +04:00
|
|
|
archive_le64enc(z, zip->entry_offset);
|
|
|
|
z += 8;
|
|
|
|
}
|
2015-10-21 11:47:34 +03:00
|
|
|
archive_le16enc(zip64 + 2, (uint16_t)(z - (zip64 + 4)));
|
2014-03-18 07:43:07 +04:00
|
|
|
zd = cd_alloc(zip, z - zip64);
|
|
|
|
if (zd == NULL) {
|
|
|
|
archive_set_error(&a->archive, ENOMEM,
|
|
|
|
"Can't allocate zip data");
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
|
|
|
memcpy(zd, zip64, z - zip64);
|
|
|
|
/* Zip64 means version needs to be set to at least 4.5 */
|
|
|
|
if (archive_le16dec(zip->file_header + 6) < 45)
|
|
|
|
archive_le16enc(zip->file_header + 6, 45);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fix up central directory file header. */
|
2015-10-21 11:47:34 +03:00
|
|
|
if (zip->cctx_valid && zip->aes_vendor == AES_VENDOR_AE_2)
|
|
|
|
archive_le32enc(zip->file_header + 16, 0);/* no CRC.*/
|
|
|
|
else
|
|
|
|
archive_le32enc(zip->file_header + 16, zip->entry_crc32);
|
2014-03-18 07:43:07 +04:00
|
|
|
archive_le32enc(zip->file_header + 20,
|
2015-10-21 11:47:34 +03:00
|
|
|
(uint32_t)zipmin(zip->entry_compressed_written,
|
|
|
|
ARCHIVE_LITERAL_LL(0xffffffff)));
|
2014-03-18 07:43:07 +04:00
|
|
|
archive_le32enc(zip->file_header + 24,
|
2015-10-21 11:47:34 +03:00
|
|
|
(uint32_t)zipmin(zip->entry_uncompressed_written,
|
|
|
|
ARCHIVE_LITERAL_LL(0xffffffff)));
|
2014-03-18 07:43:07 +04:00
|
|
|
archive_le16enc(zip->file_header + 30,
|
2015-10-21 11:47:34 +03:00
|
|
|
(uint16_t)(zip->central_directory_bytes - zip->file_header_extra_offset));
|
2014-03-18 07:43:07 +04:00
|
|
|
archive_le32enc(zip->file_header + 42,
|
2015-10-21 11:47:34 +03:00
|
|
|
(uint32_t)zipmin(zip->entry_offset,
|
|
|
|
ARCHIVE_LITERAL_LL(0xffffffff)));
|
2014-03-18 07:43:07 +04:00
|
|
|
|
2011-12-20 03:30:59 +04:00
|
|
|
return (ARCHIVE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
archive_write_zip_close(struct archive_write *a)
|
|
|
|
{
|
2014-03-18 07:43:07 +04:00
|
|
|
uint8_t buff[64];
|
2011-12-20 03:30:59 +04:00
|
|
|
int64_t offset_start, offset_end;
|
2014-03-18 07:43:07 +04:00
|
|
|
struct zip *zip = a->format_data;
|
|
|
|
struct cd_segment *segment;
|
2011-12-20 03:30:59 +04:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
offset_start = zip->written_bytes;
|
2014-03-18 07:43:07 +04:00
|
|
|
segment = zip->central_directory;
|
|
|
|
while (segment != NULL) {
|
|
|
|
ret = __archive_write_output(a,
|
|
|
|
segment->buff, segment->p - segment->buff);
|
2011-12-20 03:30:59 +04:00
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ARCHIVE_FATAL);
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->written_bytes += segment->p - segment->buff;
|
|
|
|
segment = segment->next;
|
|
|
|
}
|
|
|
|
offset_end = zip->written_bytes;
|
2011-12-20 03:30:59 +04:00
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
/* If central dir info is too large, write Zip64 end-of-cd */
|
2014-04-03 23:09:28 +04:00
|
|
|
if (offset_end - offset_start > ARCHIVE_LITERAL_LL(0xffffffff)
|
|
|
|
|| offset_start > ARCHIVE_LITERAL_LL(0xffffffff)
|
2014-03-18 07:43:07 +04:00
|
|
|
|| zip->central_directory_entries > 0xffffUL
|
|
|
|
|| (zip->flags & ZIP_FLAG_FORCE_ZIP64)) {
|
|
|
|
/* Zip64 end-of-cd record */
|
|
|
|
memset(buff, 0, 56);
|
|
|
|
memcpy(buff, "PK\006\006", 4);
|
|
|
|
archive_le64enc(buff + 4, 44);
|
|
|
|
archive_le16enc(buff + 12, 45);
|
|
|
|
archive_le16enc(buff + 14, 45);
|
|
|
|
/* This is disk 0 of 0. */
|
|
|
|
archive_le64enc(buff + 24, zip->central_directory_entries);
|
|
|
|
archive_le64enc(buff + 32, zip->central_directory_entries);
|
|
|
|
archive_le64enc(buff + 40, offset_end - offset_start);
|
|
|
|
archive_le64enc(buff + 48, offset_start);
|
|
|
|
ret = __archive_write_output(a, buff, 56);
|
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
zip->written_bytes += 56;
|
|
|
|
|
|
|
|
/* Zip64 end-of-cd locator record. */
|
|
|
|
memset(buff, 0, 20);
|
|
|
|
memcpy(buff, "PK\006\007", 4);
|
|
|
|
archive_le32enc(buff + 4, 0);
|
|
|
|
archive_le64enc(buff + 8, offset_end);
|
|
|
|
archive_le32enc(buff + 16, 1);
|
|
|
|
ret = __archive_write_output(a, buff, 20);
|
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
zip->written_bytes += 20;
|
2011-12-20 03:30:59 +04:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
/* Format and write end of central directory. */
|
|
|
|
memset(buff, 0, sizeof(buff));
|
|
|
|
memcpy(buff, "PK\005\006", 4);
|
2015-10-21 11:47:34 +03:00
|
|
|
archive_le16enc(buff + 8, (uint16_t)zipmin(0xffffU,
|
|
|
|
zip->central_directory_entries));
|
|
|
|
archive_le16enc(buff + 10, (uint16_t)zipmin(0xffffU,
|
|
|
|
zip->central_directory_entries));
|
|
|
|
archive_le32enc(buff + 12,
|
2015-10-21 17:12:35 +03:00
|
|
|
(uint32_t)zipmin(ARCHIVE_LITERAL_LL(0xffffffff),
|
|
|
|
(offset_end - offset_start)));
|
2015-10-21 11:47:34 +03:00
|
|
|
archive_le32enc(buff + 16,
|
2015-10-21 17:12:35 +03:00
|
|
|
(uint32_t)zipmin(ARCHIVE_LITERAL_LL(0xffffffff),
|
|
|
|
offset_start));
|
2014-03-18 07:43:07 +04:00
|
|
|
ret = __archive_write_output(a, buff, 22);
|
2011-12-20 03:30:59 +04:00
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ARCHIVE_FATAL);
|
2014-03-18 07:43:07 +04:00
|
|
|
zip->written_bytes += 22;
|
2011-12-20 03:30:59 +04:00
|
|
|
return (ARCHIVE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
archive_write_zip_free(struct archive_write *a)
|
|
|
|
{
|
|
|
|
struct zip *zip;
|
2014-03-18 07:43:07 +04:00
|
|
|
struct cd_segment *segment;
|
2011-12-20 03:30:59 +04:00
|
|
|
|
|
|
|
zip = a->format_data;
|
|
|
|
while (zip->central_directory != NULL) {
|
2014-03-18 07:43:07 +04:00
|
|
|
segment = zip->central_directory;
|
|
|
|
zip->central_directory = segment->next;
|
|
|
|
free(segment->buff);
|
|
|
|
free(segment);
|
2011-12-20 03:30:59 +04:00
|
|
|
}
|
|
|
|
free(zip->buf);
|
2014-03-18 07:43:07 +04:00
|
|
|
archive_entry_free(zip->entry);
|
2015-10-21 11:47:34 +03:00
|
|
|
if (zip->cctx_valid)
|
|
|
|
archive_encrypto_aes_ctr_release(&zip->cctx);
|
|
|
|
if (zip->hctx_valid)
|
|
|
|
archive_hmac_sha1_cleanup(&zip->hctx);
|
2014-03-18 07:43:07 +04:00
|
|
|
/* TODO: Free opt_sconv, sconv_default */
|
|
|
|
|
2011-12-20 03:30:59 +04:00
|
|
|
free(zip);
|
|
|
|
a->format_data = NULL;
|
|
|
|
return (ARCHIVE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Convert into MSDOS-style date/time. */
|
|
|
|
static unsigned int
|
|
|
|
dos_time(const time_t unix_time)
|
|
|
|
{
|
|
|
|
struct tm *t;
|
|
|
|
unsigned int dt;
|
|
|
|
|
|
|
|
/* This will not preserve time when creating/extracting the archive
|
|
|
|
* on two systems with different time zones. */
|
|
|
|
t = localtime(&unix_time);
|
|
|
|
|
|
|
|
/* MSDOS-style date/time is only between 1980-01-01 and 2107-12-31 */
|
|
|
|
if (t->tm_year < 1980 - 1900)
|
|
|
|
/* Set minimum date/time '1980-01-01 00:00:00'. */
|
|
|
|
dt = 0x00210000U;
|
|
|
|
else if (t->tm_year > 2107 - 1900)
|
|
|
|
/* Set maximum date/time '2107-12-31 23:59:58'. */
|
|
|
|
dt = 0xff9fbf7dU;
|
|
|
|
else {
|
|
|
|
dt = 0;
|
|
|
|
dt += ((t->tm_year - 80) & 0x7f) << 9;
|
|
|
|
dt += ((t->tm_mon + 1) & 0x0f) << 5;
|
|
|
|
dt += (t->tm_mday & 0x1f);
|
|
|
|
dt <<= 16;
|
|
|
|
dt += (t->tm_hour & 0x1f) << 11;
|
|
|
|
dt += (t->tm_min & 0x3f) << 5;
|
|
|
|
dt += (t->tm_sec & 0x3e) >> 1; /* Only counting every 2 seconds. */
|
|
|
|
}
|
|
|
|
return dt;
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t
|
|
|
|
path_length(struct archive_entry *entry)
|
|
|
|
{
|
|
|
|
mode_t type;
|
|
|
|
const char *path;
|
|
|
|
|
|
|
|
type = archive_entry_filetype(entry);
|
|
|
|
path = archive_entry_pathname(entry);
|
|
|
|
|
2013-02-09 21:17:57 +04:00
|
|
|
if (path == NULL)
|
|
|
|
return (0);
|
|
|
|
if (type == AE_IFDIR &&
|
|
|
|
(path[0] == '\0' || path[strlen(path) - 1] != '/')) {
|
2011-12-20 03:30:59 +04:00
|
|
|
return strlen(path) + 1;
|
|
|
|
} else {
|
|
|
|
return strlen(path);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
write_path(struct archive_entry *entry, struct archive_write *archive)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
const char *path;
|
|
|
|
mode_t type;
|
|
|
|
size_t written_bytes;
|
|
|
|
|
|
|
|
path = archive_entry_pathname(entry);
|
|
|
|
type = archive_entry_filetype(entry);
|
|
|
|
written_bytes = 0;
|
|
|
|
|
|
|
|
ret = __archive_write_output(archive, path, strlen(path));
|
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
written_bytes += strlen(path);
|
|
|
|
|
2014-03-18 07:43:07 +04:00
|
|
|
/* Folders are recognized by a trailing slash. */
|
2011-12-20 03:30:59 +04:00
|
|
|
if ((type == AE_IFDIR) & (path[strlen(path) - 1] != '/')) {
|
|
|
|
ret = __archive_write_output(archive, "/", 1);
|
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
written_bytes += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ((int)written_bytes);
|
|
|
|
}
|
2014-03-18 07:43:07 +04:00
|
|
|
|
|
|
|
static void
|
|
|
|
copy_path(struct archive_entry *entry, unsigned char *p)
|
|
|
|
{
|
|
|
|
const char *path;
|
|
|
|
size_t pathlen;
|
|
|
|
mode_t type;
|
|
|
|
|
|
|
|
path = archive_entry_pathname(entry);
|
|
|
|
pathlen = strlen(path);
|
|
|
|
type = archive_entry_filetype(entry);
|
|
|
|
|
|
|
|
memcpy(p, path, pathlen);
|
|
|
|
|
|
|
|
/* Folders are recognized by a trailing slash. */
|
|
|
|
if ((type == AE_IFDIR) & (path[pathlen - 1] != '/')) {
|
|
|
|
p[pathlen] = '/';
|
|
|
|
p[pathlen + 1] = '\0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static struct archive_string_conv *
|
|
|
|
get_sconv(struct archive_write *a, struct zip *zip)
|
|
|
|
{
|
|
|
|
if (zip->opt_sconv != NULL)
|
|
|
|
return (zip->opt_sconv);
|
|
|
|
|
|
|
|
if (!zip->init_default_conversion) {
|
|
|
|
zip->sconv_default =
|
|
|
|
archive_string_default_conversion_for_write(&(a->archive));
|
|
|
|
zip->init_default_conversion = 1;
|
|
|
|
}
|
|
|
|
return (zip->sconv_default);
|
|
|
|
}
|
2015-10-21 11:47:34 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
Traditional PKWARE Decryption functions.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void
|
|
|
|
trad_enc_update_keys(struct trad_enc_ctx *ctx, uint8_t c)
|
|
|
|
{
|
|
|
|
uint8_t t;
|
|
|
|
#define CRC32(c, b) (crc32(c ^ 0xffffffffUL, &b, 1) ^ 0xffffffffUL)
|
|
|
|
|
|
|
|
ctx->keys[0] = CRC32(ctx->keys[0], c);
|
|
|
|
ctx->keys[1] = (ctx->keys[1] + (ctx->keys[0] & 0xff)) * 134775813L + 1;
|
|
|
|
t = (ctx->keys[1] >> 24) & 0xff;
|
|
|
|
ctx->keys[2] = CRC32(ctx->keys[2], t);
|
|
|
|
#undef CRC32
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint8_t
|
|
|
|
trad_enc_decypt_byte(struct trad_enc_ctx *ctx)
|
|
|
|
{
|
|
|
|
unsigned temp = ctx->keys[2] | 2;
|
|
|
|
return (uint8_t)((temp * (temp ^ 1)) >> 8) & 0xff;
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned
|
|
|
|
trad_enc_encrypt_update(struct trad_enc_ctx *ctx, const uint8_t *in,
|
|
|
|
size_t in_len, uint8_t *out, size_t out_len)
|
|
|
|
{
|
|
|
|
unsigned i, max;
|
|
|
|
|
|
|
|
max = (unsigned)((in_len < out_len)? in_len: out_len);
|
|
|
|
|
|
|
|
for (i = 0; i < max; i++) {
|
|
|
|
uint8_t t = in[i];
|
|
|
|
out[i] = t ^ trad_enc_decypt_byte(ctx);
|
|
|
|
trad_enc_update_keys(ctx, t);
|
|
|
|
}
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
trad_enc_init(struct trad_enc_ctx *ctx, const char *pw, size_t pw_len)
|
|
|
|
{
|
|
|
|
|
|
|
|
ctx->keys[0] = 305419896L;
|
|
|
|
ctx->keys[1] = 591751049L;
|
|
|
|
ctx->keys[2] = 878082192L;
|
|
|
|
|
|
|
|
for (;pw_len; --pw_len)
|
|
|
|
trad_enc_update_keys(ctx, *pw++);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
is_traditional_pkware_encryption_supported(void)
|
|
|
|
{
|
|
|
|
uint8_t key[TRAD_HEADER_SIZE];
|
|
|
|
|
|
|
|
if (archive_random(key, sizeof(key)-1) != ARCHIVE_OK)
|
|
|
|
return (0);
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
init_traditional_pkware_encryption(struct archive_write *a)
|
|
|
|
{
|
|
|
|
struct zip *zip = a->format_data;
|
|
|
|
const char *passphrase;
|
|
|
|
uint8_t key[TRAD_HEADER_SIZE];
|
|
|
|
uint8_t key_encrypted[TRAD_HEADER_SIZE];
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
passphrase = __archive_write_get_passphrase(a);
|
|
|
|
if (passphrase == NULL) {
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Encryption needs passphrase");
|
|
|
|
return ARCHIVE_FAILED;
|
|
|
|
}
|
|
|
|
if (archive_random(key, sizeof(key)-1) != ARCHIVE_OK) {
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Can't generate random number for encryption");
|
|
|
|
return ARCHIVE_FATAL;
|
|
|
|
}
|
|
|
|
trad_enc_init(&zip->tctx, passphrase, strlen(passphrase));
|
|
|
|
/* Set the last key code which will be used as a check code
|
|
|
|
* for verifying passphrase in decryption. */
|
|
|
|
key[TRAD_HEADER_SIZE-1] = zip->trad_chkdat;
|
|
|
|
trad_enc_encrypt_update(&zip->tctx, key, TRAD_HEADER_SIZE,
|
|
|
|
key_encrypted, TRAD_HEADER_SIZE);
|
|
|
|
/* Write encrypted keys in the top of the file content. */
|
|
|
|
ret = __archive_write_output(a, key_encrypted, TRAD_HEADER_SIZE);
|
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ret);
|
|
|
|
zip->written_bytes += TRAD_HEADER_SIZE;
|
|
|
|
zip->entry_compressed_written += TRAD_HEADER_SIZE;
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
init_winzip_aes_encryption(struct archive_write *a)
|
|
|
|
{
|
|
|
|
struct zip *zip = a->format_data;
|
|
|
|
const char *passphrase;
|
|
|
|
size_t key_len, salt_len;
|
|
|
|
uint8_t salt[16 + 2];
|
|
|
|
uint8_t derived_key[MAX_DERIVED_KEY_BUF_SIZE];
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
passphrase = __archive_write_get_passphrase(a);
|
|
|
|
if (passphrase == NULL) {
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Encryption needs passphrase");
|
|
|
|
return (ARCHIVE_FAILED);
|
|
|
|
}
|
|
|
|
if (zip->entry_encryption == ENCRYPTION_WINZIP_AES128) {
|
|
|
|
salt_len = 8;
|
|
|
|
key_len = 16;
|
|
|
|
} else {
|
|
|
|
/* AES 256 */
|
|
|
|
salt_len = 16;
|
|
|
|
key_len = 32;
|
|
|
|
}
|
|
|
|
if (archive_random(salt, salt_len) != ARCHIVE_OK) {
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Can't generate random number for encryption");
|
|
|
|
return (ARCHIVE_FATAL);
|
|
|
|
}
|
|
|
|
archive_pbkdf2_sha1(passphrase, strlen(passphrase),
|
|
|
|
salt, salt_len, 1000, derived_key, key_len * 2 + 2);
|
|
|
|
|
|
|
|
ret = archive_encrypto_aes_ctr_init(&zip->cctx, derived_key, key_len);
|
|
|
|
if (ret != 0) {
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Decryption is unsupported due to lack of crypto library");
|
|
|
|
return (ARCHIVE_FAILED);
|
|
|
|
}
|
|
|
|
ret = archive_hmac_sha1_init(&zip->hctx, derived_key + key_len,
|
|
|
|
key_len);
|
|
|
|
if (ret != 0) {
|
|
|
|
archive_encrypto_aes_ctr_release(&zip->cctx);
|
|
|
|
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
|
|
|
"Failed to initialize HMAC-SHA1");
|
|
|
|
return (ARCHIVE_FAILED);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set a passowrd verification value after the 'salt'. */
|
|
|
|
salt[salt_len] = derived_key[key_len * 2];
|
|
|
|
salt[salt_len + 1] = derived_key[key_len * 2 + 1];
|
|
|
|
|
|
|
|
/* Write encrypted keys in the top of the file content. */
|
|
|
|
ret = __archive_write_output(a, salt, salt_len + 2);
|
|
|
|
if (ret != ARCHIVE_OK)
|
|
|
|
return (ret);
|
|
|
|
zip->written_bytes += salt_len + 2;
|
|
|
|
zip->entry_compressed_written += salt_len + 2;
|
|
|
|
|
|
|
|
return (ARCHIVE_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
is_winzip_aes_encryption_supported(int encryption)
|
|
|
|
{
|
|
|
|
size_t key_len, salt_len;
|
|
|
|
uint8_t salt[16 + 2];
|
|
|
|
uint8_t derived_key[MAX_DERIVED_KEY_BUF_SIZE];
|
|
|
|
archive_crypto_ctx cctx;
|
|
|
|
archive_hmac_sha1_ctx hctx;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (encryption == ENCRYPTION_WINZIP_AES128) {
|
|
|
|
salt_len = 8;
|
|
|
|
key_len = 16;
|
|
|
|
} else {
|
|
|
|
/* AES 256 */
|
|
|
|
salt_len = 16;
|
|
|
|
key_len = 32;
|
|
|
|
}
|
|
|
|
if (archive_random(salt, salt_len) != ARCHIVE_OK)
|
|
|
|
return (0);
|
|
|
|
ret = archive_pbkdf2_sha1("p", 1, salt, salt_len, 1000,
|
|
|
|
derived_key, key_len * 2 + 2);
|
|
|
|
if (ret != 0)
|
|
|
|
return (0);
|
|
|
|
|
|
|
|
ret = archive_encrypto_aes_ctr_init(&cctx, derived_key, key_len);
|
|
|
|
if (ret != 0)
|
|
|
|
return (0);
|
|
|
|
ret = archive_hmac_sha1_init(&hctx, derived_key + key_len,
|
|
|
|
key_len);
|
|
|
|
archive_encrypto_aes_ctr_release(&cctx);
|
|
|
|
if (ret != 0)
|
|
|
|
return (0);
|
|
|
|
archive_hmac_sha1_cleanup(&hctx);
|
|
|
|
return (1);
|
|
|
|
}
|