OpenBSD CVS

CVS log for src/usr.sbin/tcpdump/print-ipsec.c


[BACK] Up to [local] / src / usr.sbin / tcpdump

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.27 / (download) - annotate - [select for diffs], Mon Nov 29 18:50:16 2021 UTC (2 years, 6 months ago) by tb
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, HEAD
Changes since 1.26: +16 -9 lines
Diff to previous 1.26 (colored)

tcpdump: convert print-ipsec to a EVP_CIPHER_CTX on the heap.

Fix and add some error checking while there.

ok deraadt

Revision 1.26 / (download) - annotate - [select for diffs], Fri Jan 24 22:46:37 2020 UTC (4 years, 4 months ago) by procter
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7
Changes since 1.25: +8 -7 lines
Diff to previous 1.25 (colored)

- (void)printf() -> printf(); the cast adds clutter for little value.
- fprintf(stdout, ...) -> printf()
- fputs(x, stdout) -> printf(); for consistency.
fputs is twice as fast on atom x5-Z8300@1.44GHz but Amdahl sees a pure printf
tcpdump only 2% slower than a pure fputs (for constant strings) tcpdump
to /dev/null across a 20MB/~170k packet pcap file.

ok dlg@ for fputs and ok tedu@ krw@ deraadt@ a2k19 for the rest

Revision 1.25 / (download) - annotate - [select for diffs], Mon Oct 22 16:12:45 2018 UTC (5 years, 7 months ago) by kn
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6, OPENBSD_6_5_BASE, OPENBSD_6_5
Changes since 1.24: +2 -11 lines
Diff to previous 1.24 (colored)

Remove #ifdef INET6

There's not reason to build without IPv6 support, `-U INET6' builds were
broken anyway.

Fix an empty redefine for IPPROTO_IPV6 in print-ip.c while here.

No object change on amd64 and sparc64 with clang, gcc compiles differently
but behaviour stays the same.

OK denis deraadt

Revision 1.24 / (download) - annotate - [select for diffs], Fri Jul 6 05:47:22 2018 UTC (5 years, 10 months ago) by dlg
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.23: +3 -21 lines
Diff to previous 1.23 (colored)

Rework UDP parsing, particularly around IP addresses.

This originally started as trying to put a consistent space between
the UDP header information and the payload parsing, but while doing
that I noticed inconsistent IPv4 vs IPv6 handling.

Apart from the default "srcip.srcport > dstip.dstpor" output, all
the other places that IP addresses were printed assumed IPv4. It
looks like it is possible that udp_print() can be called without
an IP header, which made these blind IPv4 prints turn into NULL
derefs.

This fixes the problem above by only having a single place that
prints the addresses out, and makes sure to get the difference
between IPv4, IPv6 and no IP correct.

This changes how the checksum is calculated. It incrementally builds
the UDP checksum by feeding the IPv4 and v6 addresses in separately,
then using common code for the rest of the pseudo header and actual
payload.

Lastly, this does make printing the space between the UDP header
and its payload consistent. The UDP code is now responsible for
adding a space after itself so the payload parsers don't have to.
They got it wrong in some cases anyway, so this should be a lot
more uniform.

help and ok sthen@

Revision 1.23 / (download) - annotate - [select for diffs], Mon Nov 16 00:16:39 2015 UTC (8 years, 6 months ago) by mmcc
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1, OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.22: +4 -7 lines
Diff to previous 1.22 (colored)

Remove remaining instances of the register keyword.

ok deraadt@

Revision 1.22 / (download) - annotate - [select for diffs], Sun Oct 11 03:23:28 2015 UTC (8 years, 7 months ago) by guenther
Branch: MAIN
Changes since 1.21: +3 -2 lines
Diff to previous 1.21 (colored)

The <ctype.h> is*() interfaces expect EOF or an unsigned char; cast to
(unsigned char) as required

found by Michael McConville (mmcconv1 (at) sccs.swarthmore.edu) w/Coccinelle

Revision 1.21 / (download) - annotate - [select for diffs], Sun Mar 29 14:09:29 2015 UTC (9 years, 2 months ago) by bluhm
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8
Changes since 1.20: +2 -2 lines
Diff to previous 1.20 (colored)

