- Update to 1.2.12: * A lot of bug fixes * Improve speed of crc32 functions * Use ARM crc32 instructions if the ARM architecture has them For the complete changes, see ChangeLog - Fixes CVE-2022-37434, heap-based buffer over-read or buffer overflow in inflate.c via a large gzip header extra field (CVE-2022-37434, bsc#1202175) - Added patches: * zlib-1.2.11-covscan-issues-rhel9.patch * zlib-1.2.11-covscan-issues.patch * zlib-1.2.12-s390-vectorize-crc32.patch * zlib-1.2.12-optimized-crc32-power8.patch * zlib-1.2.12-IBM-Z-hw-accelerated-deflate-s390x.patch * zlib-1.2.12-fix-configure.patch * zlib-1.2.12-correct-inputs-provided-to-crc-func.patch * zlib-1.2.12-fix-CVE-2022-37434.patch - Removed patches: * bsc1197459.patch (upstreamed) * zlib-power8-fate325307.patch (replaced by zlib-1.2.12-optimized-crc32-power8.patch) * bsc1174736-DFLTCC_LEVEL_MASK-set-to-0x1ff.patch (replaced by zlib-1.2.12-IBM-Z-hw-accelrated-deflate-s390x.patch) * 410.patch (replaced by zlib-1.2.12-IBM-Z-hw-accelrated-deflate-s390x.patch) - Refreshed patches: * zlib-format.patch * zlib-no-version-check.patch - Disable profiling since it breaks tests - Update zlib-rpmlintrc OBS-URL: https://build.opensuse.org/request/show/1000394 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zlib?expand=0&rev=79
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
Index: zlib-1.2.12/infback.c
|
|
===================================================================
|
|
--- zlib-1.2.12.orig/infback.c
|
|
+++ zlib-1.2.12/infback.c
|
|
@@ -34,9 +34,6 @@ int stream_size;
|
|
{
|
|
struct inflate_state FAR *state;
|
|
|
|
- if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
|
|
- stream_size != (int)(sizeof(z_stream)))
|
|
- return Z_VERSION_ERROR;
|
|
if (strm == Z_NULL || window == Z_NULL ||
|
|
windowBits < 8 || windowBits > 15)
|
|
return Z_STREAM_ERROR;
|
|
Index: zlib-1.2.12/inflate.c
|
|
===================================================================
|
|
--- zlib-1.2.12.orig/inflate.c
|
|
+++ zlib-1.2.12/inflate.c
|
|
@@ -202,9 +202,6 @@ int stream_size;
|
|
int ret;
|
|
struct inflate_state FAR *state;
|
|
|
|
- if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
|
|
- stream_size != (int)(sizeof(z_stream)))
|
|
- return Z_VERSION_ERROR;
|
|
if (strm == Z_NULL) return Z_STREAM_ERROR;
|
|
strm->msg = Z_NULL; /* in case we return an error */
|
|
if (strm->zalloc == (alloc_func)0) {
|
|
Index: zlib-1.2.12/deflate.c
|
|
===================================================================
|
|
--- zlib-1.2.12.orig/deflate.c
|
|
+++ zlib-1.2.12/deflate.c
|
|
@@ -253,12 +253,7 @@ int ZEXPORT deflateInit2_(strm, level, m
|
|
{
|
|
deflate_state *s;
|
|
int wrap = 1;
|
|
- static const char my_version[] = ZLIB_VERSION;
|
|
|
|
- if (version == Z_NULL || version[0] != my_version[0] ||
|
|
- stream_size != sizeof(z_stream)) {
|
|
- return Z_VERSION_ERROR;
|
|
- }
|
|
if (strm == Z_NULL) return Z_STREAM_ERROR;
|
|
|
|
strm->msg = Z_NULL;
|