SHA256
1
0
forked from pool/tcpreplay

Accepting request 513645 from network:utilities

1

OBS-URL: https://build.opensuse.org/request/show/513645
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tcpreplay?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2017-08-24 16:43:23 +00:00 committed by Git OBS Bridge
commit 268fee1c3e
7 changed files with 70 additions and 63 deletions

View File

@ -1,45 +0,0 @@
From: Fred Klassen <fklassen@appneta.com>
Date: Sun, 26 Feb 2017 20:45:59 -0800
Subject: * #278 fail if capture has a packet that is too large
Patch-mainline: v4.2.0-beta1
Git-commit: d689d14dbcd768c028eab2fb378d849e543dcfe9
References: CVE-2017-6429 bsc#1028234
* Update CHANGELOG
---
src/tcpcapinfo.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/tcpcapinfo.c b/src/tcpcapinfo.c
index 775f1625b00f..96928820fe94 100644
--- a/src/tcpcapinfo.c
+++ b/src/tcpcapinfo.c
@@ -281,6 +281,15 @@ main(int argc, char *argv[])
caplen = pcap_ph.caplen;
}
+ if (caplentoobig) {
+ printf("\n\nCapture file appears to be damaged or corrupt.\n"
+ "Contains packet of size %u, bigger than snap length %u\n",
+ caplen, pcap_fh.snaplen);
+
+ close(fd);
+ break;
+ }
+
/* check to make sure timestamps don't go backwards */
if (last_sec > 0 && last_usec > 0) {
if ((pcap_ph.ts.tv_sec == last_sec) ?
@@ -306,7 +315,7 @@ main(int argc, char *argv[])
}
close(fd);
- continue;
+ break;
}
/* print the frame checksum */
--
2.12.0

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:da483347e83a9b5df0e0dbb0f822a2d37236e79dda35f4bc4e6684fa827f25ea
size 2162175

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJYMLPjAAoJEOniFJeTveF+ftEIAIDP5vE/Qv/jX+qrqLhUIFWX
Tw//HUh6q4hWNkA54jpk6XjMJ8lkdXRcn9CDIqF19fXlDIMZGIBAJVRwQhrfmUos
5oUuqhqfTS1H7qXh5aW63mRTDLcXR/B7PKF3LChHdGWGTVvEloLTiPVh6/mA8kRS
ft5NSYPOYNn0OXYEpDeMhNBb4auGa2VkeSdCAf+5I7OV5o1EszhWq3jXjyL7Zefz
0gxpGApj/rO48wZxJPXZ2Hv4E0rfL4lHbBKgzH6TbP1TpHkwTmMiulKWyrvmBa7q
vzV0blEONORniabbpo6STYu4ePlZ0mTnajJJotC6FM9jflWZ+Lf40UbEbtvb8GA=
=O8aa
-----END PGP SIGNATURE-----

3
tcpreplay-4.2.6.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:043756c532dab93e2be33a517ef46b1341f7239278a1045ae670041dd8a4531d
size 3494827

View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJZGxhxAAoJEOniFJeTveF+YEsIAI1WOWtXuMhZsLmV016VyZg8
DZWQ/wNj92sjyaENyt7Dubxf3pLwDA4SXRkOrtmaJjwukTwh0erqalbVWCdsDo0V
1ZFH4ixHghMQft4O4Y6tb1H2U34b2mc47kX9aFCPX8IFm7Co+dUwCXFCZVqWoam/
Cl9qpQz7dBrgNWixeG75+1u7XB3Q+LfxyhKUvGkXl8nkB87fW4nhm20+Xnu7Ci9L
R0Wn4hMVBknhD6AR4OqDn5ZhwGTB7XjEn9w6vzjtTqXgSdaOBL9imEbIzIy9hpds
i87CZvyfzNPyZQgF1lwU9oUgTqDHEQ6K9HX9ISSBpoC89J5CrIuhD5qRIevaoGI=
=YQvF
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Mon Jul 31 17:49:44 UTC 2017 - mpluskal@suse.com
- Update to version 4.2.6:
* Test fails on sparc64 (#393)
- Changes for version 4.2.5:
* Fix issues found by scan-build (#384)
* Improve --portmap help message (#381)
* AFL detected security crash in fuzz feature (#380)
* Coverity static scan detected issues (#374)
* Fuzz should not be overwritting Layer 3 (#372)
* Add --fuzz-factor option to specify fuzz ratio (#371)
* Warnings when building on old distributions (#368)
* Fix more Lintian detected spelling errors (#365)
* Fuzz test failure on ARM and MIPS (#364)
- Changes for version 4.2.4:
* Fix Lintian detected spelling errors (#362)
- Changes for version 4.2.3:
* Archive (remove) QuickTX until maintainer found (#357)
* Ubuntu precise 32bit_build (#356)
- Changes for version 4.2.2:
* Archive (remove) QuickTX (#357)
* Missing symbol pcap_version on macOS 10.12.4 (#356)
- Changes for version 4.2.1:
* Fix reporting of rates < 1Mbps (#348)
* Option --unique-ip not working properly (#346)
- Changes for version 4.2.0:
* MAC rewriting capabilities (#313)
* Fix several issues identified by Coverity (#305)
* Packet destortion --fuzz-seed option by Gabriel Ganne (#302)
* Add --unique-ip-loops option to modify IPs every few loops
(#296)
* Netmap startup delay increase (#290)
* tcpcapinfo buffer overflow vulnerablily (#278)
* Update git-clone instructions by Kyle McDonald (#277)
* Allow fractions for --pps option (#270)
* Print per-loop stats with --stats=0 (#269)
* Add protection against packet drift by Guillaume Scott (#268)
* Print flow stats periodically with --stats output (#262)
* Include Travis-CI build support by Ilya Shipitsin (#264) (#285)
* tcpreplay won't replay all packets in a pcap file with --netmap
(#255)
* First and last packet times in --stats output (#239)
* Switch to wire speed after 30 minutes at 6 Gbps (#210)
* tcprewrite fix checksum properly for fragmented packets (#190)
- Drop no longer needed patch (already in upstream):
* 278-fail-if-capture-has-a-packet-that-is-too-large.patch
- Use %make_install macro
- Update dependencies to support (libnl3 and dbus-1)
-------------------------------------------------------------------
Thu Mar 16 10:29:56 UTC 2017 - mkubecek@suse.cz

View File

@ -17,7 +17,7 @@
Name: tcpreplay
Version: 4.1.2
Version: 4.2.6
Release: 0
Summary: Network analysis and testing tools
License: GPL-3.0
@ -26,9 +26,12 @@ Url: http://tcpreplay.appneta.com/
Source0: https://github.com/appneta/tcpreplay/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source1: https://github.com/appneta/tcpreplay/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
Source2: %{name}.keyring
Patch1: 278-fail-if-capture-has-a-packet-that-is-too-large.patch
BuildRequires: dbus-1-devel
BuildRequires: libdnet-devel
BuildRequires: libpcap-devel
%if 0%{?suse_version} > 1110
BuildRequires: libnl3-devel
%endif
BuildRequires: tcpdump
Requires: tcpdump
# only needed for suse_version < 1130 (i.e. SLE11)
@ -46,7 +49,6 @@ switches, routers, and IP Flow/NetFlow appliances.
%prep
%setup -q
%patch1 -p1
%build
%configure \
@ -54,7 +56,7 @@ switches, routers, and IP Flow/NetFlow appliances.
make %{?_smp_mflags} V=1
%install
make %{?_smp_mflags} DESTDIR=%{buildroot} install
%make_install
%files
%defattr(-,root,root)