Fix CAN-2004-0097 vulnerability in devel/pwlib, remove FORBIDDEN and bump

PORTREVISION of related ports.

Requested by:	*many*
No reply from:	security-officer
Obtained from:	Debian/pwlib cvs
This commit is contained in:
Maxim Sobolev 2004-06-08 06:27:43 +00:00
parent 5d8de5067b
commit f0629da70d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=111056
15 changed files with 129 additions and 18 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= pwlib
PORTVERSION= 1.5.0
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
@ -17,8 +17,6 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= roger@FreeBSD.org
COMMENT= A cross platform C++ library, used by OpenH323
FORBIDDEN= http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
WRKSRC= ${WRKDIR}/${PORTNAME}

View file

@ -0,0 +1,58 @@
$FreeBSD$
--- src/ptclib/asner.cxx 2004/06/03 14:44:43 1.1
+++ src/ptclib/asner.cxx 2004/06/03 14:50:35
@@ -4926,6 +4926,11 @@
return -1;
value += lower;
+
+ // clamp value to upper limit
+ if (value > upper)
+ value = upper;
+
return 0;
}
@@ -4970,7 +4975,13 @@
unsigned base;
if (!MultiBitDecode(CountBits(upper - lower + 1), base))
return -1;
- return lower + base; // 10.9.4.1
+ len = lower + base; // 10.9.4.1
+
+ // clamp value to upper limit
+ if (len > upper)
+ len = upper;
+
+ return len;
}
if (upper < 65536) // 10.9.3.3
@@ -4981,13 +4992,20 @@
if (IsAtEnd())
return -1;
- if (SingleBitDecode() == 0)
- return MultiBitDecode(7, len) ? 0 : -1; // 10.9.3.6
+ if (SingleBitDecode() == 0) {
+ if (!MultiBitDecode(7, len)) // 10.9.3.6
+ return -1; // 10.9.3.8 unsupported
+ }
+ else if (SingleBitDecode() == 0) {
+ if (!MultiBitDecode(14, len)) // 10.9.3.7
+ return -1; // 10.9.3.8 unsupported
+ }
- if (SingleBitDecode() == 0)
- return MultiBitDecode(14, len) ? 0 : -1; // 10.9.3.7
+ // clamp value to upper limit
+ if (len > upper)
+ len = upper;
- return -1; // 10.9.3.8 unsupported
+ return 0;
}

View file

@ -7,7 +7,7 @@
PORTNAME= pwlib
PORTVERSION= 1.5.0
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
@ -17,8 +17,6 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= roger@FreeBSD.org
COMMENT= A cross platform C++ library, used by OpenH323
FORBIDDEN= http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
WRKSRC= ${WRKDIR}/${PORTNAME}

View file

@ -0,0 +1,58 @@
$FreeBSD$
--- src/ptclib/asner.cxx 2004/06/03 14:44:43 1.1
+++ src/ptclib/asner.cxx 2004/06/03 14:50:35
@@ -4926,6 +4926,11 @@
return -1;
value += lower;
+
+ // clamp value to upper limit
+ if (value > upper)
+ value = upper;
+
return 0;
}
@@ -4970,7 +4975,13 @@
unsigned base;
if (!MultiBitDecode(CountBits(upper - lower + 1), base))
return -1;
- return lower + base; // 10.9.4.1
+ len = lower + base; // 10.9.4.1
+
+ // clamp value to upper limit
+ if (len > upper)
+ len = upper;
+
+ return len;
}
if (upper < 65536) // 10.9.3.3
@@ -4981,13 +4992,20 @@
if (IsAtEnd())
return -1;
- if (SingleBitDecode() == 0)
- return MultiBitDecode(7, len) ? 0 : -1; // 10.9.3.6
+ if (SingleBitDecode() == 0) {
+ if (!MultiBitDecode(7, len)) // 10.9.3.6
+ return -1; // 10.9.3.8 unsupported
+ }
+ else if (SingleBitDecode() == 0) {
+ if (!MultiBitDecode(14, len)) // 10.9.3.7
+ return -1; // 10.9.3.8 unsupported
+ }
- if (SingleBitDecode() == 0)
- return MultiBitDecode(14, len) ? 0 : -1; // 10.9.3.7
+ // clamp value to upper limit
+ if (len > upper)
+ len = upper;
- return -1; // 10.9.3.8 unsupported
+ return 0;
}

View file

@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 0.9.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/

View file

@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 0.9.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/

View file

@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 0.9.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/

View file

@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 0.9.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/

View file

@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 0.9.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/

View file

@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 0.9.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/

View file

@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 0.9.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/

View file

@ -7,7 +7,7 @@
PORTNAME= openh323
PORTVERSION= 1.12.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
@ -17,8 +17,6 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= roger@FreeBSD.org
COMMENT= A H323 Video Conferencing library
FORBIDDEN= http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build
LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2

View file

@ -7,7 +7,7 @@
PORTNAME= openh323
PORTVERSION= 1.12.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
@ -17,8 +17,6 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= roger@FreeBSD.org
COMMENT= A H323 Video Conferencing library
FORBIDDEN= http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build
LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2

View file

@ -7,7 +7,7 @@
PORTNAME= openh323
PORTVERSION= 1.12.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
@ -17,8 +17,6 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= roger@FreeBSD.org
COMMENT= A H323 Video Conferencing library
FORBIDDEN= http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build
LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2

View file

@ -7,7 +7,7 @@
PORTNAME= openh323
PORTVERSION= 1.12.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://www.openh323.org/bin/ \
http://www.de.openh323.org/bin/ \
@ -17,8 +17,6 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= roger@FreeBSD.org
COMMENT= A H323 Video Conferencing library
FORBIDDEN= http://people.freebsd.org/~eik/portaudit/27c331d5-64c7-11d8-80e3-0020ed76ef5a.html
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build
LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2