Most packets generate one line in tcpdump.  For AH and RIP there
was an extra line without benefit.  Remove the new-line in printf
to make parsing easier.
OK lteo@ mikeb@

Revision 1.20 / (download) - annotate - [select for diffs], Fri Jan 16 06:40:21 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.19: +1 -2 lines
Diff to previous 1.19 (colored)

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible.  Annotate <sys/param.h> lines with their current reasons.  Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc.  Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution.  These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Revision 1.19 / (download) - annotate - [select for diffs], Thu Aug 14 12:44:44 2014 UTC (9 years, 9 months ago) by mpi
Branch: MAIN
Changes since 1.18: +1 -3 lines
Diff to previous 1.18 (colored)

No use for <netinet/in_systm.h> nor <netinet/tcpip.h>.

Revision 1.18 / (download) - annotate - [select for diffs], Sat Jan 11 04:35:52 2014 UTC (10 years, 4 months ago) by lteo
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.17: +4 -3 lines
Diff to previous 1.17 (colored)

Make icmp_print() accept the length variable, which is the length of the
packet without the IP header.  This is needed by the next commit that
will allow tcpdump to detect bad ICMP checksums.

Related functions like {tcp,udp,icmp6}_print() already accept this
length variable, so this change makes icmp_print() consistent with
them as well.

This commit makes no functional change to tcpdump itself.

OK florian@

Revision 1.17 / (download) - annotate - [select for diffs], Thu May 3 10:17:23 2012 UTC (12 years, 1 month ago) by mikeb
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4, OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2
Changes since 1.16: +3 -3 lines
Diff to previous 1.16 (colored)

esp/ah sequence number is unsigned and should be printed as such;
ok haesbaert, sthen, yasuoka, mpf

Revision 1.16 / (download) - annotate - [select for diffs], Tue Apr 6 16:01:57 2010 UTC (14 years, 2 months ago) by jsg
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.15: +4 -3 lines
Diff to previous 1.15 (colored)

Add support for decoding MLDv2 initially from tcpdump.org via FreeBSD,
cleaned up to be less gross after some suggestions from stsp.

ok stsp@

Revision 1.15 / (download) - annotate - [select for diffs], Wed Nov 11 13:23:01 2009 UTC (14 years, 6 months ago) by jsg
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.14: +4 -2 lines
Diff to previous 1.14 (colored)

Don't leak memory in error case.
Found by parfait.

Revision 1.14 / (download) - annotate - [select for diffs], Tue Oct 27 23:59:55 2009 UTC (14 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.13: +1 -6 lines
Diff to previous 1.13 (colored)

rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and
unmaintainable).  these days, people use source.  these id's do not provide
any benefit, and do hurt the small install media
(the 33,000 line diff is essentially mechanical)
ok with the idea millert, ok dms

Revision 1.13 / (download) - annotate - [select for diffs], Wed Feb 18 01:53:06 2009 UTC (15 years, 3 months ago) by mcbride
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.12: +3 -3 lines
Diff to previous 1.12 (colored)

Print spi in lowercase hex for consistency with print-enc.c and ipsecctl.

ok hshoexer msf

