Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Update Libzip to latest 1.9.2 (#1071)

Browse Source 
* Libzip 1.9.2

Updated Libzip to latest version 1.9.2 and changed version number in the config.h from 1.7.3 to 1.9.2. Not sure if anything else needs to be tweaked :)

* Modified Libzip to work with Visual studio

* Update README.md

Update libzip copyright.

* Added the missing files.

I've added the missing files zipconf.h and config.h, I've missed those sorry for that!
This commit is contained in:
DLL125
2023-05-25 12:52:53 +02:00
committed by GitHub
parent b872702309
commit 1fc4168b81
145 changed files with 8187 additions and 3942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
src/Common/libzip/zip_source_pkware_encode.c
View File

@@ -3,7 +3,7 @@
Copyright (C) 2009-2020 Dieter Baron and Thomas Klausner
This file is part of libzip, a library to manipulate ZIP archives.
The authors can be contacted at <libzip@nih.at>
The authors can be contacted at <info@libzip.org>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -58,21 +58,21 @@ zip_source_pkware_encode(zip_t *za, zip_source_t *src, zip_uint16_t em, int flag
zip_source_t *s2;
if (password == NULL || src == NULL || em != ZIP_EM_TRAD_PKWARE) {
zip_error_set(&za->error, ZIP_ER_INVAL, 0);
return NULL;
zip_error_set(&za->error, ZIP_ER_INVAL, 0);
return NULL;
}
if (!(flags & ZIP_CODEC_ENCODE)) {
zip_error_set(&za->error, ZIP_ER_ENCRNOTSUPP, 0);
return NULL;
zip_error_set(&za->error, ZIP_ER_ENCRNOTSUPP, 0);
return NULL;
}
if ((ctx = trad_pkware_new(password, &za->error)) == NULL) {
return NULL;
return NULL;
}
if ((s2 = zip_source_layered(za, src, pkware_encrypt, ctx)) == NULL) {
trad_pkware_free(ctx);
return NULL;
trad_pkware_free(ctx);
return NULL;
}
return s2;
@@ -86,15 +86,15 @@ encrypt_header(zip_source_t *src, struct trad_pkware *ctx) {
zip_uint8_t *header;
if (zip_source_stat(src, &st) != 0) {
_zip_error_set_from_source(&ctx->error, src);
return -1;
_zip_error_set_from_source(&ctx->error, src);
return -1;
}
_zip_u2d_time(st.mtime, &dostime, &dosdate);
if ((ctx->buffer = _zip_buffer_new(NULL, ZIP_CRYPTO_PKWARE_HEADERLEN)) == NULL) {
zip_error_set(&ctx->error, ZIP_ER_MEMORY, 0);
return -1;
zip_error_set(&ctx->error, ZIP_ER_MEMORY, 0);
return -1;
}
header = _zip_buffer_data(ctx->buffer);
@@ -102,10 +102,10 @@ encrypt_header(zip_source_t *src, struct trad_pkware *ctx) {
/* generate header from random bytes and mtime
see appnote.iz, XIII. Decryption, Step 2, last paragraph */
if (!zip_secure_random(header, ZIP_CRYPTO_PKWARE_HEADERLEN - 1)) {
zip_error_set(&ctx->error, ZIP_ER_INTERNAL, 0);
_zip_buffer_free(ctx->buffer);
ctx->buffer = NULL;
return -1;
zip_error_set(&ctx->error, ZIP_ER_INTERNAL, 0);
_zip_buffer_free(ctx->buffer);
ctx->buffer = NULL;
return -1;
}
header[ZIP_CRYPTO_PKWARE_HEADERLEN - 1] = (zip_uint8_t)((dostime >> 8) & 0xff);
@@ -125,92 +125,92 @@ pkware_encrypt(zip_source_t *src, void *ud, void *data, zip_uint64_t length, zip
switch (cmd) {
case ZIP_SOURCE_OPEN:
ctx->eof = false;
ctx->eof = false;
/* initialize keys */
_zip_pkware_keys_reset(&ctx->keys);
_zip_pkware_encrypt(&ctx->keys, NULL, (const zip_uint8_t *)ctx->password, strlen(ctx->password));
/* initialize keys */
_zip_pkware_keys_reset(&ctx->keys);
_zip_pkware_encrypt(&ctx->keys, NULL, (const zip_uint8_t *)ctx->password, strlen(ctx->password));
if (encrypt_header(src, ctx) < 0) {
return -1;
}
return 0;
if (encrypt_header(src, ctx) < 0) {
return -1;
}
return 0;
case ZIP_SOURCE_READ:
buffer_n = 0;
buffer_n = 0;
if (ctx->buffer) {
/* write header values to data */
buffer_n = _zip_buffer_read(ctx->buffer, data, length);
data = (zip_uint8_t *)data + buffer_n;
length -= buffer_n;
if (ctx->buffer) {
/* write header values to data */
buffer_n = _zip_buffer_read(ctx->buffer, data, length);
data = (zip_uint8_t *)data + buffer_n;
length -= buffer_n;
if (_zip_buffer_eof(ctx->buffer)) {
_zip_buffer_free(ctx->buffer);
ctx->buffer = NULL;
}
}
if (_zip_buffer_eof(ctx->buffer)) {
_zip_buffer_free(ctx->buffer);
ctx->buffer = NULL;
}
}
if (ctx->eof) {
return (zip_int64_t)buffer_n;
}
if (ctx->eof) {
return (zip_int64_t)buffer_n;
}
if ((n = zip_source_read(src, data, length)) < 0) {
_zip_error_set_from_source(&ctx->error, src);
return -1;
}
if ((n = zip_source_read(src, data, length)) < 0) {
_zip_error_set_from_source(&ctx->error, src);
return -1;
}
_zip_pkware_encrypt(&ctx->keys, (zip_uint8_t *)data, (zip_uint8_t *)data, (zip_uint64_t)n);
_zip_pkware_encrypt(&ctx->keys, (zip_uint8_t *)data, (zip_uint8_t *)data, (zip_uint64_t)n);
if ((zip_uint64_t)n < length) {
ctx->eof = true;
}
if ((zip_uint64_t)n < length) {
ctx->eof = true;
}
return (zip_int64_t)buffer_n + n;
return (zip_int64_t)buffer_n + n;
case ZIP_SOURCE_CLOSE:
_zip_buffer_free(ctx->buffer);
ctx->buffer = NULL;
return 0;
_zip_buffer_free(ctx->buffer);
ctx->buffer = NULL;
return 0;
case ZIP_SOURCE_STAT: {
zip_stat_t *st;
zip_stat_t *st;
st = (zip_stat_t *)data;
st->encryption_method = ZIP_EM_TRAD_PKWARE;
st->valid |= ZIP_STAT_ENCRYPTION_METHOD;
if (st->valid & ZIP_STAT_COMP_SIZE) {
st->comp_size += ZIP_CRYPTO_PKWARE_HEADERLEN;
}
st = (zip_stat_t *)data;
st->encryption_method = ZIP_EM_TRAD_PKWARE;
st->valid |= ZIP_STAT_ENCRYPTION_METHOD;
if (st->valid & ZIP_STAT_COMP_SIZE) {
st->comp_size += ZIP_CRYPTO_PKWARE_HEADERLEN;
}
return 0;
return 0;
}
case ZIP_SOURCE_GET_FILE_ATTRIBUTES: {
zip_file_attributes_t *attributes = (zip_file_attributes_t *)data;
if (length < sizeof(*attributes)) {
zip_error_set(&ctx->error, ZIP_ER_INVAL, 0);
return -1;
}
attributes->valid |= ZIP_FILE_ATTRIBUTES_VERSION_NEEDED;
attributes->version_needed = 20;
zip_file_attributes_t *attributes = (zip_file_attributes_t *)data;
if (length < sizeof(*attributes)) {
zip_error_set(&ctx->error, ZIP_ER_INVAL, 0);
return -1;
}
attributes->valid |= ZIP_FILE_ATTRIBUTES_VERSION_NEEDED;
attributes->version_needed = 20;
return 0;
return 0;
}
case ZIP_SOURCE_SUPPORTS:
return zip_source_make_command_bitmap(ZIP_SOURCE_OPEN, ZIP_SOURCE_READ, ZIP_SOURCE_CLOSE, ZIP_SOURCE_STAT, ZIP_SOURCE_ERROR, ZIP_SOURCE_FREE, ZIP_SOURCE_GET_FILE_ATTRIBUTES, -1);
return zip_source_make_command_bitmap(ZIP_SOURCE_OPEN, ZIP_SOURCE_READ, ZIP_SOURCE_CLOSE, ZIP_SOURCE_STAT, ZIP_SOURCE_ERROR, ZIP_SOURCE_FREE, ZIP_SOURCE_GET_FILE_ATTRIBUTES, -1);
case ZIP_SOURCE_ERROR:
return zip_error_to_data(&ctx->error, data, length);
return zip_error_to_data(&ctx->error, data, length);
case ZIP_SOURCE_FREE:
trad_pkware_free(ctx);
return 0;
trad_pkware_free(ctx);
return 0;
default:
zip_error_set(&ctx->error, ZIP_ER_INVAL, 0);
return -1;
zip_error_set(&ctx->error, ZIP_ER_INVAL, 0);
return -1;
}
}
@@ -220,14 +220,14 @@ trad_pkware_new(const char *password, zip_error_t *error) {
struct trad_pkware *ctx;
if ((ctx = (struct trad_pkware *)malloc(sizeof(*ctx))) == NULL) {
zip_error_set(error, ZIP_ER_MEMORY, 0);
return NULL;
zip_error_set(error, ZIP_ER_MEMORY, 0);
return NULL;
}
if ((ctx->password = strdup(password)) == NULL) {
zip_error_set(error, ZIP_ER_MEMORY, 0);
free(ctx);
return NULL;
zip_error_set(error, ZIP_ER_MEMORY, 0);
free(ctx);
return NULL;
}
ctx->buffer = NULL;
zip_error_init(&ctx->error);
@@ -239,7 +239,7 @@ trad_pkware_new(const char *password, zip_error_t *error) {
static void
trad_pkware_free(struct trad_pkware *ctx) {
if (ctx == NULL) {
return;
return;
}
free(ctx->password);