diff options
| author | mitzal <34011576+mitzal@users.noreply.github.com> | 2020-04-24 06:40:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 21:40:21 -0700 |
| commit | 242897b0460afd99c0f064f269ae73c419435aef (patch) | |
| tree | ed04e7965bb51d732d7263320f0415e58d0d5717 /ports/libzip/avoid_computation_on_void_pointer.patch | |
| parent | 6717e1b9d053518e836ec11f49bd1d501b1a650e (diff) | |
| download | vcpkg-242897b0460afd99c0f064f269ae73c419435aef.tar.gz vcpkg-242897b0460afd99c0f064f269ae73c419435aef.zip | |
[libzip] update to rel-1-6-1 (#10784)
* Libzip updated to rel-1-6-1
* [libzip] Add windows_crypto feature
The new BCrypt/CNG-based crypto uses BCryptDeriveKeyPBKDF2 which is only
available since WinNT 6.1. It is important to me as a consumer of libzip
through vcpkg to be able to turn this off.
* Additional options added.
* Common Crypto supported as an option for encryption backend.
Co-authored-by: Michał Janiszewski <janisozaur+signed@gmail.com>
Diffstat (limited to 'ports/libzip/avoid_computation_on_void_pointer.patch')
| -rw-r--r-- | ports/libzip/avoid_computation_on_void_pointer.patch | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/ports/libzip/avoid_computation_on_void_pointer.patch b/ports/libzip/avoid_computation_on_void_pointer.patch deleted file mode 100644 index a655063f4..000000000 --- a/ports/libzip/avoid_computation_on_void_pointer.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/zip_source_winzip_aes_encode.c b/lib/zip_source_winzip_aes_encode.c -index c428c9a..4e5f753 100644 ---- a/lib/zip_source_winzip_aes_encode.c -+++ b/lib/zip_source_winzip_aes_encode.c -@@ -163,7 +163,7 @@ winzip_aes_encrypt(zip_source_t *src, void *ud, void *data, zip_uint64_t length, - /* TODO: return partial read? */ - return -1; - } -- buffer_n += _zip_buffer_read(ctx->buffer, data + ret, length - (zip_uint64_t)ret); -+ buffer_n += _zip_buffer_read(ctx->buffer, (zip_uint8_t *)data + ret, length - (zip_uint64_t)ret); - } - - return (zip_int64_t)(buffer_n + (zip_uint64_t)ret); |