aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog25
-rw-r--r--LICENSE2
-rw-r--r--Makefile.in4
-rw-r--r--README6
-rw-r--r--compress.c2
-rw-r--r--contrib/delphi/ZLib.pas2
-rw-r--r--contrib/dotzlib/DotZLib/UnitTests.cs2
-rw-r--r--contrib/infback9/inftree9.c6
-rw-r--r--contrib/minizip/MiniZip64_info.txt2
-rw-r--r--contrib/minizip/configure.ac2
-rw-r--r--contrib/minizip/crypt.h5
-rw-r--r--contrib/minizip/ioapi.c2
-rw-r--r--contrib/minizip/ioapi.h2
-rw-r--r--contrib/minizip/iowin32.c3
-rw-r--r--contrib/minizip/iowin32.h3
-rw-r--r--contrib/minizip/miniunz.c3
-rw-r--r--contrib/minizip/minizip.c3
-rw-r--r--contrib/minizip/skipset.h2
-rw-r--r--contrib/minizip/unzip.c3
-rw-r--r--contrib/minizip/unzip.h3
-rw-r--r--contrib/minizip/zip.c3
-rw-r--r--contrib/minizip/zip.h3
-rw-r--r--contrib/nuget/nuget.csproj4
-rw-r--r--contrib/pascal/zlibpas.pas2
-rw-r--r--contrib/puff/pufftest.c3
-rw-r--r--contrib/zlib1-dll/CMakeLists.txt2
-rw-r--r--crc32.c2
-rw-r--r--deflate.c4
-rw-r--r--deflate.h2
-rw-r--r--gzguts.h2
-rw-r--r--gzlib.c2
-rw-r--r--gzread.c2
-rw-r--r--gzwrite.c2
-rw-r--r--infback.c2
-rw-r--r--inffast.c2
-rw-r--r--inflate.c2
-rw-r--r--inftrees.c6
-rw-r--r--inftrees.h2
-rw-r--r--os400/README4002
-rw-r--r--os400/make.sh2
-rw-r--r--os400/zlibfixed.rpgle24
-rw-r--r--os400/zlibfree.rpgle66
-rw-r--r--qnx/package.qpg10
-rw-r--r--test/example.c2
-rw-r--r--test/minigzip.c2
-rw-r--r--treebuild.xml4
-rw-r--r--trees.c2
-rw-r--r--uncompr.c2
-rw-r--r--win32/Makefile.gcc2
-rw-r--r--win32/README-WIN32.txt6
-rw-r--r--win32/zlib1.rc2
-rw-r--r--zconf.h2
-rw-r--r--zconf.h.in2
-rw-r--r--zlib.36
-rw-r--r--zlib.3.pdfbin28251 -> 28222 bytes
-rw-r--r--zlib.h12
-rw-r--r--zlib.map2
-rw-r--r--zutil.c2
-rw-r--r--zutil.h2
60 files changed, 182 insertions, 103 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71615168..e103c409 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.12...3.31)
3project( 3project(
4 zlib 4 zlib
5 LANGUAGES C 5 LANGUAGES C
6 VERSION 1.3.1.2 6 VERSION 1.3.2
7 HOMEPAGE_URL "https://zlib.net/" 7 HOMEPAGE_URL "https://zlib.net/"
8 DESCRIPTION "a general-purpose lossless data-compression library") 8 DESCRIPTION "a general-purpose lossless data-compression library")
9 9
diff --git a/ChangeLog b/ChangeLog
index 0571d81b..312753ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,31 @@
1 1
2 ChangeLog file for zlib 2 ChangeLog file for zlib
3 3
4Changes in 1.3.2 (17 Feb 2026)
5- Continued rewrite of CMake build [Vollstrecker]
6- Various portability improvements
7- Various github workflow additions and improvements
8- Check for negative lengths in crc32_combine functions
9- Copy only the initialized window contents in inflateCopy
10- Prevent the use of insecure functions without an explicit request
11- Add compressBound_z and deflateBound_z functions for large values
12- Use atomics to build inflate fixed tables once
13- Add definition of ZLIB_INSECURE to build tests with c89 and c94
14- Add --undefined option to ./configure for UBSan checker
15- Copy only the initialized deflate state in deflateCopy
16- Zero inflate state on allocation
17- Remove untgz from contrib
18- Add _z versions of the compress and uncompress functions
19- Vectorize the CRC-32 calculation on the s390x
20- Set bit 11 of the zip header flags in minizip if UTF-8
21- Update OS/400 support
22- Add a test to configure to check for a working compiler
23- Check for invalid NULL pointer inputs to zlib operations
24- Add --mandir to ./configure to specify manual directory
25- Add LICENSE.Info-Zip to contrib/minizip
26- Remove vstudio projects in lieu of cmake-generated projects
27- Replace strcpy() with memcpy() in contrib/minizip
28
4Changes in 1.3.1.2 (8 Dec 2025) 29Changes in 1.3.1.2 (8 Dec 2025)
5- Improve portability to RISC OS 30- Improve portability to RISC OS
6- Permit compiling contrib/minizip/unzip.c with decryption 31- Permit compiling contrib/minizip/unzip.c with decryption
diff --git a/LICENSE b/LICENSE
index 61229c39..b7a69d05 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
1Copyright notice: 1Copyright notice:
2 2
3 (C) 1995-2025 Jean-loup Gailly and Mark Adler 3 (C) 1995-2026 Jean-loup Gailly and Mark Adler
4 4
5 This software is provided 'as-is', without any express or implied 5 This software is provided 'as-is', without any express or implied
6 warranty. In no event will the authors be held liable for any damages 6 warranty. In no event will the authors be held liable for any damages
diff --git a/Makefile.in b/Makefile.in
index d1f0b8ea..bee83edf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
1# Makefile for zlib 1# Makefile for zlib
2# Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler 2# Copyright (C) 1995-2026 Jean-loup Gailly, Mark Adler
3# For conditions of distribution and use, see copyright notice in zlib.h 3# For conditions of distribution and use, see copyright notice in zlib.h
4 4
5# To compile and test, type: 5# To compile and test, type:
@@ -31,7 +31,7 @@ VGFMAFLAG=
31 31
32STATICLIB=libz.a 32STATICLIB=libz.a
33SHAREDLIB=libz.so 33SHAREDLIB=libz.so
34SHAREDLIBV=libz.so.1.3.1.2 34SHAREDLIBV=libz.so.1.3.2
35SHAREDLIBM=libz.so.1 35SHAREDLIBM=libz.so.1
36LIBS=$(STATICLIB) $(SHAREDLIBV) 36LIBS=$(STATICLIB) $(SHAREDLIBV)
37 37
diff --git a/README b/README
index 4723b8ef..2b1e6f36 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
1ZLIB DATA COMPRESSION LIBRARY 1ZLIB DATA COMPRESSION LIBRARY
2 2
3zlib 1.3.1.2 is a general purpose data compression library. All the code is 3zlib 1.3.2 is a general purpose data compression library. All the code is
4thread safe (though see the FAQ for caveats). The data format used by the zlib 4thread safe (though see the FAQ for caveats). The data format used by the zlib
5library is described by RFCs (Request for Comments) 1950 to 1952 at 5library is described by RFCs (Request for Comments) 1950 to 1952 at
6https://datatracker.ietf.org/doc/html/rfc1950 (zlib format), rfc1951 (deflate 6https://datatracker.ietf.org/doc/html/rfc1950 (zlib format), rfc1951 (deflate
@@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
31issue of Dr. Dobb's Journal; a copy of the article is available at 31issue of Dr. Dobb's Journal; a copy of the article is available at
32https://zlib.net/nelson/ . 32https://zlib.net/nelson/ .
33 33
34The changes made in version 1.3.1.2 are documented in the file ChangeLog. 34The changes made in version 1.3.2 are documented in the file ChangeLog.
35 35
36Unsupported third party contributions are provided in directory contrib/ . 36Unsupported third party contributions are provided in directory contrib/ .
37 37
@@ -81,7 +81,7 @@ Acknowledgments:
81 81
82Copyright notice: 82Copyright notice:
83 83
84 (C) 1995-2025 Jean-loup Gailly and Mark Adler 84 (C) 1995-2026 Jean-loup Gailly and Mark Adler
85 85
86 This software is provided 'as-is', without any express or implied 86 This software is provided 'as-is', without any express or implied
87 warranty. In no event will the authors be held liable for any damages 87 warranty. In no event will the authors be held liable for any damages
diff --git a/compress.c b/compress.c
index 410d6e50..bd74b948 100644
--- a/compress.c
+++ b/compress.c
@@ -1,5 +1,5 @@
1/* compress.c -- compress a memory buffer 1/* compress.c -- compress a memory buffer
2 * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler 2 * Copyright (C) 1995-2026 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index b167b69c..cda3b09e 100644
--- a/contrib/delphi/ZLib.pas
+++ b/contrib/delphi/ZLib.pas
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
152 const OutBuf: Pointer; BufSize: Integer); 152 const OutBuf: Pointer; BufSize: Integer);
153 153
154const 154const
155 zlib_version = '1.3.1.2'; 155 zlib_version = '1.3.2';
156 156
157type 157type
158 EZlibError = class(Exception); 158 EZlibError = class(Exception);
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index 6b532e25..2714a4b4 100644
--- a/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ namespace DotZLibTests
156 public void Info_Version() 156 public void Info_Version()
157 { 157 {
158 Info info = new Info(); 158 Info info = new Info();
159 Assert.AreEqual("1.3.1.2", Info.Version); 159 Assert.AreEqual("1.3.2", Info.Version);
160 Assert.AreEqual(32, info.SizeOfUInt); 160 Assert.AreEqual(32, info.SizeOfUInt);
161 Assert.AreEqual(32, info.SizeOfULong); 161 Assert.AreEqual(32, info.SizeOfULong);
162 Assert.AreEqual(32, info.SizeOfPointer); 162 Assert.AreEqual(32, info.SizeOfPointer);
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c
index 0f06e0f4..cb96cf87 100644
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -1,5 +1,5 @@
1/* inftree9.c -- generate Huffman trees for efficient decoding 1/* inftree9.c -- generate Huffman trees for efficient decoding
2 * Copyright (C) 1995-2025 Mark Adler 2 * Copyright (C) 1995-2026 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -9,7 +9,7 @@
9#define MAXBITS 15 9#define MAXBITS 15
10 10
11const char inflate9_copyright[] = 11const char inflate9_copyright[] =
12 " inflate9 1.3.1.2 Copyright 1995-2025 Mark Adler "; 12 " inflate9 1.3.2 Copyright 1995-2026 Mark Adler ";
13/* 13/*
14 If you use the zlib library in a product, an acknowledgment is welcome 14 If you use the zlib library in a product, an acknowledgment is welcome
15 in the documentation of your product. If for some reason you cannot 15 in the documentation of your product. If for some reason you cannot
@@ -59,7 +59,7 @@ int inflate_table9(codetype type, unsigned short FAR *lens, unsigned codes,
59 static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 59 static const unsigned short lext[31] = { /* Length codes 257..285 extra */
60 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, 60 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
61 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, 61 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
62 133, 133, 133, 133, 144, 64, 204}; 62 133, 133, 133, 133, 144, 199, 75};
63 static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ 63 static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
64 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 64 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
65 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 65 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
diff --git a/contrib/minizip/MiniZip64_info.txt b/contrib/minizip/MiniZip64_info.txt
index 86487d18..7ca3d05b 100644
--- a/contrib/minizip/MiniZip64_info.txt
+++ b/contrib/minizip/MiniZip64_info.txt
@@ -1,4 +1,4 @@
1MiniZip - Copyright (c) 1998-2010 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson 1MiniZip - Copyright (c) 1998-2026 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson
2 2
3Introduction 3Introduction
4--------------------- 4---------------------
diff --git a/contrib/minizip/configure.ac b/contrib/minizip/configure.ac
index 339d6dc0..b739fa0c 100644
--- a/contrib/minizip/configure.ac
+++ b/contrib/minizip/configure.ac
@@ -1,7 +1,7 @@
1# -*- Autoconf -*- 1# -*- Autoconf -*-
2# Process this file with autoconf to produce a configure script. 2# Process this file with autoconf to produce a configure script.
3 3
4AC_INIT([minizip], [1.3.1.2], [bugzilla.redhat.com]) 4AC_INIT([minizip], [1.3.2], [bugzilla.redhat.com])
5AC_CONFIG_SRCDIR([minizip.c]) 5AC_CONFIG_SRCDIR([minizip.c])
6AM_INIT_AUTOMAKE([foreign]) 6AM_INIT_AUTOMAKE([foreign])
7LT_INIT 7LT_INIT
diff --git a/contrib/minizip/crypt.h b/contrib/minizip/crypt.h
index d1827c31..dd548938 100644
--- a/contrib/minizip/crypt.h
+++ b/contrib/minizip/crypt.h
@@ -1,9 +1,6 @@
1/* crypt.h -- base code for crypt/uncrypt ZIPfile 1/* crypt.h -- base code for crypt/uncrypt ZIPfile
2 2
3 3 Copyright (C) 1998-2026 Gilles Vollant
4 Version 1.01e, February 12th, 2005
5
6 Copyright (C) 1998-2005 Gilles Vollant
7 4
8 This code is a modified version of crypting code in Infozip distribution 5 This code is a modified version of crypting code in Infozip distribution
9 6
diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c
index 04989887..3ee97516 100644
--- a/contrib/minizip/ioapi.c
+++ b/contrib/minizip/ioapi.c
@@ -1,7 +1,7 @@
1/* ioapi.h -- IO base function header for compress/uncompress .zip 1/* ioapi.h -- IO base function header for compress/uncompress .zip
2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
3 3
4 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
5 5
6 Modifications for Zip64 support 6 Modifications for Zip64 support
7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com ) 7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com )
diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h
index 569857fc..a5211239 100644
--- a/contrib/minizip/ioapi.h
+++ b/contrib/minizip/ioapi.h
@@ -1,7 +1,7 @@
1/* ioapi.h -- IO base function header for compress/uncompress .zip 1/* ioapi.h -- IO base function header for compress/uncompress .zip
2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
3 3
4 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
5 5
6 Modifications for Zip64 support 6 Modifications for Zip64 support
7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com ) 7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com )
diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c
index abd51535..810ab2cc 100644
--- a/contrib/minizip/iowin32.c
+++ b/contrib/minizip/iowin32.c
@@ -1,8 +1,7 @@
1/* iowin32.c -- IO base function header for compress/uncompress .zip 1/* iowin32.c -- IO base function header for compress/uncompress .zip
2 Version 1.1, February 14h, 2010
3 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
4 3
5 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
6 5
7 Modifications for Zip64 support 6 Modifications for Zip64 support
8 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com ) 7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com )
diff --git a/contrib/minizip/iowin32.h b/contrib/minizip/iowin32.h
index 345ac93a..65be6270 100644
--- a/contrib/minizip/iowin32.h
+++ b/contrib/minizip/iowin32.h
@@ -1,8 +1,7 @@
1/* iowin32.h -- IO base function header for compress/uncompress .zip 1/* iowin32.h -- IO base function header for compress/uncompress .zip
2 Version 1.1, February 14h, 2010
3 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
4 3
5 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
6 5
7 Modifications for Zip64 support 6 Modifications for Zip64 support
8 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com ) 7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com )
diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c
index 8aa788f1..cd577ea0 100644
--- a/contrib/minizip/miniunz.c
+++ b/contrib/minizip/miniunz.c
@@ -1,9 +1,8 @@
1/* 1/*
2 miniunz.c 2 miniunz.c
3 Version 1.1, February 14h, 2010
4 sample part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 3 sample part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
5 4
6 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 5 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
7 6
8 Modifications of Unzip for Zip64 7 Modifications of Unzip for Zip64
9 Copyright (C) 2007-2008 Even Rouault 8 Copyright (C) 2007-2008 Even Rouault
diff --git a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c
index 46a6d798..f68bea1d 100644
--- a/contrib/minizip/minizip.c
+++ b/contrib/minizip/minizip.c
@@ -1,9 +1,8 @@
1/* 1/*
2 minizip.c 2 minizip.c
3 Version 1.1, February 14h, 2010
4 sample part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 3 sample part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
5 4
6 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 5 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
7 6
8 Modifications of Unzip for Zip64 7 Modifications of Unzip for Zip64
9 Copyright (C) 2007-2008 Even Rouault 8 Copyright (C) 2007-2008 Even Rouault
diff --git a/contrib/minizip/skipset.h b/contrib/minizip/skipset.h
index 9bef1850..ec4d4ab4 100644
--- a/contrib/minizip/skipset.h
+++ b/contrib/minizip/skipset.h
@@ -1,5 +1,5 @@
1/* skipset.h -- set operations using a skiplist 1/* skipset.h -- set operations using a skiplist
2// Copyright (C) 2024 Mark Adler 2// Copyright (C) 2024-2026 Mark Adler
3// See MiniZip_info.txt for the license. 3// See MiniZip_info.txt for the license.
4 4
5// This implements a skiplist set, i.e. just keys, no data, with ~O(log n) time 5// This implements a skiplist set, i.e. just keys, no data, with ~O(log n) time
diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
index 44c51bd3..d7ff21cb 100644
--- a/contrib/minizip/unzip.c
+++ b/contrib/minizip/unzip.c
@@ -1,8 +1,7 @@
1/* unzip.c -- IO for uncompress .zip files using zlib 1/* unzip.c -- IO for uncompress .zip files using zlib
2 Version 1.1, February 14h, 2010
3 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
4 3
5 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
6 5
7 Modifications of Unzip for Zip64 6 Modifications of Unzip for Zip64
8 Copyright (C) 2007-2008 Even Rouault 7 Copyright (C) 2007-2008 Even Rouault
diff --git a/contrib/minizip/unzip.h b/contrib/minizip/unzip.h
index a3f18949..9c98b608 100644
--- a/contrib/minizip/unzip.h
+++ b/contrib/minizip/unzip.h
@@ -1,8 +1,7 @@
1/* unzip.h -- IO for uncompress .zip files using zlib 1/* unzip.h -- IO for uncompress .zip files using zlib
2 Version 1.1, February 14h, 2010
3 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
4 3
5 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
6 5
7 Modifications of Unzip for Zip64 6 Modifications of Unzip for Zip64
8 Copyright (C) 2007-2008 Even Rouault 7 Copyright (C) 2007-2008 Even Rouault
diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c
index 0ec6fe1b..31005c51 100644
--- a/contrib/minizip/zip.c
+++ b/contrib/minizip/zip.c
@@ -1,8 +1,7 @@
1/* zip.c -- IO on .zip files using zlib 1/* zip.c -- IO on .zip files using zlib
2 Version 1.1, February 14h, 2010
3 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
4 3
5 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
6 5
7 Modifications for Zip64 support 6 Modifications for Zip64 support
8 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com ) 7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com )
diff --git a/contrib/minizip/zip.h b/contrib/minizip/zip.h
index 522c6c74..99624407 100644
--- a/contrib/minizip/zip.h
+++ b/contrib/minizip/zip.h
@@ -1,8 +1,7 @@
1/* zip.h -- IO on .zip files using zlib 1/* zip.h -- IO on .zip files using zlib
2 Version 1.1, February 14h, 2010
3 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html ) 2 part of the MiniZip project - ( https://www.winimage.com/zLibDll/minizip.html )
4 3
5 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html ) 4 Copyright (C) 1998-2026 Gilles Vollant (minizip) ( https://www.winimage.com/zLibDll/minizip.html )
6 5
7 Modifications for Zip64 support 6 Modifications for Zip64 support
8 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com ) 7 Copyright (C) 2009-2010 Mathias Svensson ( https://result42.com )
diff --git a/contrib/nuget/nuget.csproj b/contrib/nuget/nuget.csproj
index 06391345..ead9a205 100644
--- a/contrib/nuget/nuget.csproj
+++ b/contrib/nuget/nuget.csproj
@@ -6,8 +6,8 @@
6 <PackageId Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(PackageId).win</PackageId> 6 <PackageId Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(PackageId).win</PackageId>
7 <PackageId Condition="$([MSBuild]::IsOSPlatform('Linux'))">$(PackageId).linux</PackageId> 7 <PackageId Condition="$([MSBuild]::IsOSPlatform('Linux'))">$(PackageId).linux</PackageId>
8 <PackageId Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(PackageId).osx</PackageId> 8 <PackageId Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(PackageId).osx</PackageId>
9 <Copyright>(C) 1995-2025 Jean-loup Gailly and Mark Adler</Copyright> 9 <Copyright>(C) 1995-2026 Jean-loup Gailly and Mark Adler</Copyright>
10 <version>1.3.1.2</version> 10 <version>1.3.2</version>
11 <PackageDescription>NuGet Package for consuming native builds of zlib into .NET without complexity.</PackageDescription> 11 <PackageDescription>NuGet Package for consuming native builds of zlib into .NET without complexity.</PackageDescription>
12 <PackageReadmeFile>README</PackageReadmeFile> 12 <PackageReadmeFile>README</PackageReadmeFile>
13 <!-- 13 <!--
diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas
index 8715da8c..603ff82e 100644
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,7 +10,7 @@ unit zlibpas;
10interface 10interface
11 11
12const 12const
13 ZLIB_VERSION = '1.3.1.2'; 13 ZLIB_VERSION = '1.3.2';
14 ZLIB_VERNUM = $12a0; 14 ZLIB_VERNUM = $12a0;
15 15
16type 16type
diff --git a/contrib/puff/pufftest.c b/contrib/puff/pufftest.c
index 6cad56ff..b022992a 100644
--- a/contrib/puff/pufftest.c
+++ b/contrib/puff/pufftest.c
@@ -1,8 +1,7 @@
1/* 1/*
2 * pufftest.c 2 * pufftest.c
3 * Copyright (C) 2002-2013 Mark Adler 3 * Copyright (C) 2002-2026 Mark Adler
4 * For conditions of distribution and use, see copyright notice in puff.h 4 * For conditions of distribution and use, see copyright notice in puff.h
5 * version 2.3, 21 Jan 2013
6 */ 5 */
7 6
8/* Example of how to use puff(). 7/* Example of how to use puff().
diff --git a/contrib/zlib1-dll/CMakeLists.txt b/contrib/zlib1-dll/CMakeLists.txt
index c9825aa0..86625123 100644
--- a/contrib/zlib1-dll/CMakeLists.txt
+++ b/contrib/zlib1-dll/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.12...3.31)
3project( 3project(
4 zlib1-dll 4 zlib1-dll
5 LANGUAGES C 5 LANGUAGES C
6 VERSION 1.3.1.2 6 VERSION 1.3.2
7 HOMEPAGE_URL "https://zlib.net/" 7 HOMEPAGE_URL "https://zlib.net/"
8 DESCRIPTION "zlib1.dll is the legacy DLL with zlib and minizip") 8 DESCRIPTION "zlib1.dll is the legacy DLL with zlib and minizip")
9 9
diff --git a/crc32.c b/crc32.c
index 97eb5fda..d9ade515 100644
--- a/crc32.c
+++ b/crc32.c
@@ -1,5 +1,5 @@
1/* crc32.c -- compute the CRC-32 of a data stream 1/* crc32.c -- compute the CRC-32 of a data stream
2 * Copyright (C) 1995-2022 Mark Adler 2 * Copyright (C) 1995-2026 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 * 4 *
5 * This interleaved implementation of a CRC makes use of pipelined multiple 5 * This interleaved implementation of a CRC makes use of pipelined multiple
diff --git a/deflate.c b/deflate.c
index 96c48dd4..d7d2c7c1 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1,5 +1,5 @@
1/* deflate.c -- compress data using the deflation algorithm 1/* deflate.c -- compress data using the deflation algorithm
2 * Copyright (C) 1995-2025 Jean-loup Gailly and Mark Adler 2 * Copyright (C) 1995-2026 Jean-loup Gailly and Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -52,7 +52,7 @@
52#include "deflate.h" 52#include "deflate.h"
53 53
54const char deflate_copyright[] = 54const char deflate_copyright[] =
55 " deflate 1.3.1.2 Copyright 1995-2025 Jean-loup Gailly and Mark Adler "; 55 " deflate 1.3.2 Copyright 1995-2026 Jean-loup Gailly and Mark Adler ";
56/* 56/*
57 If you use the zlib library in a product, an acknowledgment is welcome 57 If you use the zlib library in a product, an acknowledgment is welcome
58 in the documentation of your product. If for some reason you cannot 58 in the documentation of your product. If for some reason you cannot
diff --git a/deflate.h b/deflate.h
index 15c015e9..0732ba83 100644
--- a/deflate.h
+++ b/deflate.h
@@ -1,5 +1,5 @@
1/* deflate.h -- internal compression state 1/* deflate.h -- internal compression state
2 * Copyright (C) 1995-2024 Jean-loup Gailly 2 * Copyright (C) 1995-2026 Jean-loup Gailly
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/gzguts.h b/gzguts.h
index c3d473ac..266305de 100644
--- a/gzguts.h
+++ b/gzguts.h
@@ -1,5 +1,5 @@
1/* gzguts.h -- zlib internal header definitions for gz* operations 1/* gzguts.h -- zlib internal header definitions for gz* operations
2 * Copyright (C) 2004-2025 Mark Adler 2 * Copyright (C) 2004-2026 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/gzlib.c b/gzlib.c
index 934688c5..7a37a96c 100644
--- a/gzlib.c
+++ b/gzlib.c
@@ -1,5 +1,5 @@
1/* gzlib.c -- zlib functions common to reading and writing gzip files 1/* gzlib.c -- zlib functions common to reading and writing gzip files
2 * Copyright (C) 2004-2025 Mark Adler 2 * Copyright (C) 2004-2026 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/gzread.c b/gzread.c
index bbabf522..8b3e369d 100644
--- a/gzread.c
+++ b/gzread.c
@@ -1,5 +1,5 @@
1/* gzread.c -- zlib functions for reading gzip files 1/* gzread.c -- zlib functions for reading gzip files
2 * Copyright (C) 2004-2025 Mark Adler 2 * Copyright (C) 2004-2026 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/gzwrite.c b/gzwrite.c
index 18c820e2..13a3700a 100644
--- a/gzwrite.c
+++ b/gzwrite.c
@@ -1,5 +1,5 @@
1/* gzwrite.c -- zlib functions for writing gzip files 1/* gzwrite.c -- zlib functions for writing gzip files
2 * Copyright (C) 2004-2025 Mark Adler 2 * Copyright (C) 2004-2026 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/infback.c b/infback.c
index 8cb7654c..e6443feb 100644
--- a/infback.c
+++ b/infback.c
@@ -1,5 +1,5 @@
1/* infback.c -- inflate using a call-back interface 1/* infback.c -- inflate using a call-back interface
2 * Copyright (C) 1995-2025 Mark Adler 2 * Copyright (C) 1995-2026 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/inffast.c b/inffast.c
index 818886f6..d1657f3f 100644
--- a/inffast.c
+++ b/inffast.c
@@ -1,5 +1,5 @@
1/* inffast.c -- fast decoding 1/* inffast.c -- fast decoding
2 * Copyright (C) 1995-2025 Mark Adler 2 * Copyright (C) 1995-2026 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/inflate.c b/inflate.c
index 91c01f99..5f5d4922 100644
--- a/inflate.c
+++ b/inflate.c
@@ -1,5 +1,5 @@
1/* inflate.c -- zlib decompression 1/* inflate.c -- zlib decompression
2 * Copyright (C) 1995-2025 Mark Adler 2 * Copyright (C) 1995-2026 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/inftrees.c b/inftrees.c
index 8dc0d088..dcbc64e0 100644
--- a/inftrees.c
+++ b/inftrees.c
@@ -1,5 +1,5 @@
1/* inftrees.c -- generate Huffman trees for efficient decoding 1/* inftrees.c -- generate Huffman trees for efficient decoding
2 * Copyright (C) 1995-2025 Mark Adler 2 * Copyright (C) 1995-2026 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -23,7 +23,7 @@
23#define MAXBITS 15 23#define MAXBITS 15
24 24
25const char inflate_copyright[] = 25const char inflate_copyright[] =
26 " inflate 1.3.1.2 Copyright 1995-2025 Mark Adler "; 26 " inflate 1.3.2 Copyright 1995-2026 Mark Adler ";
27/* 27/*
28 If you use the zlib library in a product, an acknowledgment is welcome 28 If you use the zlib library in a product, an acknowledgment is welcome
29 in the documentation of your product. If for some reason you cannot 29 in the documentation of your product. If for some reason you cannot
@@ -71,7 +71,7 @@ int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR *lens,
71 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; 71 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
72 static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 72 static const unsigned short lext[31] = { /* Length codes 257..285 extra */
73 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 73 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
74 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 64, 204}; 74 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 199, 75};
75 static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ 75 static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
76 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 76 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
77 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 77 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/inftrees.h b/inftrees.h
index 00ec96ec..84d05369 100644
--- a/inftrees.h
+++ b/inftrees.h
@@ -1,5 +1,5 @@
1/* inftrees.h -- header to use inftrees.c 1/* inftrees.h -- header to use inftrees.c
2 * Copyright (C) 1995-2005, 2010 Mark Adler 2 * Copyright (C) 1995-2026 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/os400/README400 b/os400/README400
index 2cfe7a3c..9314a687 100644
--- a/os400/README400
+++ b/os400/README400
@@ -1,4 +1,4 @@
1 ZLIB version 1.3.1.2 for OS/400 installation instructions 1 ZLIB version 1.3.2 for OS/400 installation instructions
2 2
31) Download and unpack the zlib tarball to some IFS directory. 31) Download and unpack the zlib tarball to some IFS directory.
4 (i.e.: /path/to/the/zlib/ifs/source/directory) 4 (i.e.: /path/to/the/zlib/ifs/source/directory)
diff --git a/os400/make.sh b/os400/make.sh
index e9643f52..43915796 100644
--- a/os400/make.sh
+++ b/os400/make.sh
@@ -276,7 +276,7 @@ fi
276echo '#pragma comment(user, "ZLIB version '"${VERSION}"'")' > os400.c 276echo '#pragma comment(user, "ZLIB version '"${VERSION}"'")' > os400.c
277echo '#pragma comment(user, __DATE__)' >> os400.c 277echo '#pragma comment(user, __DATE__)' >> os400.c
278echo '#pragma comment(user, __TIME__)' >> os400.c 278echo '#pragma comment(user, __TIME__)' >> os400.c
279echo '#pragma comment(copyright, "Copyright (C) 1995-2017 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c 279echo '#pragma comment(copyright, "Copyright (C) 1995-2026 Jean-Loup Gailly, Mark Adler. OS/400 version by P. Monnerat.")' >> os400.c
280make_module OS400 os400.c 280make_module OS400 os400.c
281LINK= # No need to rebuild service program yet. 281LINK= # No need to rebuild service program yet.
282MODULES= 282MODULES=
diff --git a/os400/zlibfixed.rpgle b/os400/zlibfixed.rpgle
index b2e3e093..75060f30 100644
--- a/os400/zlibfixed.rpgle
+++ b/os400/zlibfixed.rpgle
@@ -1,7 +1,7 @@
1 * ZLIB.INC - Interface to the general purpose compression library 1 * ZLIB.INC - Interface to the general purpose compression library
2 * 2 *
3 * ILE RPG400 version by Patrick Monnerat, DATASPHERE. 3 * ILE RPG400 version by Patrick Monnerat, DATASPHERE.
4 * Version 1.3.1.2 4 * Version 1.3.2
5 * 5 *
6 * 6 *
7 * WARNING: 7 * WARNING:
@@ -22,14 +22,14 @@
22 * 22 *
23 * Versioning information. 23 * Versioning information.
24 * 24 *
25 D ZLIB_VERSION C '1.3.1.2' 25 D ZLIB_VERSION C '1.3.2'
26 D ZLIB_VERNUM C X'12a0' 26 D ZLIB_VERNUM C X'1320'
27 D ZLIB_VER_MAJOR C 1 27 D ZLIB_VER_MAJOR C 1
28 D ZLIB_VER_MINOR C 3 28 D ZLIB_VER_MINOR C 3
29 D ZLIB_VER_REVISION... 29 D ZLIB_VER_REVISION...
30 D C 1
31 D ZLIB_VER_SUBREVISION...
32 D C 2 30 D C 2
31 D ZLIB_VER_SUBREVISION...
32 D C 0
33 * 33 *
34 * Other equates. 34 * Other equates.
35 * 35 *
@@ -535,6 +535,20 @@
535 D buf 65535 const options(*varsize) Bytes to accumulate 535 D buf 65535 const options(*varsize) Bytes to accumulate
536 D len 20U 0 value Buffer length 536 D len 20U 0 value Buffer length
537 * 537 *
538 D crc32_combine_gen...
539 D PR 10U 0 extproc('crc32_combine_gen') Operator
540 D len2 20U 0 value Buffer length
541 *
542 D crc32_combine_gen64...
543 D PR 10U 0 extproc('crc32_combine_gen64') Operator
544 D len2 20U 0 value Buffer length
545 *
546 D crc32_combine_op...
547 D PR 10U 0 extproc('crc32_combine_op') New Checksum
548 D crc1 10U 0 value Old checksum
549 D crc2 10U 0 value Old checksum
550 D op 10U 0 value Operator
551 *
538 ************************************************************************** 552 **************************************************************************
539 * Miscellaneous function prototypes 553 * Miscellaneous function prototypes
540 ************************************************************************** 554 **************************************************************************
diff --git a/os400/zlibfree.rpgle b/os400/zlibfree.rpgle
index 5ae31baf..b35c4680 100644
--- a/os400/zlibfree.rpgle
+++ b/os400/zlibfree.rpgle
@@ -2,7 +2,7 @@
2// ZLIB.INC - Interface to the general purpose compression library 2// ZLIB.INC - Interface to the general purpose compression library
3 3
4// ILE RPG400 version by Patrick Monnerat, DATASPHERE. 4// ILE RPG400 version by Patrick Monnerat, DATASPHERE.
5// Version 1.3.1.1 5// Version 1.3.2
6 6
7 7
8// WARNING: 8// WARNING:
@@ -23,12 +23,12 @@
23 23
24// Versioning information. 24// Versioning information.
25 25
26Dcl-C ZLIB_VERSION '1.3.1.1'; 26Dcl-C ZLIB_VERSION '1.3.2';
27Dcl-C ZLIB_VERNUM X'12A0'; 27Dcl-C ZLIB_VERNUM X'1320';
28Dcl-C ZLIB_VER_MAJOR 1; 28Dcl-C ZLIB_VER_MAJOR 1;
29Dcl-C ZLIB_VER_MINOR 3; 29Dcl-C ZLIB_VER_MINOR 3;
30Dcl-C ZLIB_VER_REVISION 1; 30Dcl-C ZLIB_VER_REVISION 2;
31Dcl-C ZLIB_VER_SUBREVISION 1; 31Dcl-C ZLIB_VER_SUBREVISION 0;
32 32
33// Other equates. 33// Other equates.
34 34
@@ -113,6 +113,13 @@ Dcl-Pr compress Int(10) Extproc('compress');
113 sourceLen Uns(10) Value; // Source length 113 sourceLen Uns(10) Value; // Source length
114End-Pr; 114End-Pr;
115 115
116Dcl-Pr compress_z Int(10) Extproc('compress_z');
117 dest Char(65535) Options(*VARSIZE); // Destination buffer
118 destLen Uns(20); // Destination length
119 source Char(65535) Const Options(*VARSIZE); // Source buffer
120 sourceLen Uns(20) Value; // Source length
121End-Pr;
122
116Dcl-Pr compress2 Int(10) Extproc('compress2'); 123Dcl-Pr compress2 Int(10) Extproc('compress2');
117 dest Char(65535) Options(*VARSIZE); // Destination buffer 124 dest Char(65535) Options(*VARSIZE); // Destination buffer
118 destLen Uns(10); // Destination length 125 destLen Uns(10); // Destination length
@@ -121,10 +128,22 @@ Dcl-Pr compress2 Int(10) Extproc('compress2');
121 level Int(10) Value; // Compression level 128 level Int(10) Value; // Compression level
122End-Pr; 129End-Pr;
123 130
131Dcl-Pr compress2_z Int(10) Extproc('compress2_z');
132 dest Char(65535) Options(*VARSIZE); // Destination buffer
133 destLen Uns(20); // Destination length
134 source Char(65535) Const Options(*VARSIZE); // Source buffer
135 sourceLen Uns(20) Value; // Source length
136 level Int(10) Value; // Compression level
137End-Pr;
138
124Dcl-Pr compressBound Uns(10) Extproc('compressBound'); 139Dcl-Pr compressBound Uns(10) Extproc('compressBound');
125 sourceLen Uns(10) Value; 140 sourceLen Uns(10) Value;
126End-Pr; 141End-Pr;
127 142
143Dcl-Pr compressBound_z Uns(10) Extproc('compressBound_z');
144 sourceLen Uns(20) Value;
145End-Pr;
146
128Dcl-Pr uncompress Int(10) Extproc('uncompress'); 147Dcl-Pr uncompress Int(10) Extproc('uncompress');
129 dest Char(65535) Options(*VARSIZE); // Destination buffer 148 dest Char(65535) Options(*VARSIZE); // Destination buffer
130 destLen Uns(10); // Destination length 149 destLen Uns(10); // Destination length
@@ -132,6 +151,13 @@ Dcl-Pr uncompress Int(10) Extproc('uncompress');
132 sourceLen Uns(10) Value; // Source length 151 sourceLen Uns(10) Value; // Source length
133End-Pr; 152End-Pr;
134 153
154Dcl-Pr uncompress_z Int(10) Extproc('uncompress_z');
155 dest Char(65535) Options(*VARSIZE); // Destination buffer
156 destLen Uns(20); // Destination length
157 source Char(65535) Const Options(*VARSIZE); // Source buffer
158 sourceLen Uns(20) Value; // Source length
159End-Pr;
160
135Dcl-Pr uncompress2 Int(10) Extproc('uncompress2'); 161Dcl-Pr uncompress2 Int(10) Extproc('uncompress2');
136 dest Char(65535) Options(*VARSIZE); // Destination buffer 162 dest Char(65535) Options(*VARSIZE); // Destination buffer
137 destLen Uns(10); // Destination length 163 destLen Uns(10); // Destination length
@@ -139,6 +165,13 @@ Dcl-Pr uncompress2 Int(10) Extproc('uncompress2');
139 sourceLen Uns(10); // Source length 165 sourceLen Uns(10); // Source length
140End-Pr; 166End-Pr;
141 167
168Dcl-Pr uncompress2_z Int(10) Extproc('uncompress2_z');
169 dest Char(65535) Options(*VARSIZE); // Destination buffer
170 destLen Uns(20); // Destination length
171 source Char(65535) Const Options(*VARSIZE); // Source buffer
172 sourceLen Uns(20); // Source length
173End-Pr;
174
142/if not defined(LARGE_FILES) 175/if not defined(LARGE_FILES)
143 Dcl-Pr gzopen Extproc('gzopen') Like(gzFile); 176 Dcl-Pr gzopen Extproc('gzopen') Like(gzFile);
144 path Pointer Value Options(*STRING); // File pathname 177 path Pointer Value Options(*STRING); // File pathname
@@ -397,7 +430,12 @@ End-Pr;
397 430
398Dcl-Pr deflateBound Uns(10) Extproc('deflateBound'); // Change level & strat 431Dcl-Pr deflateBound Uns(10) Extproc('deflateBound'); // Change level & strat
399 strm Like(z_stream); // Compression stream 432 strm Like(z_stream); // Compression stream
400 sourcelen Uns(10) Value; // Compression level 433 sourcelen Uns(10) Value; // Source length
434End-Pr;
435
436Dcl-Pr deflateBound_z Uns(10) Extproc('deflateBound_z'); // Change level & strat
437 strm Like(z_stream); // Compression stream
438 sourcelen Uns(20) Value; // Source length
401End-Pr; 439End-Pr;
402 440
403Dcl-Pr deflatePending Int(10) Extproc('deflatePending'); // Change level & strat 441Dcl-Pr deflatePending Int(10) Extproc('deflatePending'); // Change level & strat
@@ -542,7 +580,7 @@ End-Pr;
542Dcl-Pr crc32_combine Uns(10) Extproc('crc32_combine'); // New checksum 580Dcl-Pr crc32_combine Uns(10) Extproc('crc32_combine'); // New checksum
543 crc1 Uns(10) Value; // Old checksum 581 crc1 Uns(10) Value; // Old checksum
544 crc2 Uns(10) Value; // Old checksum 582 crc2 Uns(10) Value; // Old checksum
545 len2 Uns(20) Value; // Buffer length 583 len2 Uns(20) Value; // 2nd Buffer length
546End-Pr; 584End-Pr;
547 585
548Dcl-Pr crc32_z Uns(10) Extproc('crc32_z'); // New checksum 586Dcl-Pr crc32_z Uns(10) Extproc('crc32_z'); // New checksum
@@ -551,6 +589,20 @@ Dcl-Pr crc32_z Uns(10) Extproc('crc32_z'); // New checksum
551 len Uns(20) Value; // Buffer length 589 len Uns(20) Value; // Buffer length
552End-Pr; 590End-Pr;
553 591
592Dcl-Pr crc32_combine_gen Uns(10) Extproc('crc32_combine_gen');
593 len Uns(20) Value; // 2nd Buffer length
594End-Pr;
595
596Dcl-Pr crc32_combine_gen64 Uns(10) Extproc('crc32_combine_gen64');
597 len Uns(20) Value; // 2nd Buffer length
598End-Pr;
599
600Dcl-Pr crc32_combine_op Uns(10) Extproc('crc32_combine_op'); // New checksum
601 crc1 Uns(10) Value; // Old checksum
602 crc2 Uns(10) Value; // Old checksum
603 op Uns(10) Value; // Operator
604End-Pr;
605
554//************************************************************************* 606//*************************************************************************
555// Miscellaneous function prototypes 607// Miscellaneous function prototypes
556//************************************************************************* 608//*************************************************************************
diff --git a/qnx/package.qpg b/qnx/package.qpg
index b86609ab..82d65f4b 100644
--- a/qnx/package.qpg
+++ b/qnx/package.qpg
@@ -25,10 +25,10 @@
25 <QPG:Files> 25 <QPG:Files>
26 <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/> 26 <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
27 <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/> 27 <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
28 <QPG:Add file="../libz.so.1.3.1.2" install="/opt/lib/" user="root:bin" permission="644"/> 28 <QPG:Add file="../libz.so.1.3.2" install="/opt/lib/" user="root:bin" permission="644"/>
29 <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.3.1.2"/> 29 <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.3.2"/>
30 <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.3.1.2"/> 30 <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.3.2"/>
31 <QPG:Add file="../libz.so.1.3.1.2" install="/opt/lib/" component="slib"/> 31 <QPG:Add file="../libz.so.1.3.2" install="/opt/lib/" component="slib"/>
32 </QPG:Files> 32 </QPG:Files>
33 33
34 <QPG:PackageFilter> 34 <QPG:PackageFilter>
@@ -63,7 +63,7 @@
63 </QPM:ProductDescription> 63 </QPM:ProductDescription>
64 64
65 <QPM:ReleaseDescription> 65 <QPM:ReleaseDescription>
66 <QPM:ReleaseVersion>1.3.1.2</QPM:ReleaseVersion> 66 <QPM:ReleaseVersion>1.3.2</QPM:ReleaseVersion>
67 <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency> 67 <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
68 <QPM:ReleaseStability>Stable</QPM:ReleaseStability> 68 <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
69 <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor> 69 <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
diff --git a/test/example.c b/test/example.c
index f517bb66..9cc5f763 100644
--- a/test/example.c
+++ b/test/example.c
@@ -1,5 +1,5 @@
1/* example.c -- usage example of the zlib compression library 1/* example.c -- usage example of the zlib compression library
2 * Copyright (C) 1995-2006, 2011, 2016 Jean-loup Gailly 2 * Copyright (C) 1995-2026 Jean-loup Gailly
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/test/minigzip.c b/test/minigzip.c
index fb0ef161..40da8736 100644
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -1,5 +1,5 @@
1/* minigzip.c -- simulate gzip using the zlib compression library 1/* minigzip.c -- simulate gzip using the zlib compression library
2 * Copyright (C) 1995-2006, 2010, 2011, 2016 Jean-loup Gailly 2 * Copyright (C) 1995-2026 Jean-loup Gailly
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/treebuild.xml b/treebuild.xml
index 3624680b..cd7d7a58 100644
--- a/treebuild.xml
+++ b/treebuild.xml
@@ -1,6 +1,6 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<package name="zlib" version="1.3.1.2"> 2<package name="zlib" version="1.3.2">
3 <library name="zlib" dlversion="1.3.1.2" dlname="z"> 3 <library name="zlib" dlversion="1.3.2" dlname="z">
4 <property name="description"> zip compression library </property> 4 <property name="description"> zip compression library </property>
5 <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" /> 5 <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
6 6
diff --git a/trees.c b/trees.c
index e5524367..8e4da01e 100644
--- a/trees.c
+++ b/trees.c
@@ -1,5 +1,5 @@
1/* trees.c -- output deflated data using Huffman coding 1/* trees.c -- output deflated data using Huffman coding
2 * Copyright (C) 1995-2024 Jean-loup Gailly 2 * Copyright (C) 1995-2026 Jean-loup Gailly
3 * detect_data_type() function provided freely by Cosmin Truta, 2006 3 * detect_data_type() function provided freely by Cosmin Truta, 2006
4 * For conditions of distribution and use, see copyright notice in zlib.h 4 * For conditions of distribution and use, see copyright notice in zlib.h
5 */ 5 */
diff --git a/uncompr.c b/uncompr.c
index 14ef96ce..2195e785 100644
--- a/uncompr.c
+++ b/uncompr.c
@@ -1,5 +1,5 @@
1/* uncompr.c -- decompress a memory buffer 1/* uncompr.c -- decompress a memory buffer
2 * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler 2 * Copyright (C) 1995-2026 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc
index 2fc69324..d1cdb9a1 100644
--- a/win32/Makefile.gcc
+++ b/win32/Makefile.gcc
@@ -4,7 +4,7 @@
4# Last updated: Mar 2012. 4# Last updated: Mar 2012.
5# Tested under Cygwin and MinGW. 5# Tested under Cygwin and MinGW.
6 6
7# Copyright (C) 1995-2003 Jean-loup Gailly. 7# Copyright (C) 1995-2026 Jean-loup Gailly.
8# For conditions of distribution and use, see copyright notice in zlib.h 8# For conditions of distribution and use, see copyright notice in zlib.h
9 9
10# To compile, or to compile and test, type from the top level zlib directory: 10# To compile, or to compile and test, type from the top level zlib directory:
diff --git a/win32/README-WIN32.txt b/win32/README-WIN32.txt
index 79d2822e..48c9120a 100644
--- a/win32/README-WIN32.txt
+++ b/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
1ZLIB DATA COMPRESSION LIBRARY 1ZLIB DATA COMPRESSION LIBRARY
2 2
3zlib 1.3.1.2 is a general purpose data compression library. All the code is 3zlib 1.3.2 is a general purpose data compression library. All the code is
4thread safe. The data format used by the zlib library is described by RFCs 4thread safe. The data format used by the zlib library is described by RFCs
5(Request for Comments) 1950 to 1952 in the files 5(Request for Comments) 1950 to 1952 in the files
6https://datatracker.ietf.org/doc/html/rfc1951 (zlib format), rfc1951.txt 6https://datatracker.ietf.org/doc/html/rfc1951 (zlib format), rfc1951.txt
@@ -22,7 +22,7 @@ asking for help.
22 22
23Manifest: 23Manifest:
24 24
25The package zlib-1.3.1.2-win32-x86.zip will contain the following files: 25The package zlib-1.3.2-win32-x86.zip will contain the following files:
26 26
27 README-WIN32.txt This document 27 README-WIN32.txt This document
28 ChangeLog Changes since previous zlib packages 28 ChangeLog Changes since previous zlib packages
@@ -72,7 +72,7 @@ are too numerous to cite here.
72 72
73Copyright notice: 73Copyright notice:
74 74
75 (C) 1995-2017 Jean-loup Gailly and Mark Adler 75 (C) 1995-2026 Jean-loup Gailly and Mark Adler
76 76
77 This software is provided 'as-is', without any express or implied 77 This software is provided 'as-is', without any express or implied
78 warranty. In no event will the authors be held liable for any damages 78 warranty. In no event will the authors be held liable for any damages
diff --git a/win32/zlib1.rc b/win32/zlib1.rc
index 66e5b51e..e86ce568 100644
--- a/win32/zlib1.rc
+++ b/win32/zlib1.rc
@@ -23,7 +23,7 @@ BEGIN
23 VALUE "FileDescription", "zlib data compression library\0" 23 VALUE "FileDescription", "zlib data compression library\0"
24 VALUE "FileVersion", ZLIB_VERSION "\0" 24 VALUE "FileVersion", ZLIB_VERSION "\0"
25 VALUE "InternalName", "zlib1.dll\0" 25 VALUE "InternalName", "zlib1.dll\0"
26 VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0" 26 VALUE "LegalCopyright", "(C) 1995-2026 Jean-loup Gailly & Mark Adler\0"
27 VALUE "OriginalFilename", "zlib1.dll\0" 27 VALUE "OriginalFilename", "zlib1.dll\0"
28 VALUE "ProductName", "zlib\0" 28 VALUE "ProductName", "zlib\0"
29 VALUE "ProductVersion", ZLIB_VERSION "\0" 29 VALUE "ProductVersion", ZLIB_VERSION "\0"
diff --git a/zconf.h b/zconf.h
index a7143810..828ca617 100644
--- a/zconf.h
+++ b/zconf.h
@@ -1,5 +1,5 @@
1/* zconf.h -- configuration of the zlib compression library 1/* zconf.h -- configuration of the zlib compression library
2 * Copyright (C) 1995-2025 Jean-loup Gailly, Mark Adler 2 * Copyright (C) 1995-2026 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/zconf.h.in b/zconf.h.in
index a7143810..828ca617 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -1,5 +1,5 @@
1/* zconf.h -- configuration of the zlib compression library 1/* zconf.h -- configuration of the zlib compression library
2 * Copyright (C) 1995-2025 Jean-loup Gailly, Mark Adler 2 * Copyright (C) 1995-2026 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/zlib.3 b/zlib.3
index 5dc8b7cb..70d5f180 100644
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
1.TH ZLIB 3 "8 Dec 2025" 1.TH ZLIB 3 "17 Feb 2026"
2.SH NAME 2.SH NAME
3zlib \- compression/decompression library 3zlib \- compression/decompression library
4.SH SYNOPSIS 4.SH SYNOPSIS
@@ -105,9 +105,9 @@ before asking for help.
105Send questions and/or comments to zlib@gzip.org, 105Send questions and/or comments to zlib@gzip.org,
106or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). 106or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
107.SH AUTHORS AND LICENSE 107.SH AUTHORS AND LICENSE
108Version 1.3.1.2 108Version 1.3.2
109.LP 109.LP
110Copyright (C) 1995-2025 Jean-loup Gailly and Mark Adler 110Copyright (C) 1995-2026 Jean-loup Gailly and Mark Adler
111.LP 111.LP
112This software is provided 'as-is', without any express or implied 112This software is provided 'as-is', without any express or implied
113warranty. In no event will the authors be held liable for any damages 113warranty. In no event will the authors be held liable for any damages
diff --git a/zlib.3.pdf b/zlib.3.pdf
index c4bb1175..0ec7c6ab 100644
--- a/zlib.3.pdf
+++ b/zlib.3.pdf
Binary files differ
diff --git a/zlib.h b/zlib.h
index 8ffc8de8..a57d3361 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1,7 +1,7 @@
1/* zlib.h -- interface of the 'zlib' general purpose compression library 1/* zlib.h -- interface of the 'zlib' general purpose compression library
2 version 1.3.1.2, December 8th, 2025 2 version 1.3.2, February 17th, 2026
3 3
4 Copyright (C) 1995-2025 Jean-loup Gailly and Mark Adler 4 Copyright (C) 1995-2026 Jean-loup Gailly and Mark Adler
5 5
6 This software is provided 'as-is', without any express or implied 6 This software is provided 'as-is', without any express or implied
7 warranty. In no event will the authors be held liable for any damages 7 warranty. In no event will the authors be held liable for any damages
@@ -41,12 +41,12 @@
41extern "C" { 41extern "C" {
42#endif 42#endif
43 43
44#define ZLIB_VERSION "1.3.1.2-audit" 44#define ZLIB_VERSION "1.3.2"
45#define ZLIB_VERNUM 0x1312 45#define ZLIB_VERNUM 0x1320
46#define ZLIB_VER_MAJOR 1 46#define ZLIB_VER_MAJOR 1
47#define ZLIB_VER_MINOR 3 47#define ZLIB_VER_MINOR 3
48#define ZLIB_VER_REVISION 1 48#define ZLIB_VER_REVISION 2
49#define ZLIB_VER_SUBREVISION 2 49#define ZLIB_VER_SUBREVISION 0
50 50
51/* 51/*
52 The 'zlib' compression library provides in-memory compression and 52 The 'zlib' compression library provides in-memory compression and
diff --git a/zlib.map b/zlib.map
index 6c4c0311..7a9100f0 100644
--- a/zlib.map
+++ b/zlib.map
@@ -113,4 +113,4 @@ ZLIB_1.3.2 {
113 uncompress2_z; 113 uncompress2_z;
114 local: 114 local:
115 inflate_fixed; 115 inflate_fixed;
116} ZLIB_1.3.1.2; \ No newline at end of file 116} ZLIB_1.3.1.2;
diff --git a/zutil.c b/zutil.c
index 860faddc..4ea02a9c 100644
--- a/zutil.c
+++ b/zutil.c
@@ -1,5 +1,5 @@
1/* zutil.c -- target dependent utility functions for the compression library 1/* zutil.c -- target dependent utility functions for the compression library
2 * Copyright (C) 1995-2017 Jean-loup Gailly 2 * Copyright (C) 1995-2026 Jean-loup Gailly
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/zutil.h b/zutil.h
index 80f6d85b..a9bc23ca 100644
--- a/zutil.h
+++ b/zutil.h
@@ -1,5 +1,5 @@
1/* zutil.h -- internal interface and configuration of the compression library 1/* zutil.h -- internal interface and configuration of the compression library
2 * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler 2 * Copyright (C) 1995-2026 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5