Fri Nov 20 21:05:34 2015 UTC ()
Pullup ticket #4855 - requested by he
archivers/unzip: security fix
Revisions pulled up:
- archivers/unzip/Makefile 1.91
- archivers/unzip/distinfo 1.29
- archivers/unzip/patches/patch-crypt.c 1.1
- archivers/unzip/patches/patch-extract.c 1.3
---
Module Name: pkgsrc
Committed By: wiz
Date: Wed Nov 11 12:47:27 UTC 2015
Modified Files:
pkgsrc/archivers/unzip: Makefile distinfo
pkgsrc/archivers/unzip/patches: patch-extract.c
Added Files:
pkgsrc/archivers/unzip/patches: patch-crypt.c
Log Message:
Add patches to fix CVE-2015-7696, CVE-2015-7697, and an integer underflow.
From Debian.
Bump PKGREVISION.
(bsiegert)
diff -r1.90 -r1.90.4.1 pkgsrc/archivers/unzip/Makefile
diff -r1.27 -r1.27.6.1 pkgsrc/archivers/unzip/distinfo
diff -r0 -r1.1.2.2 pkgsrc/archivers/unzip/patches/patch-crypt.c
diff -r1.2 -r1.2.6.1 pkgsrc/archivers/unzip/patches/patch-extract.c
--- pkgsrc/archivers/unzip/Makefile 2015/06/05 12:22:28 1.90
+++ pkgsrc/archivers/unzip/Makefile 2015/11/20 21:05:34 1.90.4.1
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.90 2015/06/05 12:22:28 sevan Exp $
+# $NetBSD: Makefile,v 1.90.4.1 2015/11/20 21:05:34 bsiegert Exp $
DISTNAME= unzip60
PKGNAME= unzip-6.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.info-zip.org/pub/infozip/src/
EXTRACT_SUFX= .tgz
--- pkgsrc/archivers/unzip/distinfo 2015/02/11 12:35:42 1.27
+++ pkgsrc/archivers/unzip/distinfo 2015/11/20 21:05:34 1.27.6.1
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.27 2015/02/11 12:35:42 wiz Exp $
+$NetBSD: distinfo,v 1.27.6.1 2015/11/20 21:05:34 bsiegert Exp $
SHA1 (unzip60.tgz) = abf7de8a4018a983590ed6f5cbd990d4740f8a22
RMD160 (unzip60.tgz) = 48af66606e9472e45fbb94bc4e285da23d1b89ba
Size (unzip60.tgz) = 1376845 bytes
SHA1 (patch-ab) = 672635c469e0a53ac9808f8155ee38643a8acf69
SHA1 (patch-ac) = 27b91401d4d5ecc3842c91dc49c08f42c8646154
-SHA1 (patch-extract.c) = bba436910084ec43ef8f8e76a1cd0392c566e4ac
+SHA1 (patch-crypt.c) = e44e14ba2c8e5651659c6756a5adbe88b4385ca4
+SHA1 (patch-extract.c) = 042fe7d233d0b3cb1e978902c901e8239f7a3732
SHA1 (patch-fileio.c) = 910ddb3b847cae92326697a399234b2948555534
SHA1 (patch-list.c) = 7aa261ecef5e5cc14ad387070560730ff419d635
SHA1 (patch-process.c) = d6e6ed05ef7c2977353e848d9e9cba2877577812
$NetBSD: patch-crypt.c,v 1.1.2.2 2015/11/20 21:05:34 bsiegert Exp $
Bug fix for heap overflow, from Debian.
CVE-2015-7696
--- crypt.c.orig 2007-01-05 15:47:36.000000000 +0000
+++ crypt.c
@@ -465,7 +465,17 @@ int decrypt(__G__ passwrd)
GLOBAL(pInfo->encrypted) = FALSE;
defer_leftover_input(__G);
for (n = 0; n < RAND_HEAD_LEN; n++) {
- b = NEXTBYTE;
+ /* 2012-11-23 SMS. (OUSPG report.)
+ * Quit early if compressed size < HEAD_LEN. The resulting
+ * error message ("unable to get password") could be improved,
+ * but it's better than trying to read nonexistent data, and
+ * then continuing with a negative G.csize. (See
+ * fileio.c:readbyte()).
+ */
+ if ((b = NEXTBYTE) == (ush)EOF)
+ {
+ return PK_ERR;
+ }
h[n] = (uch)b;
Trace((stdout, " (%02x)", h[n]));
}
--- pkgsrc/archivers/unzip/patches/patch-extract.c 2015/02/11 12:35:42 1.2
+++ pkgsrc/archivers/unzip/patches/patch-extract.c 2015/11/20 21:05:34 1.2.6.1