Commit Graph

66 Commits

Author SHA1 Message Date
Jaap Keuter 55a1bf9af6 Fix build without HAVE_LIBGCRYPT.
svn path=/trunk/; revision=28097
2009-04-20 20:27:16 +00:00
Jaap Keuter 03f2402950 From Naoyoshi Ueda:
Currently wireshark has ability to decrypt ISAKMP IKEv1 packets, but not IKEv2
packets. With attached patch decryption of IKEv2 packets is now passible. 

svn path=/trunk/; revision=28089
2009-04-20 05:40:58 +00:00
Bill Meier 4f34bb9b15 From Jakub Zawadzki: g_gnprintf & etc: Use size of buffer [not size -1];
- As suggested actually use sizeof(...) rather than a numeric constant.
  - g_snprintf() and g_vsnprintf() since glib 1.3.12 do not return -1.

svn path=/trunk/; revision=27772
2009-03-18 15:03:46 +00:00
Gerald Combs 6d04f793f0 Back out r27047 and r27053.
svn path=/trunk/; revision=27062
2008-12-19 17:39:52 +00:00
Gerald Combs fc71188963 Update calls to proto_tree_add_bytes_format to reflect r27047.
svn path=/trunk/; revision=27053
2008-12-18 20:19:49 +00:00
Anders Broman 43d927f15e From Alex Badea:
Migrate ISAKMP packet decryption from libnettle to libgcrypt

svn path=/trunk/; revision=25438
2008-06-10 05:39:58 +00:00
Jeff Morriss a5cee04fad Move the file utility functions from wiretap to libwsutil so that
libwireshark (and the plugins using those functions) do not depend on
wiretap on Windows.

While doing that, rename the eth_* functions to ws_*.

svn path=/trunk/; revision=25354
2008-05-22 15:46:27 +00:00
Jörg Mayer bbf0b3f351 Add another vendor id
svn path=/trunk/; revision=24160
2008-01-22 02:05:21 +00:00
Jörg Mayer e47e42e10e Add VID VID_draft_ietf_ipsec_nat_t_ike_01, move
VID_draft_ietf_ipsec_nat_t_ike_03 a bit down.

svn path=/trunk/; revision=23391
2007-11-07 18:35:00 +00:00
Jörg Mayer 9491dc16f1 Print VendorID string in payload summary line
svn path=/trunk/; revision=23388
2007-11-07 17:23:28 +00:00
Jaap Keuter 64cc7052f9 from Gisele Vanem:
This needs file_util.h if HAVE_LIBNETTLE is defined.

svn path=/trunk/; revision=23294
2007-10-28 11:25:34 +00:00
Anders Broman 1950ffc214 Apply the small performance enhancment patches for:
- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster.
Replace 
- col_append_fstr() with faster  col_append_str() 
- col_add_str() with col_set_str()
when it's safe

svn path=/trunk/; revision=23252
2007-10-23 05:50:00 +00:00
Jeff Morriss 853e791444 Change more fopen() to eth_fopen() to finish fixing bug 1827:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1827

Update README.developer to tell developers not to use fopen() and friends
directly.

svn path=/trunk/; revision=23206
2007-10-16 15:43:18 +00:00
Jörg Mayer d2f6d740b0 Move the fragmentation info and the defragmented isakmp message
to the top level tree.

svn path=/trunk/; revision=22873
2007-09-14 11:50:58 +00:00
Jörg Mayer 1daaee6d0f Small cleanup
svn path=/trunk/; revision=22872
2007-09-14 09:59:19 +00:00
Jörg Mayer d582da8fcd - Resassemble Cisco ike fragementation
- Rename some variables from ike to isakmp to make
  things consistent (not right, just consistent)

svn path=/trunk/; revision=22865
2007-09-13 20:06:41 +00:00
Jörg Mayer 8b247815f3 If we find a fragmented ike packet, dissect the stuff
that fits into the first fragment.

svn path=/trunk/; revision=22851
2007-09-12 06:31:09 +00:00
Jörg Mayer 75ac707c29 - Slightly improved dissection of Cisco's fragmented ISAKMP.
- Corrected misdetection of CISCO-UNITY VID.

svn path=/trunk/; revision=22828
2007-09-08 13:22:27 +00:00
Jörg Mayer bc422bc08b Undo last commit. It's not yet clear to my why isakmp traffic
after nat-t isn't matched by a isakmp display filter, but this
approach wrong.

