diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireshark/Makefile | 5 | ||||
| -rw-r--r-- | net/wireshark/PLIST | 3 | ||||
| -rw-r--r-- | net/wireshark/distinfo | 9 | ||||
| -rw-r--r-- | net/wireshark/patches/patch-CVE-2012-3548 | 28 |
4 files changed, 8 insertions, 37 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index a4e3b51c26c..f75b57deb49 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.88 2012/10/03 21:57:13 wiz Exp $ +# $NetBSD: Makefile,v 1.89 2012/10/04 20:15:48 tron Exp $ -DISTNAME= wireshark-1.8.2 -PKGREVISION= 6 +DISTNAME= wireshark-1.8.3 CATEGORIES= net MASTER_SITES= http://www.wireshark.org/download/src/ \ ${MASTER_SITE_SOURCEFORGE:=wireshark/} diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST index e612c98bb97..8545d7447da 100644 --- a/net/wireshark/PLIST +++ b/net/wireshark/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2012/08/20 12:21:53 tron Exp $ +@comment $NetBSD: PLIST,v 1.24 2012/10/04 20:15:48 tron Exp $ bin/capinfos bin/dftest bin/dumpcap @@ -44,6 +44,7 @@ share/wireshark/colorfilters ${PLIST.lua}share/wireshark/console.lua share/wireshark/dfilters share/wireshark/dftest.html +share/wireshark/diameter/AlcatelLucent.xml share/wireshark/diameter/Cisco.xml share/wireshark/diameter/Ericsson.xml share/wireshark/diameter/TGPPGmb.xml diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index cc68675ecfb..d96edbd3277 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.59 2012/09/04 23:08:38 tron Exp $ +$NetBSD: distinfo,v 1.60 2012/10/04 20:15:48 tron Exp $ -SHA1 (wireshark-1.8.2.tar.bz2) = 4737d9745dbf002444ea42615243abf3bb80b943 -RMD160 (wireshark-1.8.2.tar.bz2) = 5fece857d5187b146a690fda111a0611e108c2a9 -Size (wireshark-1.8.2.tar.bz2) = 24121798 bytes -SHA1 (patch-CVE-2012-3548) = 0d72d0e485ed09e1c28bd85bf1f06aa390be4981 +SHA1 (wireshark-1.8.3.tar.bz2) = 3e1322eea5794c71de752b7923af9379bcc95299 +RMD160 (wireshark-1.8.3.tar.bz2) = ba9d74f06999ec6af9ccf9d8bc2ddece5c22b6d5 +Size (wireshark-1.8.3.tar.bz2) = 24123989 bytes SHA1 (patch-aa) = 78b9c01d7ecc272f1188a3fb8cfb806c8a040f6d SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840 diff --git a/net/wireshark/patches/patch-CVE-2012-3548 b/net/wireshark/patches/patch-CVE-2012-3548 deleted file mode 100644 index 3f6a2650679..00000000000 --- a/net/wireshark/patches/patch-CVE-2012-3548 +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-CVE-2012-3548,v 1.1 2012/09/04 23:08:38 tron Exp $ - -Fix for the remote DoS security vulnerability reported in CVE-2012-3548. -The patch was taken from the Wireshark SVN repository: - -http://anonsvn.wireshark.org/viewvc?view=revision&revision=44749 - ---- epan/dissectors/packet-drda.c.orig 2012-06-05 17:33:38.000000000 +0100 -+++ epan/dissectors/packet-drda.c 2012-09-04 21:38:12.000000000 +0100 -@@ -55,6 +55,7 @@ - #include <epan/packet.h> - #include <epan/conversation.h> - #include <epan/prefs.h> -+#include <epan/expert.h> - #include "packet-tcp.h" - - static int proto_drda = -1; -@@ -696,6 +697,10 @@ - { - iCommand = tvb_get_ntohs(tvb, offset + 8); - iLength = tvb_get_ntohs(tvb, offset + 0); -+ if (iLength < 10) { -+ expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "Invalid length detected (%u): should be at least 10 bytes long", iLength); -+ break; -+ } - /* iCommandEnd is the length of the packet up to the end of the current command */ - iCommandEnd += iLength; - |