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

Windows: update libzip to latest version 1.7.3 (close issue #656)

Browse Source
This commit is contained in:
Mounir IDRASSI
2020-07-24 19:39:26 +02:00
parent 5cf7d946d2
commit 948a871c73
49 changed files with 2508 additions and 2730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Common/libzip/zip_algorithm_deflate.c
View File

@@ -91,8 +91,8 @@ deallocate(void *ud) {
}
static int
compression_flags(void *ud) {
static zip_uint16_t
general_purpose_bit_flags(void *ud) {
struct ctx *ctx = (struct ctx *)ud;
if (!ctx->compress) {
@@ -100,10 +100,10 @@ compression_flags(void *ud) {
}
if (ctx->compression_flags < 3) {
return 2;
return 2 << 1;
}
else if (ctx->compression_flags > 7) {
return 1;
return 1 << 1;
}
return 0;
}
@@ -220,12 +220,13 @@ process(void *ud, zip_uint8_t *data, zip_uint64_t *length) {
}
}
// clang-format off
/* clang-format off */
zip_compression_algorithm_t zip_algorithm_deflate_compress = {
compress_allocate,
deallocate,
compression_flags,
general_purpose_bit_flags,
20,
start,
end,
input,
@@ -237,7 +238,8 @@ zip_compression_algorithm_t zip_algorithm_deflate_compress = {
zip_compression_algorithm_t zip_algorithm_deflate_decompress = {
decompress_allocate,
deallocate,
compression_flags,
general_purpose_bit_flags,
20,
start,
end,
input,
@@ -245,4 +247,4 @@ zip_compression_algorithm_t zip_algorithm_deflate_decompress = {
process
};
// clang-format on
/* clang-format on */