Revision 1.12 / (download) - annotate - [select for diffs], Sun Oct 7 16:41:05 2007 UTC (16 years, 7 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_4_BASE, OPENBSD_4_4, OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 (colored)

trash $Header goo which is just annoying; 5595

Revision 1.11 / (download) - annotate - [select for diffs], Tue Dec 26 18:22:30 2006 UTC (17 years, 5 months ago) by moritz
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2, OPENBSD_4_1_BASE, OPENBSD_4_1
Changes since 1.10: +3 -3 lines
Diff to previous 1.10 (colored)

Fix truncation check by directly comparing both values and don't
compare the unsigned value of the subtraction against <= 0.

ok krw@ ray@

Revision 1.10 / (download) - annotate - [select for diffs], Tue Dec 26 06:24:48 2006 UTC (17 years, 5 months ago) by itojun
Branch: MAIN
Changes since 1.9: +9 -2 lines
Diff to previous 1.9 (colored)

print icmpv6 inside security header (ah/esp).

Revision 1.9 / (download) - annotate - [select for diffs], Tue Sep 19 14:25:04 2006 UTC (17 years, 8 months ago) by naddy
Branch: MAIN
Changes since 1.8: +34 -8 lines
Diff to previous 1.8 (colored)

enable ESP and AH dissectors over IPv6; ok mpf@ (at k2k6)

Revision 1.8 / (download) - annotate - [select for diffs], Thu Jul 17 08:45:37 2003 UTC (20 years, 10 months ago) by markus
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE, OPENBSD_4_0, OPENBSD_3_9_BASE, OPENBSD_3_9, OPENBSD_3_8_BASE, OPENBSD_3_8, OPENBSD_3_7_BASE, OPENBSD_3_7, OPENBSD_3_6_BASE, OPENBSD_3_6, OPENBSD_3_5_BASE, OPENBSD_3_5, OPENBSD_3_4_BASE, OPENBSD_3_4
Changes since 1.7: +141 -3 lines
Diff to previous 1.7 (colored)

add support for ESP decryption; ok deraadt@; feedback mickey@;
many manpage fixes from jmc@

Revision 1.7 / (download) - annotate - [select for diffs], Thu Feb 20 23:39:20 2003 UTC (21 years, 3 months ago) by jason
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE, OPENBSD_3_3
Changes since 1.6: +54 -13 lines
Diff to previous 1.6 (colored)

add printing of ipcomp, and while in the neighborhood, make ah/esp actually
check the length of the data

Revision 1.6 / (download) - annotate - [select for diffs], Wed Jun 27 03:34:44 2001 UTC (22 years, 11 months ago) by angelos
Branch: MAIN
CVS Tags: OPENBSD_3_2_BASE, OPENBSD_3_2, OPENBSD_3_1_BASE, OPENBSD_3_1, OPENBSD_3_0_BASE, OPENBSD_3_0
Changes since 1.5: +5 -5 lines
Diff to previous 1.5 (colored)

"IPSec" -> "IPsec" (jsyn@nthought.com)

Revision 1.5 / (download) - annotate - [select for diffs], Tue Oct 3 14:21:56 2000 UTC (23 years, 8 months ago) by ho
Branch: MAIN
CVS Tags: OPENBSD_2_9_BASE, OPENBSD_2_9, OPENBSD_2_8_BASE, OPENBSD_2_8
Changes since 1.4: +9 -5 lines
Diff to previous 1.4 (colored)

Compile with -Wall. Add $OpenBSD$. (jakob@ ok)

Revision 1.4 / (download) - annotate - [select for diffs], Wed Apr 26 21:35:41 2000 UTC (24 years, 1 month ago) by jakob
Branch: MAIN
CVS Tags: OPENBSD_2_7_BASE, OPENBSD_2_7
Changes since 1.3: +1 -4 lines
Diff to previous 1.3 (colored)

INET6
DHCP/BOOTP
tcp & udp checksum detection
numerous bugfixes

Revision 1.3 / (download) - annotate - [select for diffs], Fri Oct 29 09:44:07 1999 UTC (24 years, 7 months ago) by ho
Branch: MAIN
Changes since 1.2: +55 -4 lines
Diff to previous 1.2 (colored)

Print AH payload data (with -v). jakob@ ok.

Revision 1.2 / (download) - annotate - [select for diffs], Tue Sep 21 20:54:58 1999 UTC (24 years, 8 months ago) by jakob
Branch: MAIN
CVS Tags: OPENBSD_2_6_BASE, OPENBSD_2_6
Changes since 1.1: +5 -5 lines
Diff to previous 1.1 (colored)

print ESP/AH packet length; <ho@openbsd.org>

Revision 1.1 / (download) - annotate - [select for diffs], Wed Jul 28 20:41:36 1999 UTC (24 years, 10 months ago) by jakob
Branch: MAIN

-  Merge some changes from tcpdump 3.4
   -a flag; attempt to convert network and broadcast addresses to names
   Improved signal handling
   Miscellaneous fixes and typos
   OSPF MD5 authentication support

-  -X flag; emacs-hexl print (including ascii)

-  Add ECN bits to TCP and IP headers

-  IKE & IPsec (ESP & AH) support

OK deraadt@

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.