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

92
src/Common/libzip/zip_source_get_file_attributes.c
View File

@@ -3,7 +3,7 @@
Copyright (C) 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
@@ -42,62 +42,64 @@ zip_file_attributes_init(zip_file_attributes_t *attributes) {
int
zip_source_get_file_attributes(zip_source_t *src, zip_file_attributes_t *attributes) {
if (src->source_closed) {
return -1;
return -1;
}
if (attributes == NULL) {
zip_error_set(&src->error, ZIP_ER_INVAL, 0);
return -1;
zip_error_set(&src->error, ZIP_ER_INVAL, 0);
return -1;
}
zip_file_attributes_init(attributes);
if (src->supports & ZIP_SOURCE_MAKE_COMMAND_BITMASK(ZIP_SOURCE_GET_FILE_ATTRIBUTES)) {
if (_zip_source_call(src, attributes, sizeof(*attributes), ZIP_SOURCE_GET_FILE_ATTRIBUTES) < 0) {
return -1;
}
if (_zip_source_call(src, attributes, sizeof(*attributes), ZIP_SOURCE_GET_FILE_ATTRIBUTES) < 0) {
return -1;
}
}
if (ZIP_SOURCE_IS_LAYERED(src)) {
zip_file_attributes_t lower_attributes;
zip_file_attributes_t lower_attributes;
if (zip_source_get_file_attributes(src->src, &lower_attributes) < 0) {
_zip_error_set_from_source(&src->error, src->src);
return -1;
}
if (zip_source_get_file_attributes(src->src, &lower_attributes) < 0) {
_zip_error_set_from_source(&src->error, src->src);
return -1;
}
if ((lower_attributes.valid & ZIP_FILE_ATTRIBUTES_HOST_SYSTEM) && (attributes->valid & ZIP_FILE_ATTRIBUTES_HOST_SYSTEM) == 0) {
attributes->host_system = lower_attributes.host_system;
attributes->valid |= ZIP_FILE_ATTRIBUTES_HOST_SYSTEM;
}
if ((lower_attributes.valid & ZIP_FILE_ATTRIBUTES_ASCII) && (attributes->valid & ZIP_FILE_ATTRIBUTES_ASCII) == 0) {
attributes->ascii = lower_attributes.ascii;
attributes->valid |= ZIP_FILE_ATTRIBUTES_ASCII;
}
if ((lower_attributes.valid & ZIP_FILE_ATTRIBUTES_VERSION_NEEDED)) {
if (attributes->valid & ZIP_FILE_ATTRIBUTES_VERSION_NEEDED) {
attributes->version_needed = ZIP_MAX(lower_attributes.version_needed, attributes->version_needed);
}
else {
attributes->version_needed = lower_attributes.version_needed;
attributes->valid |= ZIP_FILE_ATTRIBUTES_VERSION_NEEDED;
}
}
if ((lower_attributes.valid & ZIP_FILE_ATTRIBUTES_EXTERNAL_FILE_ATTRIBUTES) && (attributes->valid & ZIP_FILE_ATTRIBUTES_EXTERNAL_FILE_ATTRIBUTES) == 0) {
attributes->external_file_attributes = lower_attributes.external_file_attributes;
attributes->valid |= ZIP_FILE_ATTRIBUTES_EXTERNAL_FILE_ATTRIBUTES;
}
if ((lower_attributes.valid & ZIP_FILE_ATTRIBUTES_GENERAL_PURPOSE_BIT_FLAGS)) {
if (attributes->valid & ZIP_FILE_ATTRIBUTES_GENERAL_PURPOSE_BIT_FLAGS) {
attributes->general_purpose_bit_flags &= ~lower_attributes.general_purpose_bit_mask;
attributes->general_purpose_bit_flags |= lower_attributes.general_purpose_bit_flags & lower_attributes.general_purpose_bit_mask;
attributes->general_purpose_bit_mask |= lower_attributes.general_purpose_bit_mask;
}
else {
attributes->valid |= ZIP_FILE_ATTRIBUTES_GENERAL_PURPOSE_BIT_FLAGS;
attributes->general_purpose_bit_flags = lower_attributes.general_purpose_bit_flags;
attributes->general_purpose_bit_mask = lower_attributes.general_purpose_bit_mask;
}
}
if ((lower_attributes.valid & ZIP_FILE_ATTRIBUTES_HOST_SYSTEM) && (attributes->valid & ZIP_FILE_ATTRIBUTES_HOST_SYSTEM) == 0) {
attributes->host_system = lower_attributes.host_system;
attributes->valid |= ZIP_FILE_ATTRIBUTES_HOST_SYSTEM;
}
if ((lower_attributes.valid & ZIP_FILE_ATTRIBUTES_ASCII) && (attributes->valid & ZIP_FILE_ATTRIBUTES_ASCII) == 0) {
attributes->ascii = lower_attributes.ascii;
attributes->valid |= ZIP_FILE_ATTRIBUTES_ASCII;
}
if ((lower_attributes.valid & ZIP_FILE_ATTRIBUTES_VERSION_NEEDED)) {
if (attributes->valid & ZIP_FILE_ATTRIBUTES_VERSION_NEEDED) {
attributes->version_needed = ZIP_MAX(lower_attributes.version_needed, attributes->version_needed);
}
else {
attributes->version_needed = lower_attributes.version_needed;
attributes->valid |= ZIP_FILE_ATTRIBUTES_VERSION_NEEDED;
}
}
if ((lower_attributes.valid & ZIP_FILE_ATTRIBUTES_EXTERNAL_FILE_ATTRIBUTES) && (attributes->valid & ZIP_FILE_ATTRIBUTES_EXTERNAL_FILE_ATTRIBUTES) == 0) {
attributes->external_file_attributes = lower_attributes.external_file_attributes;
attributes->valid |= ZIP_FILE_ATTRIBUTES_EXTERNAL_FILE_ATTRIBUTES;
}
if ((lower_attributes.valid & ZIP_FILE_ATTRIBUTES_GENERAL_PURPOSE_BIT_FLAGS)) {
if (attributes->valid & ZIP_FILE_ATTRIBUTES_GENERAL_PURPOSE_BIT_FLAGS) {
/* only take from lower level what is not defined at current level */
lower_attributes.general_purpose_bit_mask &= ~attributes->general_purpose_bit_mask;
attributes->general_purpose_bit_flags |= lower_attributes.general_purpose_bit_flags & lower_attributes.general_purpose_bit_mask;
attributes->general_purpose_bit_mask |= lower_attributes.general_purpose_bit_mask;
}
else {
attributes->valid |= ZIP_FILE_ATTRIBUTES_GENERAL_PURPOSE_BIT_FLAGS;
attributes->general_purpose_bit_flags = lower_attributes.general_purpose_bit_flags;
attributes->general_purpose_bit_mask = lower_attributes.general_purpose_bit_mask;
}
}
}
return 0;