svn path=/trunk/; revision=22670
2007-08-26 18:39:34 +00:00
Jörg Mayer dcf3c05d5e Isakmp runs over port 4500 (natt) as well
svn path=/trunk/; revision=22669
2007-08-26 18:21:52 +00:00
Jörg Mayer 1f06d65424 Decode certificates
svn path=/trunk/; revision=22626
2007-08-24 07:10:33 +00:00
Jeff Morriss 7a57f956b8 Change COPY_ADDRESS to SE_COPY_ADDRESS: all of these appear to have "seasonal" scope (e.g., they are used in conversations or similar).
svn path=/trunk/; revision=22573
2007-08-21 21:23:37 +00:00
Anders Broman c01f382974 Second step in introducing asn context to BER dissectors just like in PER.
svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
Sebastien Tandel 68ad2f4b9b fix MacOSX gcc-3.3 warnings about unused tfs/value_string variables
most have been tagged unused (few have been deleted if dissector has not been
modified since a long time)

move packet-ssl-utils.c to DISSECTOR_SRC


svn path=/trunk/; revision=21431
2007-04-14 14:01:53 +00:00
Anders Broman d61e373bb4 As ponted out by Stig Bjørlykke change a whole bunch of dissector_handle_t to static.
svn path=/trunk/; revision=20062
2006-12-07 20:34:08 +00:00
Anders Broman 9aea451086 Dissect EAP inside ISAKMP update some strings from IANA.
(fix bug http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=777)

svn path=/trunk/; revision=20054
2006-12-06 22:03:45 +00:00
Anders Broman 2861b22148 Update some value_strings
svn path=/trunk/; revision=19355
2006-09-29 05:51:44 +00:00
Ronnie Sahlberg 9fddfa2777 fix for the typo in bug 1094
svn path=/trunk/; revision=19163
2006-09-06 08:36:13 +00:00
Jaap Keuter db31d4a72f Fix for bug 1093, as proposed by Atsushi Fukumoto
svn path=/trunk/; revision=19152
2006-09-05 12:22:44 +00:00
Jörg Mayer b58714b375 Eric Fung <efung@certicom.com>
A very tiny patch that corrects decoding of the Next Payload field in
the IKEv2 header. RFC 4306, Sec 3.2 says that a payload type of 0
means "No Next Payload" and not RESERVED. The patch just uses the
same string the dissector uses for IKEv1, namely, "NONE".


svn path=/trunk/; revision=18914
2006-08-15 18:16:56 +00:00
Jörg Mayer f2a2bed08f efung@certicom.com:
Patch adding MOBIKE support to packet-isakmp.c

svn path=/trunk/; revision=18862
2006-08-10 03:11:33 +00:00
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Jaap Keuter 583f9e5436 Fix for bug 875. Adding description for groups 19-26.
svn path=/trunk/; revision=17895
2006-04-18 11:52:28 +00:00
Guy Harris 83aad499b4 Squelch some compiler warnings.
svn path=/trunk/; revision=17250
2006-02-11 09:54:10 +00:00
Gerald Combs acfe071eb6 Add decryption support. For this to work, you MUST link against
the Nettle library and specify a Pluto log file in the preferences.
The Pluto log MUST include the encryption key used in each phase.

Add filters for many fields (and get rid of a lot of
proto_tree_add_text()s in the process).

Fix up whitespace.

Sponsored by CableLabs.

svn path=/trunk/; revision=17229
2006-02-09 17:32:14 +00:00
Jörg Mayer 1900bf87fc done:
packet-ntp.c: Rather confused and incorrect use of g_snprintf return value
packet-pim.c: whitespace change
packet-icmpv6.c: g_snprintf takes trailing \0 into account, fix off by 1 error
packet-clnp.c: Fix incorrect use of g_snprintf return value
packet-isakmp.c: g_snprintf takes trailing \0 into account
packet-tr.c: Fix incorrect use of g_snprintf return value
packet-radius.c: Fix incorrect use of g_snprintf return value
packet-radius.h: constify a string variable
packet-ldap.c: The return value isn't needed, so don't use it incorrectly
packet-tcp.c: Fix incorrect use of g_snprintf return value
packet-windows-common.c: Remove unneeded DISSECTOR_ASSERT
packet-smb-sidsnooping.c: g_snprintf takes trailing \0 into account
packet-pvfs2.c: g_snprintf takes trailing \0 into account
packet-ptp.c: Remove #include snprintf
packet-ppp.c: Fix incorrect use of g_snprintf return value
packet-ospf.c: Fix incorrect use of g_snprintf return value
packet-mip6.c: snprintf -> g_snprintf
packet-bootp.c: Remove a commented out bad use of g_snprintf
packet-ber.c: snprintf -> g_snprintf, g_snprintf takes trailing \0 into account

