diff options
Diffstat (limited to 'package/dsniff/patches')
-rw-r--r-- | package/dsniff/patches/patch-Makefile_in | 32 | ||||
-rw-r--r-- | package/dsniff/patches/patch-arp_c | 30 | ||||
-rw-r--r-- | package/dsniff/patches/patch-arp_h | 11 | ||||
-rw-r--r-- | package/dsniff/patches/patch-arpspoof_c | 12 | ||||
-rw-r--r-- | package/dsniff/patches/patch-confdefs_h | 28 | ||||
-rw-r--r-- | package/dsniff/patches/patch-configure | 104 | ||||
-rw-r--r-- | package/dsniff/patches/patch-decode_c | 21 | ||||
-rw-r--r-- | package/dsniff/patches/patch-dns_c | 681 | ||||
-rw-r--r-- | package/dsniff/patches/patch-dsniff_services | 9 | ||||
-rw-r--r-- | package/dsniff/patches/patch-msgsnarf_c | 11 | ||||
-rw-r--r-- | package/dsniff/patches/patch-record_c | 151 | ||||
-rw-r--r-- | package/dsniff/patches/patch-ssh_c | 46 | ||||
-rw-r--r-- | package/dsniff/patches/patch-sshcrypto_c | 43 | ||||
-rw-r--r-- | package/dsniff/patches/patch-sshow_c | 38 |
14 files changed, 1217 insertions, 0 deletions
diff --git a/package/dsniff/patches/patch-Makefile_in b/package/dsniff/patches/patch-Makefile_in new file mode 100644 index 000000000..62cfd26ed --- /dev/null +++ b/package/dsniff/patches/patch-Makefile_in @@ -0,0 +1,32 @@ +$Id$ +--- dsniff-2.4.orig/Makefile.in 2001-03-15 09:34:42.000000000 +0100 ++++ dsniff-2.4/Makefile.in 2007-01-23 00:20:48.000000000 +0100 +@@ -51,7 +51,7 @@ HDRS = asn1.h base64.h buf.h decode.h he + pathnames.h pcaputil.h record.h rpc.h tcp_raw.h trigger.h \ + version.h vroot.h + +-SRCS = asn1.c base64.c buf.c hex.c magic.c mount.c pcaputil.c rpc.c \ ++SRCS = asn1.c base64.c buf.c dns.c hex.c magic.c mount.c pcaputil.c rpc.c \ + tcp_raw.c trigger.c record.c dsniff.c decode.c decode_aim.c \ + decode_citrix.c decode_cvs.c decode_ftp.c decode_hex.c \ + decode_http.c decode_icq.c decode_imap.c decode_irc.c \ +@@ -60,7 +60,7 @@ SRCS = asn1.c base64.c buf.c hex.c magic + decode_pop.c decode_portmap.c decode_postgresql.c decode_pptp.c \ + decode_rip.c decode_rlogin.c decode_smb.c decode_smtp.c \ + decode_sniffer.c decode_snmp.c decode_socks.c decode_tds.c \ +- decode_telnet.c decode_vrrp.c decode_yp.c decode_x11.c ++ decode_telnet.c decode_vrrp.c decode_x11.c + + GEN = mount.h mount.c nfs_prot.h nfs_prot.c + +@@ -99,8 +99,8 @@ dsniff: $(HDRS) $(SRCS) $(OBJS) + arpspoof: arpspoof.o arp.o + $(CC) $(LDFLAGS) -o $@ arpspoof.o arp.o $(LIBS) $(PCAPLIB) $(LNETLIB) + +-dnsspoof: dnsspoof.o pcaputil.o +- $(CC) $(LDFLAGS) -o $@ dnsspoof.o pcaputil.o $(LIBS) $(PCAPLIB) $(LNETLIB) ++dnsspoof: dnsspoof.o pcaputil.o dns.o ++ $(CC) $(LDFLAGS) -o $@ dnsspoof.o pcaputil.o dns.o $(LIBS) $(PCAPLIB) $(LNETLIB) + + filesnarf: nfs_prot.o filesnarf.o pcaputil.o rpc.o + $(CC) $(LDFLAGS) -o $@ filesnarf.o nfs_prot.o pcaputil.o rpc.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) diff --git a/package/dsniff/patches/patch-arp_c b/package/dsniff/patches/patch-arp_c new file mode 100644 index 000000000..f14b04827 --- /dev/null +++ b/package/dsniff/patches/patch-arp_c @@ -0,0 +1,30 @@ +$Id$ +--- dsniff-2.4.orig/arp.c 2001-03-15 09:32:58.000000000 +0100 ++++ dsniff-2.4/arp.c 2007-01-23 00:20:48.000000000 +0100 +@@ -39,7 +39,7 @@ + + #ifdef BSD + int +-arp_cache_lookup(in_addr_t ip, struct ether_addr *ether) ++arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char *lif) + { + int mib[6]; + size_t len; +@@ -91,7 +91,7 @@ arp_cache_lookup(in_addr_t ip, struct et + #endif + + int +-arp_cache_lookup(in_addr_t ip, struct ether_addr *ether) ++arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char *lif) + { + int sock; + struct arpreq ar; +@@ -99,7 +99,7 @@ arp_cache_lookup(in_addr_t ip, struct et + + memset((char *)&ar, 0, sizeof(ar)); + #ifdef __linux__ +- strncpy(ar.arp_dev, "eth0", sizeof(ar.arp_dev)); /* XXX - *sigh* */ ++ strncpy(ar.arp_dev, lif, strlen(lif)); + #endif + sin = (struct sockaddr_in *)&ar.arp_pa; + sin->sin_family = AF_INET; diff --git a/package/dsniff/patches/patch-arp_h b/package/dsniff/patches/patch-arp_h new file mode 100644 index 000000000..cfa1445ec --- /dev/null +++ b/package/dsniff/patches/patch-arp_h @@ -0,0 +1,11 @@ +$Id$ +--- dsniff-2.4.orig/arp.h 2001-03-15 09:27:08.000000000 +0100 ++++ dsniff-2.4/arp.h 2007-01-23 00:20:48.000000000 +0100 +@@ -11,6 +11,6 @@ + #ifndef _ARP_H_ + #define _ARP_H_ + +-int arp_cache_lookup(in_addr_t ip, struct ether_addr *ether); ++int arp_cache_lookup(in_addr_t ip, struct ether_addr *ether, const char *lif); + + #endif /* _ARP_H_ */ diff --git a/package/dsniff/patches/patch-arpspoof_c b/package/dsniff/patches/patch-arpspoof_c new file mode 100644 index 000000000..8f04ee1c1 --- /dev/null +++ b/package/dsniff/patches/patch-arpspoof_c @@ -0,0 +1,12 @@ +$Id$ +--- dsniff-2.4.orig/arpspoof.c 2001-03-15 09:32:58.000000000 +0100 ++++ dsniff-2.4/arpspoof.c 2007-01-23 00:20:48.000000000 +0100 +@@ -113,7 +113,7 @@ arp_find(in_addr_t ip, struct ether_addr + int i = 0; + + do { +- if (arp_cache_lookup(ip, mac) == 0) ++ if (arp_cache_lookup(ip, mac, intf) == 0) + return (1); + #ifdef __linux__ + /* XXX - force the kernel to arp. feh. */ diff --git a/package/dsniff/patches/patch-confdefs_h b/package/dsniff/patches/patch-confdefs_h new file mode 100644 index 000000000..4f38843f8 --- /dev/null +++ b/package/dsniff/patches/patch-confdefs_h @@ -0,0 +1,28 @@ +$Id$ +--- dsniff-2.4.orig/confdefs.h 1970-01-01 00:00:00.000000000 +0100 ++++ dsniff-2.4/confdefs.h 2007-01-23 00:20:53.000000000 +0100 +@@ -0,0 +1,24 @@ ++ ++#define X_DISPLAY_MISSING 1 ++#define STDC_HEADERS 1 ++#define HAVE_ERR_H 1 ++#define HAVE_FCNTL_H 1 ++#define HAVE_SYS_IOCTL_H 1 ++#define HAVE_SYS_QUEUE_H 1 ++#define HAVE_UNISTD_H 1 ++#define HAVE_LIBGEN_H 1 ++#define HAVE_MINMAX 1 ++#define in_addr_t u_int32_t ++#define RETSIGTYPE void ++#define HAVE_STRFTIME 1 ++#define HAVE_GETHOSTNAME 1 ++#define HAVE_SOCKET 1 ++#define HAVE_STRDUP 1 ++#define HAVE_STRSTR 1 ++#define HAVE_LIBNSL 1 ++#define HAVE_DIRNAME 1 ++#define HAVE_STRLCPY 1 ++#define HAVE_STRLCAT 1 ++#define HAVE_STRSEP 1 ++#define HAVE_WARNX 1 ++#define HAVE_ETHER_NTOA 1 diff --git a/package/dsniff/patches/patch-configure b/package/dsniff/patches/patch-configure new file mode 100644 index 000000000..4808be06d --- /dev/null +++ b/package/dsniff/patches/patch-configure @@ -0,0 +1,104 @@ +$Id$ +--- dsniff-2.4.orig/configure 2001-03-19 07:52:37.000000000 +0100 ++++ dsniff-2.4/configure 2007-01-23 00:24:04.000000000 +0100 +@@ -16,6 +16,8 @@ ac_help="$ac_help + ac_help="$ac_help + --with-db=DIR use Berkeley DB (with --enable-compat185) in DIR" + ac_help="$ac_help ++ --with-gdbm=DIR use GNU DBM in DIR" ++ac_help="$ac_help + --with-libpcap=DIR use libpcap in DIR" + ac_help="$ac_help + --with-libnet=DIR use libnet in DIR" +@@ -3031,7 +3033,7 @@ if test "${with_libpcap+set}" = set; the + PCAPINC="-I$withval -I$withval/bpf" + PCAPLIB="-L$withval -lpcap" + elif test -f $withval/include/pcap.h -a \ +- -f $withval/include/net/bpf.h -a \ ++ -f $withval/include/pcap-bpf.h -a \ + -f $withval/lib/libpcap.a; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi +@@ -3059,7 +3061,40 @@ else + + fi + ++echo $ac_n "checking for libgdbm""... $ac_c" 1>&6 ++echo "configure:3059: checking for libgdbm" >&5 ++# Check whether --with-gdbm or --without-gdbm was given. ++if test "${with_gdbm+set}" = set; then ++ withval="$with_gdbm" ++ case "$withval" in ++ yes|no) ++ echo "$ac_t""no" 1>&6 ++ ;; ++ *) ++ echo "$ac_t""$withval" 1>&6 ++ if test -f $withval/include/gdbm.h -a -f $withval/lib/libgdbm.so; then ++ owd=`pwd` ++ if cd $withval; then withval=`pwd`; cd $owd; fi ++ DBINC="-I$withval/include" ++ DBLIB="-L$withval/lib -lgdbm" ++ else ++ { echo "configure: error: gdbm.h or libgdbm.so not found in $withval" 1>&2; exit 1; } ++ fi ++ ;; ++ esac ++else ++ if test -f ${prefix}/include/gdbm.h; then ++ LNETINC="-I${prefix}/include" ++ LNETLIB="-L${prefix}/lib -lgdbm" ++ elif test -f /usr/include/gdbm.h; then ++ LNETLIB="-lgdbm" ++ else ++ echo "$ac_t""no" 1>&6 ++ { echo "configure: error: libgdbm not found" 1>&2; exit 1; } ++ fi ++ echo "$ac_t""yes" 1>&6 + ++fi + + + echo $ac_n "checking for libnet""... $ac_c" 1>&6 +@@ -3073,7 +3108,7 @@ if test "${with_libnet+set}" = set; then + ;; + *) + echo "$ac_t""$withval" 1>&6 +- if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a; then ++ if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.so; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + if test -f $withval/bin/libnet-config; then +@@ -3086,7 +3121,7 @@ if test "${with_libnet+set}" = set; then + LNETINC="-I$withval/include" + LNETLIB="-L$withval/lib -lnet" + else +- { echo "configure: error: libnet.h or libnet.a not found in $withval" 1>&2; exit 1; } ++ { echo "configure: error: libnet.h or libnet.so not found in $withval" 1>&2; exit 1; } + fi + ;; + esac +@@ -3120,18 +3155,18 @@ if test "${with_libnids+set}" = set; the + ;; + *) + echo "$ac_t""$withval" 1>&6 +- if test -f $withval/src/nids.h -a -f $withval/src/libnids.a; then ++ if test -f $withval/include/nids.h -a -f $withval/lib/libnids.so; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi +- NIDSINC="-I$withval/src" +- NIDSLIB="-L$withval/src -lnids" +- elif test -f $withval/include/nids.h -a -f $withval/lib/libnids.a; then ++ NIDSINC="-I$withval/include" ++ NIDSLIB="-L$withval/lib -lnids" ++ elif test -f $withval/include/nids.h -a -f $withval/lib/libnids.so; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + NIDSINC="-I$withval/include" + NIDSLIB="-L$withval/lib -lnids" + else +- { echo "configure: error: nids.h or libnids.a not found in $withval" 1>&2; exit 1; } ++ { echo "configure: error: nids.h or libnids.so not found in $withval" 1>&2; exit 1; } + fi + ;; + esac diff --git a/package/dsniff/patches/patch-decode_c b/package/dsniff/patches/patch-decode_c new file mode 100644 index 000000000..9709c8a5a --- /dev/null +++ b/package/dsniff/patches/patch-decode_c @@ -0,0 +1,21 @@ +$Id$ +--- dsniff-2.4.orig/decode.c 2001-03-15 09:32:59.000000000 +0100 ++++ dsniff-2.4/decode.c 2007-01-23 00:20:48.000000000 +0100 +@@ -51,8 +51,6 @@ extern int decode_irc(u_char *, int, u_c + extern int decode_portmap(u_char *, int, u_char *, int); + extern int decode_mountd(u_char *, int, u_char *, int); + extern int decode_vrrp(u_char *, int, u_char *, int); +-extern int decode_ypserv(u_char *, int, u_char *, int); +-extern int decode_yppasswd(u_char *, int, u_char *, int); + + static struct decode decodes[] = { + { "hex", decode_hex }, +@@ -88,8 +86,6 @@ static struct decode decodes[] = { + { "irc", decode_irc }, + { "portmap", decode_portmap }, + { "mountd", decode_mountd }, +- { "ypserv", decode_ypserv }, +- { "yppasswd", decode_yppasswd }, + { NULL } + }; + diff --git a/package/dsniff/patches/patch-dns_c b/package/dsniff/patches/patch-dns_c new file mode 100644 index 000000000..3e939d450 --- /dev/null +++ b/package/dsniff/patches/patch-dns_c @@ -0,0 +1,681 @@ +$Id$ +--- dsniff-2.4.orig/dns.c 1970-01-01 00:00:00.000000000 +0100 ++++ dsniff-2.4/dns.c 2007-01-23 00:20:48.000000000 +0100 +@@ -0,0 +1,677 @@ ++/* ++ * Copyright (c) 1985, 1993 ++ * The Regents of the University of California. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 4. Neither the name of the University nor the names of its contributors ++ * may be used to endorse or promote products derived from this software ++ * without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ */ ++ ++/* ++ * Portions Copyright (c) 1993 by Digital Equipment Corporation. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies, and that ++ * the name of Digital Equipment Corporation not be used in advertising or ++ * publicity pertaining to distribution of the document or software without ++ * specific, written prior permission. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL ++ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT ++ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL ++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR ++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ */ ++ ++/* ++ * Portions Copyright (c) 1996-1999 by Internet Software Consortium. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS ++ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE ++ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL ++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR ++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ */ ++ ++/* ++ * Copyright (c) 1996,1999 by Internet Software Consortium. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS ++ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE ++ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL ++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR ++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ */ ++ ++/* ++ * ++ * DNS helper functions not implemented in uclibc ++ * ++ */ ++ ++ ++#include <sys/types.h> ++#include <sys/param.h> ++#include <netinet/in.h> ++#include <arpa/nameser.h> ++#include <ctype.h> ++#include <resolv.h> ++#include <stdio.h> ++#include <string.h> ++#include <unistd.h> ++ ++static const char digits[] = "0123456789"; ++ ++/* Forward. */ ++ ++static int special(int); ++static int printable(int); ++static int dn_find(const u_char *, const u_char *, ++ const u_char * const *, ++ const u_char * const *); ++ ++ ++/* ++ * ns_name_ntop(src, dst, dstsiz) ++ * Convert an encoded domain name to printable ascii as per RFC1035. ++ * return: ++ * Number of bytes written to buffer, or -1 (with errno set) ++ * notes: ++ * The root is returned as "." ++ * All other domains are returned in non absolute form ++ */ ++int ++ns_name_ntop(const u_char *src, char *dst, size_t dstsiz) { ++ const u_char *cp; ++ char *dn, *eom; ++ u_char c; ++ u_int n; ++ ++ cp = src; ++ dn = dst; ++ eom = dst + dstsiz; ++ ++ while ((n = *cp++) != 0) { ++ if ((n & NS_CMPRSFLGS) != 0) { ++ /* Some kind of compression pointer. */ ++ return (-1); ++ } ++ if (dn != dst) { ++ if (dn >= eom) { ++ return (-1); ++ } ++ *dn++ = '.'; ++ } ++ if (dn + n >= eom) { ++ return (-1); ++ } ++ for ((void)NULL; n > 0; n--) { ++ c = *cp++; ++ if (special(c)) { ++ if (dn + 1 >= eom) { ++ return (-1); ++ } ++ *dn++ = '\\'; ++ *dn++ = (char)c; ++ } else if (!printable(c)) { ++ if (dn + 3 >= eom) { ++ return (-1); ++ } ++ *dn++ = '\\'; ++ *dn++ = digits[c / 100]; ++ *dn++ = digits[(c % 100) / 10]; ++ *dn++ = digits[c % 10]; ++ } else { ++ if (dn >= eom) { ++ return (-1); ++ } ++ *dn++ = (char)c; ++ } ++ } ++ } ++ if (dn == dst) { ++ if (dn >= eom) { ++ return (-1); ++ } ++ *dn++ = '.'; ++ } ++ if (dn >= eom) { ++ return (-1); ++ } ++ *dn++ = '\0'; ++ return (dn - dst); ++} ++ ++/* ++ * ns_name_pton(src, dst, dstsiz) ++ * Convert a ascii string into an encoded domain name as per RFC1035. ++ * return: ++ * -1 if it fails ++ * 1 if string was fully qualified ++ * 0 is string was not fully qualified ++ * notes: ++ * Enforces label and domain length limits. ++ */ ++ ++int ++ns_name_pton(const char *src, u_char *dst, size_t dstsiz) { ++ u_char *label, *bp, *eom; ++ int c, n, escaped; ++ char *cp; ++ ++ escaped = 0; ++ bp = dst; ++ eom = dst + dstsiz; ++ label = bp++; ++ ++ while ((c = *src++) != 0) { ++ if (escaped) { ++ if ((cp = strchr(digits, c)) != NULL) { ++ n = (cp - digits) * 100; ++ if ((c = *src++) == 0 || ++ (cp = strchr(digits, c)) == NULL) { ++ return (-1); ++ } ++ n += (cp - digits) * 10; ++ if ((c = *src++) == 0 || ++ (cp = strchr(digits, c)) == NULL) { ++ return (-1); ++ } ++ n += (cp - digits); ++ if (n > 255) { ++ return (-1); ++ } ++ c = n; ++ } ++ escaped = 0; ++ } else if (c == '\\') { ++ escaped = 1; ++ continue; ++ } else if (c == '.') { ++ c = (bp - label - 1); ++ if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ ++ return (-1); ++ } ++ if (label >= eom) { ++ return (-1); ++ } ++ *label = c; ++ /* Fully qualified ? */ ++ if (*src == '\0') { ++ if (c != 0) { ++ if (bp >= eom) { ++ return (-1); ++ } ++ *bp++ = '\0'; ++ } ++ if ((bp - dst) > MAXCDNAME) { ++ return (-1); ++ } ++ return (1); ++ } ++ if (c == 0 || *src == '.') { ++ return (-1); ++ } ++ label = bp++; ++ continue; ++ } ++ if (bp >= eom) { ++ return (-1); ++ } ++ *bp++ = (u_char)c; ++ } ++ c = (bp - label - 1); ++ if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ ++ return (-1); ++ } ++ if (label >= eom) { ++ return (-1); ++ } ++ *label = c; ++ if (c != 0) { ++ if (bp >= eom) { ++ return (-1); ++ } ++ *bp++ = 0; ++ } ++ if ((bp - dst) > MAXCDNAME) { /* src too big */ ++ return (-1); ++ } ++ return (0); ++} ++ ++/* ++ * ns_name_ntol(src, dst, dstsiz) ++ * Convert a network strings labels into all lowercase. ++ * return: ++ * Number of bytes written to buffer, or -1 (with errno set) ++ * notes: ++ * Enforces label and domain length limits. ++ */ ++ ++int ++ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz) { ++ const u_char *cp; ++ u_char *dn, *eom; ++ u_char c; ++ u_int n; ++ ++ cp = src; ++ dn = dst; ++ eom = dst + dstsiz; ++ ++ while ((n = *cp++) != 0) { ++ if ((n & NS_CMPRSFLGS) != 0) { ++ /* Some kind of compression pointer. */ ++ return (-1); ++ } ++ *dn++ = n; ++ if (dn + n >= eom) { ++ return (-1); ++ } ++ for ((void)NULL; n > 0; n--) { ++ c = *cp++; ++ if (isupper(c)) ++ *dn++ = tolower(c); ++ else ++ *dn++ = c; ++ } ++ } ++ *dn++ = '\0'; ++ return (dn - dst); ++} ++ ++/* ++ * ns_name_unpack(msg, eom, src, dst, dstsiz) ++ * Unpack a domain name from a message, source may be compressed. ++ * return: ++ * -1 if it fails, or consumed octets if it succeeds. ++ */ ++int ++ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src, ++ u_char *dst, size_t dstsiz) ++{ ++ const u_char *srcp, *dstlim; ++ u_char *dstp; ++ int n, len, checked; ++ ++ len = -1; ++ checked = 0; ++ dstp = dst; ++ srcp = src; ++ dstlim = dst + dstsiz; ++ if (srcp < msg || srcp >= eom) { ++ return (-1); ++ } ++ /* Fetch next label in domain name. */ ++ while ((n = *srcp++) != 0) { ++ /* Check for indirection. */ ++ switch (n & NS_CMPRSFLGS) { ++ case 0: ++ /* Limit checks. */ ++ if (dstp + n + 1 >= dstlim || srcp + n >= eom) { ++ return (-1); ++ } ++ checked += n + 1; ++ *dstp++ = n; ++ memcpy(dstp, srcp, n); ++ dstp += n; ++ srcp += n; ++ break; ++ ++ case NS_CMPRSFLGS: ++ if (srcp >= eom) { ++ return (-1); ++ } ++ if (len < 0) ++ len = srcp - src + 1; ++ srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff)); ++ if (srcp < msg || srcp >= eom) { /* Out of range. */ ++ return (-1); ++ } ++ checked += 2; ++ /* ++ * Check for loops in the compressed name; ++ * if we've looked at the whole message, ++ * there must be a loop. ++ */ ++ if (checked >= eom - msg) { ++ return (-1); ++ } ++ break; ++ ++ default: ++ return (-1); /* flag error */ ++ } ++ } ++ *dstp = '\0'; ++ if (len < 0) ++ len = srcp - src; ++ return (len); ++} ++ ++/* ++ * ns_name_pack(src, dst, dstsiz, dnptrs, lastdnptr) ++ * Pack domain name 'domain' into 'comp_dn'. ++ * return: ++ * Size of the compressed name, or -1. ++ * notes: ++ * 'dnptrs' is an array of pointers to previous compressed names. ++ * dnptrs[0] is a pointer to the beginning of the message. The array ++ * ends with NULL. ++ * 'lastdnptr' is a pointer to the end of the array pointed to ++ * by 'dnptrs'. ++ * Side effects: ++ * The list of pointers in dnptrs is updated for labels inserted into ++ * the message as we compress the name. If 'dnptr' is NULL, we don't ++ * try to compress names. If 'lastdnptr' is NULL, we don't update the ++ * list. ++ */ ++int ++ns_name_pack(const u_char *src, u_char *dst, int dstsiz, ++ const u_char **dnptrs, const u_char **lastdnptr) ++{ ++ u_char *dstp; ++ const u_char **cpp, **lpp, *eob, *msg; ++ const u_char *srcp; ++ int n, l, first = 1; ++ ++ srcp = src; ++ dstp = dst; ++ eob = dstp + dstsiz; ++ lpp = cpp = NULL; ++ if (dnptrs != NULL) { ++ if ((msg = *dnptrs++) != NULL) { ++ for (cpp = dnptrs; *cpp != NULL; cpp++) ++ (void)NULL; ++ lpp = cpp; /* end of list to search */ ++ } ++ } else ++ msg = NULL; ++ ++ /* make sure the domain we are about to add is legal */ ++ l = 0; ++ do { ++ n = *srcp; ++ if ((n & NS_CMPRSFLGS) != 0) { ++ return (-1); ++ } ++ l += n + 1; ++ if (l > MAXCDNAME) { ++ return (-1); ++ } ++ srcp += n + 1; ++ } while (n != 0); ++ ++ /* from here on we need to reset compression pointer array on error */ ++ srcp = src; ++ do { ++ /* Look to see if we can use pointers. */ ++ n = *srcp; ++ if (n != 0 && msg != NULL) { ++ l = dn_find(srcp, msg, (const u_char * const *)dnptrs, ++ (const u_char * const *)lpp); ++ if (l >= 0) { ++ if (dstp + 1 >= eob) { ++ goto cleanup; ++ } ++ *dstp++ = (l >> 8) | NS_CMPRSFLGS; ++ *dstp++ = l % 256; ++ return (dstp - dst); ++ } ++ /* Not found, save it. */ ++ if (lastdnptr != NULL && cpp < lastdnptr - 1 && ++ (dstp - msg) < 0x4000 && first) { ++ *cpp++ = dstp; ++ *cpp = NULL; ++ first = 0; ++ } ++ } ++ /* copy label to buffer */ ++ if (n & NS_CMPRSFLGS) { /* Should not happen. */ ++ goto cleanup; ++ } ++ if (dstp + 1 + n >= eob) { ++ goto cleanup; ++ } ++ memcpy(dstp, srcp, n + 1); ++ srcp += n + 1; ++ dstp += n + 1; ++ } while (n != 0); ++ ++ if (dstp > eob) { ++cleanup: ++ if (msg != NULL) ++ *lpp = NULL; ++ return (-1); ++ } ++ return (dstp - dst); ++} ++ ++/* ++ * ns_name_uncompress(msg, eom, src, dst, dstsiz) ++ * Expand compressed domain name to presentation format. ++ * return: ++ * Number of bytes read out of `src', or -1 (with errno set). ++ * note: ++ * Root domain returns as "." not "". ++ */ ++int ++ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src, ++ char *dst, size_t dstsiz) ++{ ++ u_char tmp[NS_MAXCDNAME]; ++ int n; ++ ++ if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1) ++ return (-1); ++ if (ns_name_ntop(tmp, dst, dstsiz) == -1) ++ return (-1); ++ return (n); ++} ++ ++/* ++ * ns_name_compress(src, dst, dstsiz, dnptrs, lastdnptr) ++ * Compress a domain name into wire format, using compression pointers. ++ * return: ++ * Number of bytes consumed in `dst' or -1 (with errno set). ++ * notes: ++ * 'dnptrs' is an array of pointers to previous compressed names. ++ * dnptrs[0] is a pointer to the beginning of the message. ++ * The list ends with NULL. 'lastdnptr' is a pointer to the end of the ++ * array pointed to by 'dnptrs'. Side effect is to update the list of ++ * pointers for labels inserted into the message as we compress the name. ++ * If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr' ++ * is NULL, we don't update the list. ++ */ ++int ++ns_name_compress(const char *src, u_char *dst, size_t dstsiz, ++ const u_char **dnptrs, const u_char **lastdnptr) ++{ ++ u_char tmp[NS_MAXCDNAME]; ++ ++ if (ns_name_pton(src, tmp, sizeof tmp) == -1) ++ return (-1); ++ return (ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr)); ++} ++ ++/* ++ * special(ch) ++ * Thinking in noninternationalized USASCII (per the DNS spec), ++ * is this characted special ("in need of quoting") ? ++ * return: ++ * boolean. ++ */ ++static int ++special(int ch) { ++ switch (ch) { ++ case 0x22: /* '"' */ ++ case 0x2E: /* '.' */ ++ case 0x3B: /* ';' */ ++ case 0x5C: /* '\\' */ ++ /* Special modifiers in zone files. */ ++ case 0x40: /* '@' */ ++ case 0x24: /* '$' */ ++ return (1); ++ default: ++ return (0); ++ } ++} ++ ++/* ++ * printable(ch) ++ * Thinking in noninternationalized USASCII (per the DNS spec), ++ * is this character visible and not a space when printed ? ++ * return: ++ * boolean. ++ */ ++static int ++printable(int ch) { ++ return (ch > 0x20 && ch < 0x7f); ++} ++ ++/* ++ * Thinking in noninternationalized USASCII (per the DNS spec), ++ * convert this character to lower case if it's upper case. ++ */ ++static int ++mklower(int ch) { ++ if (ch >= 0x41 && ch <= 0x5A) ++ return (ch + 0x20); ++ return (ch); ++} ++ ++/* ++ * dn_find(domain, msg, dnptrs, lastdnptr) ++ * Search for the counted-label name in an array of compressed names. ++ * return: ++ * offset from msg if found, or -1. ++ * notes: ++ * dnptrs is the pointer to the first name on the list, ++ * not the pointer to the start of the message. ++ */ ++static int ++dn_find(const u_char *domain, const u_char *msg, ++ const u_char * const *dnptrs, ++ const u_char * const *lastdnptr) ++{ ++ const u_char *dn, *cp, *sp; ++ const u_char * const *cpp; ++ u_int n; ++ ++ for (cpp = dnptrs; cpp < lastdnptr; cpp++) { ++ sp = *cpp; ++ /* ++ * terminate search on: ++ * root label ++ * compression pointer ++ * unusable offset ++ */ ++ while (*sp != 0 && (*sp & NS_CMPRSFLGS) == 0 && ++ (sp - msg) < 0x4000) { ++ dn = domain; ++ cp = sp; ++ while ((n = *cp++) != 0) { ++ /* ++ * check for indirection ++ */ ++ switch (n & NS_CMPRSFLGS) { ++ case 0: /* normal case, n == len */ ++ if (n != *dn++) ++ goto next; ++ for ((void)NULL; n > 0; n--) ++ if (mklower(*dn++) != ++ mklower(*cp++)) ++ goto next; ++ /* Is next root for both ? */ ++ if (*dn == '\0' && *cp == '\0') ++ return (sp - msg); ++ if (*dn) ++ continue; ++ goto next; ++ ++ case NS_CMPRSFLGS: /* indirection */ ++ cp = msg + (((n & 0x3f) << 8) | *cp); ++ break; ++ ++ default: /* illegal type */ ++ return (-1); ++ } ++ } ++ next: ++ sp += *sp + 1; ++ } ++ } ++ return (-1); ++} ++ ++/* ++ * Expand compressed domain name 'comp_dn' to full domain name. ++ * 'msg' is a pointer to the begining of the message, ++ * 'eomorig' points to the first location after the message, ++ * 'exp_dn' is a pointer to a buffer of size 'length' for the result. ++ * Return size of compressed name or -1 if there was an error. ++ */ ++int ++dn_expand(const u_char *msg, const u_char *eom, const u_char *src, ++ char *dst, int dstsiz) ++{ ++ int n = ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz); ++ ++ if (n > 0 && dst[0] == '.') ++ dst[0] = '\0'; ++ return (n); ++} ++ ++/* ++ * Pack domain name 'exp_dn' in presentation form into 'comp_dn'. ++ * Return the size of the compressed name or -1. ++ * 'length' is the size of the array pointed to by 'comp_dn'. ++ */ ++int ++dn_comp(const char *src, u_char *dst, int dstsiz, ++ u_char **dnptrs, u_char **lastdnptr) ++{ ++ return (ns_name_compress(src, dst, (size_t)dstsiz, ++ (const u_char **)dnptrs, ++ (const u_char **)lastdnptr)); ++} ++ diff --git a/package/dsniff/patches/patch-dsniff_services b/package/dsniff/patches/patch-dsniff_services new file mode 100644 index 000000000..7b4827426 --- /dev/null +++ b/package/dsniff/patches/patch-dsniff_services @@ -0,0 +1,9 @@ +$Id$ +--- dsniff-2.4.orig/dsniff.services 2000-12-15 21:10:58.000000000 +0100 ++++ dsniff-2.4/dsniff.services 2007-01-23 00:20:48.000000000 +0100 +@@ -66,5 +66,3 @@ napster 8888/tcp + aim 9898/tcp + pcanywhere 65301/tcp + mountd 100005/rpc +-ypserv 100004/rpc +-yppasswd 100009/rpc diff --git a/package/dsniff/patches/patch-msgsnarf_c b/package/dsniff/patches/patch-msgsnarf_c new file mode 100644 index 000000000..4bdef8a83 --- /dev/null +++ b/package/dsniff/patches/patch-msgsnarf_c @@ -0,0 +1,11 @@ +$Id$ +--- dsniff-2.4.orig/msgsnarf.c 2001-03-15 09:33:04.000000000 +0100 ++++ dsniff-2.4/msgsnarf.c 2007-01-23 00:20:48.000000000 +0100 +@@ -23,6 +23,7 @@ + #include <nids.h> + #include <pcap.h> + #include <pcaputil.h> ++#include <time.h> + + #include "buf.h" + #include "decode.h" diff --git a/package/dsniff/patches/patch-record_c b/package/dsniff/patches/patch-record_c new file mode 100644 index 000000000..cd63e0969 --- /dev/null +++ b/package/dsniff/patches/patch-record_c @@ -0,0 +1,151 @@ +$Id$ +--- dsniff-2.4.orig/record.c 2001-03-15 09:33:04.000000000 +0100 ++++ dsniff-2.4/record.c 2007-01-23 00:20:48.000000000 +0100 +@@ -15,12 +15,7 @@ + #include <stdio.h> + #include <time.h> + #include <md5.h> +-#ifdef HAVE_DB_185_H +-#define DB_LIBRARY_COMPATIBILITY_API +-#include <db_185.h> +-#elif HAVE_DB_H +-#include <db.h> +-#endif ++#include <gdbm.h> + #include <libnet.h> + + #include "options.h" +@@ -37,7 +32,7 @@ struct rec { + struct netobj data; + }; + +-static DB *db; ++GDBM_FILE dbf; + + static int + xdr_rec(XDR *xdrs, struct rec *rec) +@@ -64,7 +59,6 @@ record_print(struct rec *rec) + + tm = localtime(&rec->time); + strftime(tstr, sizeof(tstr), "%x %X", tm); +- + srcp = libnet_host_lookup(rec->src, Opt_dns); + dstp = libnet_host_lookup(rec->dst, Opt_dns); + +@@ -89,10 +83,10 @@ record_print(struct rec *rec) + fflush(stdout); + } + +-static DBT * ++static datum + record_hash(struct rec *rec) + { +- static DBT key; ++ static datum key; + static u_char hash[16]; + MD5_CTX ctx; + +@@ -105,16 +99,16 @@ record_hash(struct rec *rec) + MD5Update(&ctx, rec->data.n_bytes, rec->data.n_len); + MD5Final(hash, &ctx); + +- key.data = hash; +- key.size = sizeof(hash); ++ key.dptr = hash; ++ key.dsize = sizeof(hash); + +- return (&key); ++ return (key); + } + + static int + record_save(struct rec *rec) + { +- DBT *key, data; ++ datum key, data; + XDR xdrs; + u_char buf[2048]; + +@@ -123,15 +117,15 @@ record_save(struct rec *rec) + if (!xdr_rec(&xdrs, rec)) + return (0); + +- data.data = buf; +- data.size = xdr_getpos(&xdrs); ++ data.dptr = buf; ++ data.dsize = xdr_getpos(&xdrs); + + xdr_destroy(&xdrs); + + key = record_hash(rec); + +- if (db->put(db, key, &data, R_NOOVERWRITE) == 0) +- db->sync(db, 0); ++ if (gdbm_store(dbf, key, data, GDBM_INSERT) == 0) ++ gdbm_sync(dbf); + + return (1); + } +@@ -139,18 +133,22 @@ record_save(struct rec *rec) + void + record_dump(void) + { +- DBT key, data; ++ datum nextkey, key, content; + XDR xdrs; + struct rec rec; + +- while (db->seq(db, &key, &data, R_NEXT) == 0) { ++ key = gdbm_firstkey(dbf); ++ while (key.dptr) { ++ nextkey = gdbm_nextkey(dbf, key); ++ content = gdbm_fetch(dbf, key); + memset(&rec, 0, sizeof(rec)); +- xdrmem_create(&xdrs, data.data, data.size, XDR_DECODE); +- ++ xdrmem_create(&xdrs, content.dptr, content.dsize, XDR_DECODE); + if (xdr_rec(&xdrs, &rec)) { + record_print(&rec); + } + xdr_destroy(&xdrs); ++ free(key.dptr); ++ key = nextkey; + } + } + +@@ -158,16 +156,23 @@ int + record_init(char *file) + { + int flags, mode; +- ++ // needed for gdbm_open, which does not have the option to create ++ // a database in memory ++ if(file == NULL) { ++ char *record_file = "/tmp/.dsniff.db"; ++ file = record_file; ++ } ++ + if (Opt_read) { +- flags = O_RDONLY; ++ flags = GDBM_READER; + mode = 0; + } + else { +- flags = O_RDWR|O_CREAT; ++ flags = GDBM_WRCREAT; + mode = S_IRUSR|S_IWUSR; + } +- if ((db = dbopen(file, flags, mode, DB_BTREE, NULL)) == NULL) ++ ++ if ((dbf = gdbm_open(file, 1024, flags, mode, NULL)) == NULL) + return (0); + + return (1); +@@ -206,6 +211,6 @@ record(in_addr_t src, in_addr_t dst, int + void + record_close(void) + { +- db->close(db); ++ gdbm_close(dbf); + } + diff --git a/package/dsniff/patches/patch-ssh_c b/package/dsniff/patches/patch-ssh_c new file mode 100644 index 000000000..2bf20f1f6 --- /dev/null +++ b/package/dsniff/patches/patch-ssh_c @@ -0,0 +1,46 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- dsniff-2.4.orig/ssh.c 2001-03-15 09:33:04.000000000 +0100 ++++ dsniff-2.4/ssh.c 2009-05-09 23:17:07.000000000 +0200 +@@ -331,12 +331,14 @@ SSH_accept(SSH *ssh) + ssh->encrypt = des3_encrypt; + ssh->decrypt = des3_decrypt; + } ++#ifndef OPENSSL_NO_BF + else if (cipher == SSH_CIPHER_BLOWFISH) { + ssh->estate = blowfish_init(ssh->sesskey,sizeof(ssh->sesskey)); + ssh->dstate = blowfish_init(ssh->sesskey,sizeof(ssh->sesskey)); + ssh->encrypt = blowfish_encrypt; + ssh->decrypt = blowfish_decrypt; + } ++#endif + + /* Send verification. */ + msg[0] = SSH_SMSG_SUCCESS; +@@ -461,18 +463,20 @@ SSH_connect(SSH *ssh) + return (-1); + } + /* Set cipher. */ +- if (cipher == SSH_CIPHER_BLOWFISH) { +- ssh->estate = blowfish_init(ssh->sesskey,sizeof(ssh->sesskey)); +- ssh->dstate = blowfish_init(ssh->sesskey,sizeof(ssh->sesskey)); +- ssh->encrypt = blowfish_encrypt; +- ssh->decrypt = blowfish_decrypt; +- } +- else if (cipher == SSH_CIPHER_3DES) { ++ if (cipher == SSH_CIPHER_3DES) { + ssh->estate = des3_init(ssh->sesskey, sizeof(ssh->sesskey)); + ssh->dstate = des3_init(ssh->sesskey, sizeof(ssh->sesskey)); + ssh->encrypt = des3_encrypt; + ssh->decrypt = des3_decrypt; + } ++#ifndef OPENSSL_NO_BF ++ else if (cipher == SSH_CIPHER_BLOWFISH) { ++ ssh->estate = blowfish_init(ssh->sesskey,sizeof(ssh->sesskey)); ++ ssh->dstate = blowfish_init(ssh->sesskey,sizeof(ssh->sesskey)); ++ ssh->encrypt = blowfish_encrypt; ++ ssh->decrypt = blowfish_decrypt; ++ } ++#endif + /* Get server response. */ + if ((i = SSH_recv(ssh, pkt, sizeof(pkt))) <= 0) { + warn("SSH_recv"); diff --git a/package/dsniff/patches/patch-sshcrypto_c b/package/dsniff/patches/patch-sshcrypto_c new file mode 100644 index 000000000..981aadb53 --- /dev/null +++ b/package/dsniff/patches/patch-sshcrypto_c @@ -0,0 +1,43 @@ +$Id$ +--- dsniff-2.4.orig/sshcrypto.c 2001-03-15 09:33:04.000000000 +0100 ++++ dsniff-2.4/sshcrypto.c 2009-05-09 23:13:59.000000000 +0200 +@@ -14,6 +14,10 @@ + + #include <sys/types.h> + #include <openssl/ssl.h> ++#ifndef OPENSSL_NO_BF ++#include <openssl/blowfish.h> ++#endif ++#include <openssl/des.h> + + #include <err.h> + #include <stdio.h> +@@ -21,10 +25,12 @@ + + #include "sshcrypto.h" + ++#ifndef OPENSSL_NO_BF + struct blowfish_state { + struct bf_key_st key; + u_char iv[8]; + }; ++#endif + + struct des3_state { + des_key_schedule k1, k2, k3; +@@ -106,6 +112,7 @@ swap_bytes(const u_char *src, u_char *ds + } + } + ++#ifndef OPENSSL_NO_BF + void * + blowfish_init(u_char *sesskey, int len) + { +@@ -143,6 +150,7 @@ blowfish_decrypt(u_char *src, u_char *ds + BF_DECRYPT); + swap_bytes(dst, dst, len); + } ++#endif + + /* XXX - SSH1's weirdo 3DES... */ + void * diff --git a/package/dsniff/patches/patch-sshow_c b/package/dsniff/patches/patch-sshow_c new file mode 100644 index 000000000..25e94ef1c --- /dev/null +++ b/package/dsniff/patches/patch-sshow_c @@ -0,0 +1,38 @@ +$Id$ +--- dsniff-2.4.orig/sshow.c 2001-03-19 07:52:15.000000000 +0100 ++++ dsniff-2.4/sshow.c 2008-10-10 14:53:48.000000000 +0200 +@@ -15,6 +15,7 @@ + + #include <sys/types.h> + #include <sys/times.h> ++#include <time.h> + + #include <netinet/in_systm.h> + #include <netinet/in.h> +@@ -222,7 +223,7 @@ client_to_server(struct tcp_stream *ts, + if (debug) + printf("- %s -> %s: DATA (%s bytes, %.2f seconds)\n", + s_saddr(ts), s_daddr(ts), s_range(plain_range), +- (float)delay / CLK_TCK); ++ (float)delay / CLOCKS_PER_SEC); + if (debug > 1) + print_data(&ts->server, cipher_size); + +@@ -270,7 +271,7 @@ server_to_client(struct tcp_stream *ts, + if (debug) + printf("- %s <- %s: DATA (%s bytes, %.2f seconds)\n", + s_saddr(ts), s_daddr(ts), s_range(plain_range), +- (float)delay / CLK_TCK); ++ (float)delay / CLOCKS_PER_SEC); + if (debug > 1) + print_data(&ts->client, cipher_size); + +@@ -299,7 +300,7 @@ server_to_client(struct tcp_stream *ts, + + if (session->state == 1 && + #ifdef USE_TIMING +- now - get_history(session, 2)->timestamp >= CLK_TCK && ++ now - get_history(session, 2)->timestamp >= CLOCKS_PER_SEC && + #endif + session->protocol == 1 && + (session->history.directions & 7) == 5 && |