mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-05-08 20:43:38 +02:00
dsniff: issue #61, cleanup, sync with gentoo
This commit is contained in:
blshkv
parent
2b55d37296
commit
54912ebac8
7 changed files with 115 additions and 302 deletions
|
|
@ -1,231 +0,0 @@
|
|||
# ChangeLog for net-analyzer/dsniff
|
||||
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/ChangeLog,v 1.56 2012/02/05 18:34:19 armin76 Exp $
|
||||
|
||||
05 Feb 2012; Raúl Porcel <armin76@gentoo.org> dsniff-2.4_beta1-r4.ebuild,
|
||||
dsniff-2.4_beta1-r5.ebuild:
|
||||
Drop alpha/sparc keywords
|
||||
|
||||
22 Sep 2010; Jeroen Roovers <jer@gentoo.org> files/2.4_beta1-make.patch:
|
||||
Fix the previous fix (bug #338086 comment #7).
|
||||
|
||||
*dsniff-2.4_beta1-r5 (20 Sep 2010)
|
||||
|
||||
20 Sep 2010; Jeroen Roovers <jer@gentoo.org> files/2.3-makefile.patch,
|
||||
dsniff-2.4_beta1-r4.ebuild, -files/2.3-openssl.patch,
|
||||
+dsniff-2.4_beta1-r5.ebuild, +files/2.4_beta1-httppostfix.patch,
|
||||
+files/2.4_beta1-make.patch, -files/dsniff-httppostfix.patch:
|
||||
Fix parallel make issue by Nathan Phillip Brink (ohnobinki, bug #338086).
|
||||
Name patches consistently. Merge Makefile.ini patches.
|
||||
|
||||
07 May 2010; Raúl Porcel <armin76@gentoo.org> dsniff-2.4_beta1-r4.ebuild:
|
||||
alpha stable wrt #312835
|
||||
|
||||
15 Apr 2010; Jeroen Roovers <jer@gentoo.org> dsniff-2.4_beta1-r4.ebuild:
|
||||
Stable for PPC (bug #312835).
|
||||
|
||||
05 Apr 2010; Markos Chandras <hwoarang@gentoo.org>
|
||||
dsniff-2.4_beta1-r4.ebuild:
|
||||
Stable on amd64 wrt bug #312835
|
||||
|
||||
05 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
|
||||
dsniff-2.4_beta1-r4.ebuild:
|
||||
x86 stable wrt security bug #312637
|
||||
|
||||
16 Jan 2010; Peter Volkov <pva@gentoo.org> dsniff-2.4_beta1-r3.ebuild,
|
||||
dsniff-2.4_beta1-r4.ebuild:
|
||||
Update license on BSD, bug #301123 thank Ulrich Müller for report.
|
||||
|
||||
*dsniff-2.4_beta1-r4 (23 Mar 2009)
|
||||
|
||||
23 Mar 2009; Robert Buchholz <rbu@gentoo.org> +dsniff-2.4_beta1-r4.ebuild:
|
||||
Bump to newer debian patchset that actually works. This needs a more recent
|
||||
libnids, bug #253533.
|
||||
|
||||
25 Nov 2008; Hanno Boeck <hanno@gentoo.org> +files/dsniff-lresolv.patch,
|
||||
dsniff-2.4_beta1-r3.ebuild:
|
||||
Fix building with --as-needed, thanks to Timothy Redaelli in #94184.
|
||||
|
||||
13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
|
||||
dsniff-2.4_beta1-r3.ebuild:
|
||||
ppc. stable
|
||||
|
||||
22 Jul 2007; <pva@gentoo.org> metadata.xml, dsniff-2.3-r10.ebuild,
|
||||
dsniff-2.4_beta1-r3.ebuild:
|
||||
Removed virtual/x11 dependency.
|
||||
|
||||
12 Jul 2007; Raúl Porcel <armin76@gentoo.org> dsniff-2.4_beta1-r3.ebuild:
|
||||
alpha stable
|
||||
|
||||
12 Jul 2007; Markus Ullmann <jokey@gentoo.org> dsniff-2.4_beta1-r3.ebuild:
|
||||
Stable on x86
|
||||
|
||||
01 Feb 2007; Markus Ullmann <jokey@gentoo.org> dsniff-2.4_beta1-r3.ebuild:
|
||||
emake > make
|
||||
|
||||
01 Dec 2006; Cedric Krier <cedk@gentoo.org> dsniff-2.4_beta1-r3.ebuild:
|
||||
Fix cross-compilation and typo
|
||||
|
||||
01 Dec 2006; Cedric Krier <cedk@gentoo.org> +files/2.3-openssl.patch,
|
||||
dsniff-2.3-r10.ebuild:
|
||||
Fix bug #146573
|
||||
|
||||
31 Oct 2006; Markus Ullmann <jokey@gentoo.org> dsniff-2.3-r7.ebuild,
|
||||
dsniff-2.3-r10.ebuild, dsniff-2.4_beta1-r3.ebuild:
|
||||
changing deps wrt bug #153247
|
||||
|
||||
30 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org>
|
||||
dsniff-2.3-r10.ebuild:
|
||||
ppc stable
|
||||
|
||||
23 Jul 2006; Marcelo Goes <vanquirius@gentoo.org> -dsniff-2.3-r8.ebuild,
|
||||
-dsniff-2.3-r9.ebuild, dsniff-2.3-r10.ebuild, -dsniff-2.4_beta1-r1.ebuild,
|
||||
-dsniff-2.4_beta1-r2.ebuild:
|
||||
Mark 2.3-r10 x86 stable, remove old ebuilds.
|
||||
|
||||
02 May 2006; Jason Wever <weeve@gentoo.org> dsniff-2.4_beta1-r3.ebuild:
|
||||
Added ~sparc keyword.
|
||||
|
||||
*dsniff-2.4_beta1-r3 (20 Apr 2006)
|
||||
*dsniff-2.3-r10 (20 Apr 2006)
|
||||
|
||||
20 Apr 2006; Markus Ullmann <jokey@gentoo.org> +dsniff-2.3-r10.ebuild,
|
||||
+dsniff-2.4_beta1-r3.ebuild:
|
||||
Adding X USE flag for webspy
|
||||
|
||||
20 Apr 2006; Markus Ullmann <jokey@gentoo.org> dsniff-2.3-r7.ebuild,
|
||||
dsniff-2.3-r8.ebuild, dsniff-2.3-r9.ebuild, dsniff-2.4_beta1-r1.ebuild,
|
||||
dsniff-2.4_beta1-r2.ebuild:
|
||||
Reverting changes due to comment #5 on bug #130038
|
||||
|
||||
*dsniff-2.4_beta1-r2 (17 Apr 2006)
|
||||
*dsniff-2.3-r9 (17 Apr 2006)
|
||||
|
||||
17 Apr 2006; Markus Ullmann <jokey@gentoo.org>
|
||||
+files/dsniff-httppostfix.patch, +dsniff-2.3-r9.ebuild,
|
||||
+dsniff-2.4_beta1-r2.ebuild:
|
||||
Adding HTTP POST patch wrt bug #125084
|
||||
|
||||
15 Apr 2006; Markus Ullmann <jokey@gentoo.org> dsniff-2.3-r7.ebuild,
|
||||
dsniff-2.3-r8.ebuild, dsniff-2.4_beta1-r1.ebuild:
|
||||
Fixing dependencies wrt bug #130038
|
||||
|
||||
31 Mar 2006; Markus Ullmann <jokey@gentoo.org> dsniff-2.3-r7.ebuild,
|
||||
dsniff-2.3-r8.ebuild:
|
||||
Fixed HOMEPAGE issue
|
||||
|
||||
*dsniff-2.4_beta1-r1 (26 Mar 2006)
|
||||
*dsniff-2.3-r8 (26 Mar 2006)
|
||||
|
||||
26 Mar 2006; Markus Ullmann <jokey@gentoo.org> +dsniff-2.3-r8.ebuild,
|
||||
-dsniff-2.4_beta1.ebuild, +dsniff-2.4_beta1-r1.ebuild:
|
||||
Making glibc 2.4 ready wrt bug #127152
|
||||
|
||||
15 Feb 2006; Markus Ullmann <jokey@gentoo.org> dsniff-2.3-r7.ebuild,
|
||||
dsniff-2.4_beta1.ebuild:
|
||||
Removing virtual/libpcap wrt bug #117898
|
||||
|
||||
31 Jan 2006; Simon Stelling <blubb@gentoo.org> dsniff-2.4_beta1.ebuild:
|
||||
rekeyword ~amd64
|
||||
|
||||
29 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> dsniff-2.3-r7.ebuild,
|
||||
dsniff-2.4_beta1.ebuild:
|
||||
Depend exactly on net-libs/libnids-1.18 for bug 120798. Thanks to Rumen
|
||||
Yotov <gentoo at mach dot qrypto dot org>. Forced to drop amd64 keyword on
|
||||
account of this.
|
||||
|
||||
21 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> dsniff-2.4_beta1.ebuild:
|
||||
More fixes for bug 119557. Thanks to a1200ux <a1200ux at gmail dot com> for
|
||||
his hard work.
|
||||
|
||||
*dsniff-2.4_beta1 (19 Jan 2006)
|
||||
|
||||
19 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> -dsniff-2.3-r4.ebuild,
|
||||
+dsniff-2.4_beta1.ebuild:
|
||||
Add version 2.4 and Debian patchset for bug 119557. Thanks to <a1200ux at
|
||||
gmail dot com>. Currently in package.mask.
|
||||
|
||||
24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> dsniff-2.3-r7.ebuild:
|
||||
Stable on ppc.
|
||||
|
||||
09 Dec 2005; Bryan Østergaard <kloeri@gentoo.org dsniff-2.3-r7.ebuild:
|
||||
Stable on alpha.
|
||||
|
||||
27 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> -dsniff-2.3-r5.ebuild,
|
||||
-dsniff-2.3-r6.ebuild, dsniff-2.3-r7.ebuild:
|
||||
Mark 2.3-r7 x86 stable, remove old ebuilds.
|
||||
|
||||
*dsniff-2.3-r7 (15 Oct 2005)
|
||||
|
||||
15 Oct 2005; <mkay@gentoo.org> +dsniff-2.3-r7.ebuild:
|
||||
Fixing local ip inversion (see bug #108144)
|
||||
|
||||
17 Sep 2005; Aron Griffis <agriffis@gentoo.org> dsniff-2.3-r4.ebuild:
|
||||
Mark 2.3-r4 stable on alpha
|
||||
|
||||
*dsniff-2.3-r6 (09 Sep 2005)
|
||||
|
||||
09 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> +dsniff-2.3-r6.ebuild:
|
||||
Made ebuild DEPEND on ~sys-libs/db-3.2.9 instead of building its own copy.
|
||||
|
||||
*dsniff-2.3-r5 (27 Jun 2005)
|
||||
|
||||
27 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> +dsniff-2.3-r5.ebuild:
|
||||
Adding append-ldflags -lresolv to allow amd64 compilation, ~amd64 keyword.
|
||||
Fixes bug 94184, thanks to Steven Tasker <bool@hush.com>.
|
||||
|
||||
17 May 2005; Michael Hanselmann <hansmi@gentoo.org> dsniff-2.3-r4.ebuild:
|
||||
Stable on ppc.
|
||||
|
||||
*dsniff-2.3-r4 (29 Mar 2005)
|
||||
|
||||
29 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> -dsniff-2.3-r3.ebuild,
|
||||
+dsniff-2.3-r4.ebuild:
|
||||
Doing a revision bump to push bug fix.
|
||||
|
||||
29 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> dsniff-2.3-r3.ebuild:
|
||||
Fix bug 87166. Thanks to Brandyn A. White <e133tc1pher@gmail.com> for
|
||||
reporting and solving the problem.
|
||||
|
||||
*dsniff-2.3-r3 (07 Mar 2005)
|
||||
|
||||
07 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> -dsniff-2.3-r2.ebuild,
|
||||
+dsniff-2.3-r3.ebuild:
|
||||
Revision bump; install /etc files correctly for bug 84284. Keeping stable on
|
||||
x86.
|
||||
|
||||
29 Jan 2005; Daniel Black <dragonheart@gentoo.org> dsniff-2.3-r2.ebuild:
|
||||
changed net-libs/libpcap depend to virtual/libcap
|
||||
|
||||
01 Jul 2004; Jon Hood <squinky86@gentoo.org> dsniff-2.3-r2.ebuild:
|
||||
change virtual/glibc to virtual/libc, add missing IUSE
|
||||
|
||||
03 May 2004; David Holm <dholm@gentoo.org> dsniff-2.3-r2.ebuild:
|
||||
Added to ~ppc.
|
||||
|
||||
*dsniff-2.3-r2 (02 May 2004)
|
||||
|
||||
02 May 2004; Mike Frysinger <vapier@gentoo.org> :
|
||||
Make sure a few files make it to /etc/dsniff instead of /usr.
|
||||
|
||||
*dsniff-2.3-r1 (21 Aug 2003)
|
||||
|
||||
08 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
|
||||
Cleanup patch so that dsniff will use a newer version of nids #43370 by Magnus Maatta.
|
||||
|
||||
26 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
|
||||
Add patch to fix linking order #27267.
|
||||
|
||||
21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
|
||||
Patch to compile against SLOT-ed libnet-1.0.x #17772.
|
||||
|
||||
*dsniff-2.3 (14 Nov 2002)
|
||||
|
||||
23 Jul 2003; Tavis Ormandy <taviso@gentoo.org> dsniff-2.3.ebuild:
|
||||
~alpha
|
||||
|
||||
02 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> dsniff-2.3.ebuild :
|
||||
Closes #14689.
|
||||
|
||||
14 Nov 2002; Jared Hudson <jhhudso@gentoo.org> : Initial import. Ebuild
|
||||
submitted by foser <foser@gentoo.org>. Bug #6906
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
DIST dsniff-2.4b1.tar.gz 131666 SHA256 a9803a7a02ddfe5fb9704ce86f0ffc48453c321e88db85810db411ba0841152a
|
||||
DIST dsniff_2.4b1+debian-18.diff.gz 44819 SHA256 a65142b8d2206d3eae5db35d9972f8eac1110d45893d7f2182ca240ecd9b9d25
|
||||
DIST dsniff-2.4b1.tar.gz 131666 SHA256 a9803a7a02ddfe5fb9704ce86f0ffc48453c321e88db85810db411ba0841152a SHA512 62dafab293de6dc3e9b01561b3627d63ca334467c01c3550a6318d8bcbe99d5a301ec16967af34065a14e8bca1c4b6a41da766cbd51ebd8338615b950c4f642f WHIRLPOOL 10e5187314fe63058a015a3bef159e21a1ff7e0080ea72c8f804621d2b6254b6c05aa7fe2952bec568641a4a8d93eedf5f5407f127ee3464f73931bfe865d100
|
||||
DIST dsniff_2.4b1+debian-22.1.debian.tar.gz 29657 SHA256 28ddb8514c6a7a17f51f428b6fada299baf5a3efa153f77f081ac6c1e6466633 SHA512 11c6a3c04b5a8b3afb78901003132186964e88019011bea69b43a000c31d23f15c1a1c343c2ad1b03bf0a09664aebfa6f99e335fdfa1496bb020db6541eab6e3 WHIRLPOOL a1236e7452e3442a1ac0d7a6bbf71d0d0ef22bf508aa47838d220ed18e8c16aba4a822a343c9922de71f6f77c6b10d58d6a56a631488e71ca3307d9a9132bee5
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild,v 1.8 2012/02/05 18:34:19 armin76 Exp $
|
||||
|
||||
inherit autotools eutils flag-o-matic toolchain-funcs
|
||||
|
||||
DESCRIPTION="A collection of tools for network auditing and penetration testing"
|
||||
HOMEPAGE="http://monkey.org/~dugsong/dsniff/"
|
||||
SRC_URI="http://monkey.org/~dugsong/${PN}/beta/${P/_beta/b}.tar.gz
|
||||
mirror://debian/pool/main/d/${PN}/${PN}_2.4b1+debian-18.diff.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86"
|
||||
IUSE="X"
|
||||
|
||||
DEPEND="net-libs/libpcap
|
||||
>=net-libs/libnet-1.1.2.1-r1
|
||||
>=net-libs/libnids-1.21
|
||||
>=dev-libs/openssl-0.9.6e
|
||||
>=sys-libs/db-4.2.52_p4
|
||||
sys-apps/sed
|
||||
X? ( x11-libs/libXmu )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${P/_beta1/}"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
|
||||
# Debian's patchset
|
||||
epatch "${DISTDIR}"/${PN}_2.4b1+debian-18.diff.gz
|
||||
epatch "${S}"/dsniff-2.4b1+debian/debian/patches/*.dpatch
|
||||
|
||||
sed -i 's:-DDSNIFF_LIBDIR=\\\"$(libdir)/\\\"::' Makefile.in || die "sed makefile"
|
||||
epatch "${FILESDIR}"/2.3-makefile.patch
|
||||
|
||||
# Bug 125084
|
||||
epatch "${FILESDIR}"/${PV}-httppostfix.patch
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
econf \
|
||||
$(use_with X x) \
|
||||
|| die "econf failed"
|
||||
emake CC="$(tc-getCC)" || die "emake failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install install_prefix="${D}" || die "emake install failed"
|
||||
dodir /etc/dsniff
|
||||
cp "${D}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
|
||||
"${D}"/etc/dsniff/
|
||||
dodoc CHANGES README TODO
|
||||
}
|
||||
|
|
@ -1,15 +1,16 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/dsniff-2.4_beta1-r5.ebuild,v 1.2 2012/02/05 18:34:19 armin76 Exp $
|
||||
|
||||
EAPI="2"
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
inherit autotools eutils flag-o-matic toolchain-funcs
|
||||
|
||||
DESCRIPTION="A collection of tools for network auditing and penetration testing"
|
||||
HOMEPAGE="http://monkey.org/~dugsong/dsniff/"
|
||||
SRC_URI="http://monkey.org/~dugsong/${PN}/beta/${P/_beta/b}.tar.gz
|
||||
mirror://debian/pool/main/d/${PN}/${PN}_2.4b1+debian-18.diff.gz"
|
||||
SRC_URI="
|
||||
http://monkey.org/~dugsong/${PN}/beta/${P/_beta/b}.tar.gz
|
||||
mirror://debian/pool/main/d/${PN}/${PN}_2.4b1+debian-22.1.debian.tar.gz
|
||||
"
|
||||
LICENSE="BSD"
|
||||
|
||||
SLOT="0"
|
||||
|
|
@ -27,9 +28,21 @@ RDEPEND="${DEPEND}"
|
|||
S="${WORKDIR}/${P/_beta1/}"
|
||||
|
||||
src_prepare() {
|
||||
# Debian's patchset
|
||||
epatch "${DISTDIR}"/${PN}_2.4b1+debian-18.diff.gz
|
||||
epatch dsniff-2.4b1+debian/debian/patches/*.dpatch
|
||||
# replace Debian patch 23 with a simpler one (bug #506076)
|
||||
mv -v \
|
||||
"${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch{,.old} || die
|
||||
cp -v \
|
||||
"${FILESDIR}"/${PV}-urlsnarf-pcap_timestamps.patch \
|
||||
"${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch || die
|
||||
|
||||
# Debian patchset, needs to be applied in the exact order that "series"
|
||||
# lists or patching will fail.
|
||||
# Bug #479882
|
||||
epatch $(
|
||||
for file in $(< "${WORKDIR}"/debian/patches/series ); do
|
||||
printf "%s/debian/patches/%s " "${WORKDIR}" "${file}"
|
||||
done
|
||||
)
|
||||
|
||||
# Bug 125084
|
||||
epatch "${FILESDIR}"/${PV}-httppostfix.patch
|
||||
|
|
@ -37,6 +50,12 @@ src_prepare() {
|
|||
# various Makefile.in patches
|
||||
epatch "${FILESDIR}"/${PV}-make.patch
|
||||
|
||||
# bug #538462
|
||||
epatch "${FILESDIR}"/${PV}-macof-size-calculation.patch
|
||||
|
||||
#Pentoo issue 61
|
||||
epatch "${FILESDIR}"/${PV}-libressl.patch
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
|
|
@ -47,11 +66,11 @@ src_configure() {
|
|||
}
|
||||
|
||||
src_compile() {
|
||||
emake -j1 CC="$(tc-getCC)" || die "emake failed"
|
||||
emake CC="$(tc-getCC)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install install_prefix="${D}" || die "emake install failed"
|
||||
emake install install_prefix="${D}"
|
||||
dodir /etc/dsniff
|
||||
cp "${D}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
|
||||
"${D}"/etc/dsniff/
|
||||
57
net-analyzer/dsniff/files/2.4_beta1-libressl.patch
Normal file
57
net-analyzer/dsniff/files/2.4_beta1-libressl.patch
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
diff --git a/sshcrypto.c b/sshcrypto.c
|
||||
index 2e8b774..072eff0 100644
|
||||
--- a/sshcrypto.c
|
||||
+++ b/sshcrypto.c
|
||||
@@ -27,8 +27,8 @@ struct blowfish_state {
|
||||
};
|
||||
|
||||
struct des3_state {
|
||||
- des_key_schedule k1, k2, k3;
|
||||
- des_cblock iv1, iv2, iv3;
|
||||
+ DES_key_schedule k1, k2, k3;
|
||||
+ DES_cblock iv1, iv2, iv3;
|
||||
};
|
||||
|
||||
void
|
||||
@@ -153,13 +153,13 @@ des3_init(u_char *sesskey, int len)
|
||||
if ((state = malloc(sizeof(*state))) == NULL)
|
||||
err(1, "malloc");
|
||||
|
||||
- des_set_key((void *)sesskey, state->k1);
|
||||
- des_set_key((void *)(sesskey + 8), state->k2);
|
||||
+ DES_set_key((void *)sesskey, &state->k1);
|
||||
+ DES_set_key((void *)(sesskey + 8), &state->k2);
|
||||
|
||||
if (len <= 16)
|
||||
- des_set_key((void *)sesskey, state->k3);
|
||||
+ DES_set_key((void *)sesskey, &state->k3);
|
||||
else
|
||||
- des_set_key((void *)(sesskey + 16), state->k3);
|
||||
+ DES_set_key((void *)(sesskey + 16), &state->k3);
|
||||
|
||||
memset(state->iv1, 0, 8);
|
||||
memset(state->iv2, 0, 8);
|
||||
@@ -175,9 +175,9 @@ des3_encrypt(u_char *src, u_char *dst, int len, void *state)
|
||||
estate = (struct des3_state *)state;
|
||||
memcpy(estate->iv1, estate->iv2, 8);
|
||||
|
||||
- des_ncbc_encrypt(src, dst, len, estate->k1, &estate->iv1, DES_ENCRYPT);
|
||||
- des_ncbc_encrypt(dst, dst, len, estate->k2, &estate->iv2, DES_DECRYPT);
|
||||
- des_ncbc_encrypt(dst, dst, len, estate->k3, &estate->iv3, DES_ENCRYPT);
|
||||
+ DES_ncbc_encrypt(src, dst, len, &estate->k1, &estate->iv1, DES_ENCRYPT);
|
||||
+ DES_ncbc_encrypt(dst, dst, len, &estate->k2, &estate->iv2, DES_DECRYPT);
|
||||
+ DES_ncbc_encrypt(dst, dst, len, &estate->k3, &estate->iv3, DES_ENCRYPT);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -188,7 +188,7 @@ des3_decrypt(u_char *src, u_char *dst, int len, void *state)
|
||||
dstate = (struct des3_state *)state;
|
||||
memcpy(dstate->iv1, dstate->iv2, 8);
|
||||
|
||||
- des_ncbc_encrypt(src, dst, len, dstate->k3, &dstate->iv3, DES_DECRYPT);
|
||||
- des_ncbc_encrypt(dst, dst, len, dstate->k2, &dstate->iv2, DES_ENCRYPT);
|
||||
- des_ncbc_encrypt(dst, dst, len, dstate->k1, &dstate->iv1, DES_DECRYPT);
|
||||
+ DES_ncbc_encrypt(src, dst, len, &dstate->k3, &dstate->iv3, DES_DECRYPT);
|
||||
+ DES_ncbc_encrypt(dst, dst, len, &dstate->k2, &dstate->iv2, DES_ENCRYPT);
|
||||
+ DES_ncbc_encrypt(dst, dst, len, &dstate->k1, &dstate->iv1, DES_DECRYPT);
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- a/macof.c
|
||||
+++ b/macof.c
|
||||
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
|
||||
libnet_build_tcp(sport, dport, seq, 0, TH_SYN, 512,
|
||||
0, 0, LIBNET_TCP_H, NULL, 0, l, 0);
|
||||
|
||||
- libnet_build_ipv4(LIBNET_TCP_H, 0,
|
||||
+ libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_TCP_H, 0,
|
||||
libnet_get_prand(LIBNET_PRu16), 0, 64,
|
||||
IPPROTO_TCP, 0, src, dst, NULL, 0, l, 0);
|
||||
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
Author: Hilko Bengen <bengen@debian.org>
|
||||
Description: urlsnarf: use timestamps from pcap file if available. Closes: #573365
|
||||
Index: dsniff-2.4b1+debian/urlsnarf.c
|
||||
===================================================================
|
||||
--- a/urlsnarf.c
|
||||
+++ b/urlsnarf.c
|
||||
@@ -57,7 +57,7 @@
|
||||
{
|
||||
static char tstr[32], sign;
|
||||
struct tm *t, gmt;
|
||||
- time_t tt = time(NULL);
|
||||
+ time_t tt = nids_last_pcap_header->ts.tv_sec;
|
||||
int days, hours, tz, len;
|
||||
|
||||
gmt = *gmtime(&tt);
|
||||
Loading…
Reference in a new issue