2do:

     52 packet-ieee80211.c: 2DO
      2 packet-nfs.c: 2DO - too many side effects
     33 packet-bgp.c: 2DO
     18 packet-dns.c: 2DO
     14 packet-dcm.c: 2DO
     13 packet-x11.c: 2DO
     11 packet-kerberos.c: 2DO
     10 packet-diameter.c: 2DO
      9 packet-snmp.c: 2DO
      9 packet-pgm.c: 2DO
      7 packet-nbns.c: 2DO
      6 packet-fcswils.c: 2DO
      5 packet-wccp.c: 2DO
      5 packet-cops.c: 2DO
      4 packet-wtp.c: 2DO


svn path=/trunk/; revision=17038
2006-01-16 07:59:44 +00:00
Ronnie Sahlberg 15f441cdd6 add decoding of RFC3947 which should fix bug 513
svn path=/trunk/; revision=16883
2005-12-22 21:28:51 +00:00
Anders Broman 261ff255ac From Shoichi Sakane
svn path=/trunk/; revision=16200
2005-10-12 05:36:44 +00:00
Guy Harris 5e6d63a804 Squelch some compiler warnings.
svn path=/trunk/; revision=15991
2005-09-24 19:09:40 +00:00
Jörg Mayer 86e8646afd That code was never even compiled for testing
svn path=/trunk/; revision=15988
2005-09-24 15:52:42 +00:00
Jörg Mayer 32eccf1162 Shoichi Sakane:
Hi, I fixed some bugs to decoding IKEv2 payloads.  the following things
have been checked at the IPsec bake off in Toronto this week.

        - fixed decoding IP address in TS payload
        - fixed decoding IPv6 address in ID payload
        - fixed decoding IKEv2 Delete payload
        - SPI printing


svn path=/trunk/; revision=15987
2005-09-24 15:42:37 +00:00
Guy Harris 25c4bc9379 Replace tvb_memcpy() calls that extract IPv4 addresses into a guint32,
and that extract IPv6 addresses into a "struct e_in6_addr", with
tvb_get_ipv4() and tvb_get_ipv6() calls - except for some that we
remove, by using proto_tree_add_item(), rather than replacing.

Have epan/tvbuff.h include epan/ipv6-utils.h, to define "struct
e_in6_addr" (not necessary to declare the tvbuff routines, but including
it there means "struct e_in6_addr" is guaranteed to be defined before
those declarations, so we don't get compiler complaints if we define it
*after* those declarations).

svn path=/trunk/; revision=15758
2005-09-11 21:25:37 +00:00
Ulf Lamping 495eb1b788 snprintf -> g_snprintf
svn path=/trunk/; revision=15398
2005-08-17 23:10:28 +00:00
Gerald Combs 6e18761afc Break out of a loop before we exhaust system memory.
svn path=/trunk/; revision=15163
2005-08-01 13:52:22 +00:00
Jörg Mayer eab0aeb4bb More char -> const char fixes
Declare some functions static

svn path=/trunk/; revision=15158
2005-07-30 16:34:38 +00:00
Ronnie Sahlberg 762fc4f4eb fix some bugs in a value string
this fixes bug 291



svn path=/trunk/; revision=14983
2005-07-22 02:07:43 +00:00
Ronnie Sahlberg 0138306bc7 fix for bug 290
v2 exchange code 37 is "INFORMATIONAL"



svn path=/trunk/; revision=14982
2005-07-22 02:00:04 +00:00
Ronnie Sahlberg 568266283e fix for bug 285
decode isakmp nat keepalive packets properly


svn path=/trunk/; revision=14964
2005-07-20 07:51:24 +00:00
Ronnie Sahlberg 98a0c9a590 ISAKMP version2 has changed the payload format of a CertificateRequest.
In version 2 this is just a concatenation of 20 byte SHA-1 hashes with no other encxapsulation.

this resolves bug 281




svn path=/trunk/; revision=14917
2005-07-14 08:10:30 +00:00
Guy Harris 3b3670d2d3 Static variables considered harmful. Make the ISAKMP version a
parameter to many functions inside the ISAKMP dissector, as well as to
the "isakmp_dissect_payloads()" routine it exports.  Get rid of
"isakmp_set_version()", as the version can be passed to
"isakmp_dissect_payloads()" from the KINK dissector.

Put the declaration of "isakmp_dissect_payloads()" into a
"packet-isakmp.h" header, and have "packet-isakmp.c" and "packet-kink.h"
include it rather than declariing "isakmp_dissect_payloads()" itself -
or not doing so at all.

svn path=/trunk/; revision=14648
2005-06-16 06:19:03 +00:00