Version 2.9.3.

zlib-ng · May 21, 2020 · 2aa369c · 2aa369c
1 parent d045b4f
commit 2aa369c
Show file tree

Hide file tree

Showing 48 changed files with 56 additions and 55 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,7  37,7 @@ endif()
 enable_language(C)
 
 # Minizip library version
-set(VERSION "2.9.2")
 set(VERSION "2.9.3")
 
 # Minizip api version
 set(SOVERSION "2.5")

diff --git a/README.md b/README.md
@@ -1,9  1,10 @@
-# minizip 2.9.2
 # minizip 2.9.3
 
 minizip is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.
 
 [![Master Branch Status](https://github.com/nmoinvaz/minizip/workflows/CI/badge.svg)](https://github.com/nmoinvaz/minizip/actions)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/minizip.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:minizip)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/53d48ca8fec549f4a8b39cf95cba6ad6)](https://www.codacy.com/manual/nmoinvaz/minizip?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nmoinvaz/minizip&amp;utm_campaign=Badge_Grade)
 [![CodeFactor](https://www.codefactor.io/repository/github/nmoinvaz/minizip/badge)](https://www.codefactor.io/repository/github/nmoinvaz/minizip)
 [![License: Zlib](https://img.shields.io/badge/license-zlib-lightgrey.svg)](https://github.com/nmoinvaz/minizip/blob/master/LICENSE)
 [![codecov.io](https://codecov.io/github/nmoinvaz/minizip/coverage.svg?branch=dev)](https://codecov.io/github/nmoinvaz/minizip/)
@@ -12,8  13,8 @@ Developed and maintained by Nathan Moinvaziri.
 
 ## Branches
 
-| Name | Description |
-|:- |:-|
 |Name|Description|
 |:-|:-|
 |[master](https://github.com/nmoinvaz/minizip/tree/master)|Modern rewrite that includes more advanced features, improvements in code maintainability and readability, and the reduction of duplicate code. Compatibility layer provided for older versions.|
 |[dev](https://github.com/nmoinvaz/minizip/tree/dev)|Latest development code|
 |[1.2](https://github.com/nmoinvaz/minizip/tree/1.2)|Drop-in replacement for zlib's minizip that includes WinZip AES encryption, disk splitting, I/O buffering and some additional fixes.|

diff --git a/minigzip.c b/minigzip.c
@@ -1,5  1,5 @@
 /* minigzip.c
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/minizip.c b/minizip.c
@@ -1,5  1,5 @@
 /* minizip.c
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz.h b/mz.h
@@ -1,5  1,5 @@
 /* mz.h -- Errors codes, zip flags and magic
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri
@@ -15,7  15,7 @@
 /***************************************************************************/
 
 /* MZ_VERSION */
-#define MZ_VERSION                      ("2.9.2")
 #define MZ_VERSION                      ("2.9.3")
 
 /* MZ_ERROR */
 #define MZ_OK                           (0)  /* zlib */

diff --git a/mz_compat.c b/mz_compat.c
@@ -1,5  1,5 @@
 /* mz_compat.c -- Backwards compatible interface for older versions
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_compat.h b/mz_compat.h
@@ -1,5  1,5 @@
 /* mz_compat.h -- Backwards compatible interface for older versions
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_crypt.c b/mz_crypt.c
@@ -1,5  1,5 @@
 /* mz_crypt.c -- Crypto/hash functions
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_crypt.h b/mz_crypt.h
@@ -1,5  1,5 @@
 /* mz_crypt.h -- Crypto/hash functions
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_crypt_apple.c b/mz_crypt_apple.c
@@ -1,5  1,5 @@
 /* mz_crypt_apple.c -- Crypto/hash functions for Apple
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_crypt_brg.c b/mz_crypt_brg.c
@@ -1,5  1,5 @@
 /* mz_crypt_brg.c -- Crypto/hash functions using Brian Gladman's library
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_crypt_openssl.c b/mz_crypt_openssl.c
@@ -1,5  1,5 @@
 /* mz_crypt_openssl.c -- Crypto/hash functions for OpenSSL
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_crypt_win32.c b/mz_crypt_win32.c
@@ -1,5  1,5 @@
 /* mz_crypt_win32.c -- Crypto/hash functions for Windows
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_os.c b/mz_os.c
@@ -1,5  1,5 @@
 /* mz_os.c -- System functions
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_os.h b/mz_os.h
@@ -1,5  1,5 @@
 /* mz_os.h -- System functions
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_os_posix.c b/mz_os_posix.c
@@ -1,5  1,5 @@
 /* mz_os_posix.c -- System functions for posix
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_os_win32.c b/mz_os_win32.c
@@ -1,5  1,5 @@
 /* mz_os_win32.c -- System functions for Windows
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm.c b/mz_strm.c
@@ -1,5  1,5 @@
 /* mz_strm.c -- Stream interface
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm.h b/mz_strm.h
@@ -1,5  1,5 @@
 /* mz_strm.h -- Stream interface
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_buf.c b/mz_strm_buf.c
@@ -1,5  1,5 @@
 /* mz_strm_buf.c -- Stream for buffering reads/writes
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    This version of ioapi is designed to buffer IO.

diff --git a/mz_strm_buf.h b/mz_strm_buf.h
@@ -1,5  1,5 @@
 /* mz_strm_buf.h -- Stream for buffering reads/writes
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    This version of ioapi is designed to buffer IO.

diff --git a/mz_strm_bzip.c b/mz_strm_bzip.c
@@ -1,5  1,5 @@
 /* mz_strm_bzip.c -- Stream for bzip inflate/deflate
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_bzip.h b/mz_strm_bzip.h
@@ -1,5  1,5 @@
 /* mz_strm_bzip.h -- Stream for bzip inflate/deflate
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_libcomp.c b/mz_strm_libcomp.c
@@ -1,5  1,5 @@
 /* mz_strm_libcomp.c -- Stream for apple compression
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_libcomp.h b/mz_strm_libcomp.h
@@ -1,5  1,5 @@
 /* mz_strm_libcomp.h -- Stream for apple compression
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_lzma.c b/mz_strm_lzma.c
@@ -1,5  1,5 @@
 /* mz_strm_lzma.c -- Stream for lzma inflate/deflate
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_lzma.h b/mz_strm_lzma.h
@@ -1,5  1,5 @@
 /* mz_strm_lzma.h -- Stream for lzma inflate/deflate
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_mem.c b/mz_strm_mem.c
@@ -1,5  1,5 @@
 /* mz_strm_mem.c -- Stream for memory access
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    This interface is designed to access memory rather than files.

diff --git a/mz_strm_mem.h b/mz_strm_mem.h
@@ -1,5  1,5 @@
 /* mz_strm_mem.h -- Stream for memory access
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_os.h b/mz_strm_os.h
@@ -1,5  1,5 @@
 /* mz_sstrm_os.h -- Stream for filesystem access
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_os_posix.c b/mz_strm_os_posix.c
@@ -1,5  1,5 @@
 /* mz_strm_posix.c -- Stream for filesystem access for posix/linux
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_os_win32.c b/mz_strm_os_win32.c
@@ -1,5  1,5 @@
 /* mz_strm_win32.c -- Stream for filesystem access for windows
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_pkcrypt.c b/mz_strm_pkcrypt.c
@@ -1,5  1,5 @@
 /* mz_strm_pkcrypt.c -- Code for traditional PKWARE encryption
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_pkcrypt.h b/mz_strm_pkcrypt.h
@@ -1,5  1,5 @@
 /* mz_strm_pkcrypt.h -- Code for traditional PKWARE encryption
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_split.c b/mz_strm_split.c
@@ -1,5  1,5 @@
 /* mz_strm_split.c -- Stream for split files
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_split.h b/mz_strm_split.h
@@ -1,5  1,5 @@
 /* mz_strm_split.h -- Stream for split files
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_wzaes.c b/mz_strm_wzaes.c
@@ -1,5  1,5 @@
 /* mz_strm_wzaes.c -- Stream for WinZip AES encryption
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_wzaes.h b/mz_strm_wzaes.h
@@ -1,5  1,5 @@
 /* mz_strm_wzaes.h -- Stream for WinZIP AES encryption
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_zlib.c b/mz_strm_zlib.c
@@ -1,5  1,5 @@
 /* mz_strm_zlib.c -- Stream for zlib inflate/deflate
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_strm_zlib.h b/mz_strm_zlib.h
@@ -1,5  1,5 @@
 /* mz_strm_zlib.h -- Stream for zlib inflate/deflate
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_zip.c b/mz_zip.c
@@ -1,5  1,5 @@
 /* zip.c -- Zip manipulation
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_zip.h b/mz_zip.h
@@ -1,5  1,5 @@
 /* mz_zip.h -- Zip manipulation
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_zip_rw.c b/mz_zip_rw.c
@@ -1,5  1,5 @@
 /* mz_zip_rw.c -- Zip reader/writer
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/mz_zip_rw.h b/mz_zip_rw.h
@@ -1,5  1,5 @@
 /* mz_zip_rw.h -- Zip reader/writer
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2010-2020 Nathan Moinvaziri

diff --git a/test/fuzz/standalone.c b/test/fuzz/standalone.c
@@ -1,5  1,5 @@
 /* standalone.c - Standalone fuzzer tester
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2018 sebpop

diff --git a/test/fuzz/unzip_fuzzer.c b/test/fuzz/unzip_fuzzer.c
@@ -1,5  1,5 @@
 /* unzip_fuzzer.c - Unzip fuzzer for libFuzzer
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2018 The Chromium Authors

diff --git a/test/fuzz/zip_fuzzer.c b/test/fuzz/zip_fuzzer.c
@@ -1,5  1,5 @@
 /* zip_fuzzer.c - Zip fuzzer for libFuzzer
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2018 The Chromium Authors

diff --git a/test/test.c b/test/test.c
@@ -1,5  1,5 @@
 /* test.c - Test bed area
-   Version 2.9.2, February 12, 2020
    Version 2.9.3, May 21, 2020
    part of the MiniZip project
 
    Copyright (C) 2018-2020 Nathan Moinvaziri
@@ -786,8  786,8 @@ int32_t test_zip_compat_int(zipFile zip, char *filename)
 
     memset(&file_info, 0, sizeof(file_info));
     file_info.dosDate = mz_zip_time_t_to_dos_date(1588561637);
-    
-    err = zipOpenNewFileInZip(zip, filename, &file_info, NULL, 0, NULL, 0, "test local comment", 
 
     err = zipOpenNewFileInZip(zip, filename, &file_info, NULL, 0, NULL, 0, "test local comment",
         Z_DEFLATED, 1);
     if (err != ZIP_OK)
     {
@@ -817,7  817,7 @@ int32_t test_zip_compat(void)
 
 
     zip = zipOpen64("compat.zip", APPEND_STATUS_CREATE);
-    
 
     if (zip == NULL)
     {
         printf("Failed to create test zip file\n");
@@ -962,7  962,7 @@ static int32_t test_unzip_compat_int(unzFile unzip)
             printf("Unexpected local comment value (%s)\n", comment);
             return err;
         }
-        
 
         err = unzGetFilePos(unzip, &file_pos);
         if (err != UNZ_OK)
         {