diff options
| author | Ariadne Conill <ariadne@dereferenced.org> | 2022-04-23 02:58:10 +0000 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2022-04-23 02:58:10 +0000 |
| commit | 6754a9005594de4243aad9b2744546971078c6c7 (patch) | |
| tree | 5cb8d490d43a7a8e66098b78a5149f555ac79cf2 | |
| parent | f4bf4f1749d734ffb3a1efcdefe21a8368e5500c (diff) | |
main/zlib: fix crc32 on 64-bit systems
thanks to sam@gentoo.org for pointing this out
| -rw-r--r-- | main/zlib/APKBUILD | 4 | ||||
| -rw-r--r-- | main/zlib/crc32.patch | 51 |
2 files changed, 54 insertions, 1 deletions
diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD index ffff9765e47..266ef15f808 100644 --- a/main/zlib/APKBUILD +++ b/main/zlib/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zlib pkgver=1.2.12 -pkgrel=0 +pkgrel=1 pkgdesc="A compression/decompression Library" arch="all" license="Zlib" @@ -10,6 +10,7 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-doc" source="https://zlib.net/zlib-$pkgver.tar.gz Fix-CC-logic-in-configure.patch configure-Pass-LDFLAGS-to-link-tests.patch + crc32.patch " # secfixes: # 1.2.11-r4: @@ -39,4 +40,5 @@ sha512sums=" cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14 zlib-1.2.12.tar.gz faa19991e88cbfd624ac9ce4a0ba12e3d7d54f88680b1a0a156a542a45bafe2053d69c6f309327817f7cc74f5765204bbb3c56ff531efd29d8fd6bb682c78598 Fix-CC-logic-in-configure.patch 76179eb7e498aef5bc88c3f826c6f2506a2d3c3a2e2560ef1825bd4a9297d68b0d2390619a4b3b0b2e6dde765431e5fba18fd15fbd1ad99827244f8f9bdbd909 configure-Pass-LDFLAGS-to-link-tests.patch +38f0593a0bc17336d31191b7af684e31ec2eb34bd3add49bcb1f95c5e2bfb4405ffc341c2650d52c4fbf417ab4f80a0cc82fb868c9816b04d25210ae29a71f2c crc32.patch " diff --git a/main/zlib/crc32.patch b/main/zlib/crc32.patch new file mode 100644 index 00000000000..85a6a7e3ab4 --- /dev/null +++ b/main/zlib/crc32.patch @@ -0,0 +1,51 @@ +From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001 +From: Mark Adler <madler@alumni.caltech.edu> +Date: Wed, 30 Mar 2022 11:14:53 -0700 +Subject: [PATCH] Correct incorrect inputs provided to the CRC functions. + +The previous releases of zlib were not sensitive to incorrect CRC +inputs with bits set above the low 32. This commit restores that +behavior, so that applications with such bugs will continue to +operate as before. +--- + crc32.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/crc32.c b/crc32.c +index a1bdce5c2..451887bc7 100644 +--- a/crc32.c ++++ b/crc32.c +@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) + #endif /* DYNAMIC_CRC_TABLE */ + + /* Pre-condition the CRC */ +- crc ^= 0xffffffff; ++ crc = (~crc) & 0xffffffff; + + /* Compute the CRC up to a word boundary. */ + while (len && ((z_size_t)buf & 7) != 0) { +@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) + #endif /* DYNAMIC_CRC_TABLE */ + + /* Pre-condition the CRC */ +- crc ^= 0xffffffff; ++ crc = (~crc) & 0xffffffff; + + #ifdef W + +@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2) + #ifdef DYNAMIC_CRC_TABLE + once(&made, make_crc_table); + #endif /* DYNAMIC_CRC_TABLE */ +- return multmodp(x2nmodp(len2, 3), crc1) ^ crc2; ++ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff); + } + + /* ========================================================================= */ +@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op) + uLong crc2; + uLong op; + { +- return multmodp(op, crc1) ^ crc2; ++ return multmodp(op, crc1) ^ (crc2 & 0xffffffff); + } |