aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-isakmp.c
AgeCommit message (Collapse)AuthorFilesLines
2013-08-27From Dmitry Dyachenko:Anders Broman1-4/+32
Add Vendor Ids https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9075 svn path=/trunk/; revision=51525
2013-08-08Rename variables to reflect their use and to avoid a shadowing warning.Guy Harris1-8/+8
Fix some indentation while we're at it. svn path=/trunk/; revision=51211
2013-08-08From Tommy Wu:Anders Broman1-10/+25
- Show major and Minor version. - Correct SPI Name. svn path=/trunk/; revision=51206
2013-07-17Remove fragment_data, add fragment_head, fragment_item - for now alias it to ↵Jakub Zawadzki1-1/+1
the same structure. This is begin of work to split fragment head and fragments items. svn path=/trunk/; revision=50708
2013-07-11From Tommy Wu:Anders Broman1-10/+10
Use terminology from RFC 4303 svn path=/trunk/; revision=50511
2013-07-03expert_add_info + proto_tree_add_text = proto_tree_add_expert, where applicableMichael Mann1-3/+1
svn path=/trunk/; revision=50337
2013-06-14Remove check_col() and the occasional tree.Michael Mann1-2/+1
svn path=/trunk/; revision=49920
2013-06-10Batch of filterable expert infos.Michael Mann1-4/+21
svn path=/trunk/; revision=49868
2013-03-22Don't wire into the reassembly code the notion that reassemblies shouldGuy Harris1-7/+6
be done on flows from one address to another; reassembly for protocols running atop TCP should be done on flows from one TCP endpoint to another. We do this by: adding "reassembly table" as a data structure; associating hash tables for both in-progress reassemblies and completed reassemblies with that data structure (currently, not all reassemblies use the latter; they might keep completed reassemblies in the first table); having functions to create and destroy keys in that table; offering standard routines for doing address-based and address-and-port-based flow processing, so that dissectors not needing their own specialized flow processing can just use them. This fixes some mis-reassemblies of NIS YPSERV YPALL responses (where the second YPALL response is processed as if it were a continuation of a previous response between different endpoints, even though said response is already reassembled), and also allows the DCE RPC-specific stuff to be moved out of epan/reassembly.c into the DCE RPC dissector. svn path=/trunk/; revision=48491
2013-03-15From beroset:Anders Broman1-21/+22
remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48333
2013-03-12From beroset:Anders Broman1-2/+2
remove C++ incompatibilities from UAT_VS_DEF macro and all uses https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48259
2013-02-21include the wsutil/wsgcrypt.h instead of including gcrypt.h directlyMartin Kaiser1-1/+1
svn path=/trunk/; revision=47802
2012-12-26Fix a bunch of warnings.Guy Harris1-4/+4
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-10-22From Matthias St. Pierre:Anders Broman1-5/+12
Add full rfc4868 support to both dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7873 svn path=/trunk/; revision=45708
2012-10-18From Matthias St. Pierre:Anders Broman1-5/+11
Add authentication methods HMAC-SHA2-256-96 and HMAC-SHA2-256-128 to isakmp dissector https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7873 svn path=/trunk/; revision=45630
2012-10-12Do not use private_data from caller dissector as IKEv2 decryption parametersPascal Quantin1-0/+4
svn path=/trunk/; revision=45510
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45017
2012-09-07From Robert Bullen via ↵Jeff Morriss1-0/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7683 : The reassembled fragments tree in the Packet Details view is awesome, but it lacks one thing: a field that exposes the reassembled data. tcp.data already exists for exposing a single TCP segment's payload as a byte array. It would be handy to have something similar for a single application layer PDU when TCP segment reassembly is involved. I propose tcp.reassembled.data, named and placed after the already existing field tcp.reassembled.length. My primary use case for this feature is outputting tcp.reassembled.data with tshark for further processing with a script. The attached patch implements this very feature. Because the reassembled fragment tree code is general purpose, i.e. not specific to just TCP, any dissector that relies upon it can add a similar field very cheaply. In that vein I've also implemented ip.reassembled.data and ipv6.reassembled.data, which expose reassembled fragment data as a single byte stream for IPv4 and IPv6, respectively. All other protocols that use the reassembly code have been left alone, other than inserting NULL into their initializer lists for the newly introduced struct field reassemble.h:fragment_items.hf_reassembled_data. svn path=/trunk/; revision=44802
2012-08-10Use val_to_str_const() where appropriate;Bill Meier1-4/+4
Also (for a few files): - create/use some extended value strings; - remove unneeded #include files; - remove unneeded variable initialization; - re-order fcns slightly so prefs_reg_handoff...() at end, etc svn path=/trunk/; revision=44438
2012-07-08UATs could be put into "categories". The categories were defined onlyGuy Harris1-2/+2
implicitly by the #define name and string they were defined to; not all UATs neatly fit into any of the categories, so some of them were put into categories that weren't obviously correct for them, and one - the display filter macro UAT - wasn't put into any category at all (which caused crashes when editing them, as the GUI code that handled UAT changes from a dialog assumed the category field was non-null). The category was, in practice, used only to decide, in the aforementioned GUI code, whether the packet summary pane needed to be updated or not. It also offered no option of "don't update the packet summary pane *and* don't redissect anything", which is what would be appropriate for the display filter macro UAT. Replace the category with a set of fields indicating what the UAT affects; we currently offer "dissection", which applies to most UATs (any UAT in libwireshark presumably affects dissection at a minimum) and "the set of named fields that exist". Changing any UAT that affects dissection requires a redissection; changing any UAT that affects the set of named fields that exist requires a redissection *and* rebuilding the packet summary pane. Perhaps we also need "filtering", so that if you change a display filter macro, we re-filter, in case the display is currently filtered with a display filter that uses a macro that changed. svn path=/trunk/; revision=43603
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-05-19Fix RVALS() macro usagepascal1-13/+13
svn path=/trunk/; revision=42720
2012-04-16From Evan Huus:Anders Broman1-1/+0
Duplicate and misplaced 'break' statements. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7106 svn path=/trunk/; revision=42091
2012-03-21Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-11/+6
svn path=/trunk/; revision=41720
2012-03-21From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6972Alexis La Goutte1-1/+1
ISAKMP : VendorID CheckPoint : Malformed Packet Wrong minimum length when there is not CheckPoint "Data" after VendorID svn path=/trunk/; revision=41718
2012-03-21From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6206Alexis La Goutte1-16/+36
IKE: Life-Duration wrong displayed in LTV format The Fix commit in Revision 38387 is wrong Get the following error message : ISAKMP dissector bug: failed assertion proto.c:2957 use a HF by type (uint32, uint64, bytes...) for life duration svn path=/trunk/; revision=41717
2012-01-20Fix Coverity CID 1366: MISSING BREAKChris Maynard1-1/+2
svn path=/trunk/; revision=40610
2012-01-19Fix some duplicate display filter names.Chris Maynard1-4/+4
svn path=/trunk/; revision=40592
2012-01-13Update ISAKMP to last IANA Parameters (2011-11-07)Alexis La Goutte1-3/+45
Add new ISAKMP Attribut of RFC6407 and new IKE type (GAP ID 22) svn path=/trunk/; revision=40476
2011-12-26Update IKEv2 to last IANA Parameters (2011-12-19)Alexis La Goutte1-3/+3
RFC-kivinen-ipsecme-secure-password-framework-03 => RFC6467 svn path=/trunk/; revision=40293
2011-12-17Update IKEv2 to last IANA Parameters (2011-11-09)Alexis La Goutte1-6/+34
Add RFC-kivinen-ipsecme-secure-password-framework-03 svn path=/trunk/; revision=40233
2011-12-13Fix a memory leak.Bill Meier1-0/+1
svn path=/trunk/; revision=40189
2011-12-13Use tvb_new_child_real_data() instead of tvb_new_real_data() + ↵Bill Meier1-2/+1
tvb_set_child_real_data_tvbuff(). svn path=/trunk/; revision=40173
2011-11-12Fix compilation if HAVE_LIBGCRYPT is not defined.Michael Tüxen1-2/+2
svn path=/trunk/; revision=39812
2011-11-12fix [-Wunused-but-set-variable]Anders Broman1-2/+3
svn path=/trunk/; revision=39803
2011-10-21For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.Bill Meier1-1/+1
Also: remove trailing whitespace for a number of files. svn path=/trunk/; revision=39503
2011-10-16Do some conversions of proto_tree_add_item() 'encoding' arg.Bill Meier1-22/+22
(previously missed). 57 FT_BOOLEAN: FALSE-->ENC_BIG_ENDIAN 31 FT_BOOLEAN: TRUE-->ENC_LITTLE_ENDIAN 10 FT_BYTES: ENC_BIG_ENDIAN-->ENC_NA 1 FT_BYTES: ENC_LITTLE_ENDIAN-->ENC_NA 21 FT_BYTES: FALSE-->ENC_NA 2 FT_BYTES: TRUE-->ENC_NA 2 FT_IPXNET: ENC_BIG_ENDIAN-->ENC_NA 6 FT_IPv6: ENC_BIG_ENDIAN-->ENC_NA 1 FT_IPv6: FALSE-->ENC_NA 6 FT_NONE: ENC_BIG_ENDIAN-->ENC_NA 19 FT_NONE: FALSE-->ENC_NA 3 FT_NONE: TRUE-->ENC_NA 1 FT_STRING: ENC_BIG_ENDIAN-->ENC_ASCII|ENC_NA 1 FT_STRING: ENC_LITTLE_ENDIAN-->ENC_ASCII|ENC_NA 5 FT_STRING: FALSE-->ENC_ASCII|ENC_NA 1 FT_STRING: TRUE-->ENC_ASCII|ENC_NA 4 FT_STRINGZ: ENC_NA-->ENC_ASCII|ENC_NA 8 FT_STRINGZ: FALSE-->ENC_ASCII|ENC_NA 1 FT_INT32: FALSE-->ENC_BIG_ENDIAN 1 FT_INT32: TRUE-->ENC_LITTLE_ENDIAN 11 FT_UINT8: 0-->ENC_BIG_ENDIAN 111 FT_UINT8: FALSE-->ENC_BIG_ENDIAN 17 FT_UINT8: TRUE-->ENC_LITTLE_ENDIAN 1 FT_UINT16: 0-->ENC_BIG_ENDIAN 68 FT_UINT16: FALSE-->ENC_BIG_ENDIAN 18 FT_UINT16: TRUE-->ENC_LITTLE_ENDIAN 4 FT_UINT24: FALSE-->ENC_BIG_ENDIAN 70 FT_UINT32: FALSE-->ENC_BIG_ENDIAN 1 FT_UINT32: TRUE-->ENC_LITTLE_ENDIAN 4 FT_UINT64: FALSE-->ENC_BIG_ENDIAN 1 FT_UINT64: TRUE-->ENC_LITTLE_ENDIAN 1 FT_UINT_STRING: FALSE-->ENC_ASCII|ENC_BIG_ENDIAN svn path=/trunk/; revision=39442
2011-10-15Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, ↵Bill Meier1-15/+15
FT_STRINGZ, FT_UINT_STRING as follows: 1. If there's no character encoding (ENC_ASCII, ...) specified then use ENC_ASCII. 2. For all but FT_UINT_STRING, always use ENC_NA (replacing any existing True/1/FALSE/0 /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN). svn path=/trunk/; revision=39426
2011-10-10 Convert 'encoding' parameter of certain proto_tree_add_item() calls in ↵Bill Meier1-50/+50
non-autogenerated epan/dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_BOOLEAN FT_IPv4 FT_EUI64 FT_GUID FT_UINT_STRING Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260) svn path=/trunk/; revision=39328
2011-10-06Convert 'encoding' parameter of certain proto_tree_add_item() calls in ↵Bill Meier1-103/+103
non-autogenerated epan/dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_UINT8 FT_UINT16 FT_UINT24 FT_UINT32 FT_UINT64 FT_INT8 FT_INT16 FT_INT24 FT_INT32 FT_INT64 FT_FLOAT FT_DOUBLE svn path=/trunk/; revision=39288
2011-10-04Use ENC_NA as encoding for proto_tree_add_item() calls which directly ↵Bill Meier1-60/+60
reference an hf item (in hf[] with types: FT_NONE FT_BYTES FT_IPV6 FT_IPXNET FT_OID Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN svn path=/trunk/; revision=39260
2011-08-07Use "%" G_GINT64_MODIFIER "u" instead of G_GINT64_MODIFIER "%u".Michael Tüxen1-4/+4
svn path=/trunk/; revision=38388
2011-08-07Life duration is a variable length TLV, and not always a 2 byte value. ↵Chris Maynard1-23/+103
Hopefully fixes bug 6206 (no relevant capture file available to test). Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6206 svn path=/trunk/; revision=38387
2011-07-28Avoid a possible infinite loop in dissect_delete().Stig Bjørlykke1-3/+4
This may fix the "Malformed IKE Packet DoS" bug. svn path=/trunk/; revision=38247
2011-07-23Update last IANA ParametersAlexis La Goutte1-8/+8
RFC-ietf-ipsecme-failure-detection-08.txt => RFC6290 RFC-ietf-ipsecme-ipsecha-protocol-06.txt => RFC6311 svn path=/trunk/; revision=38174
2011-07-11More GLIB_CHECK_VERSION cleanups. Update the minimum GLib/GTK+ versionsGerald Combs1-33/+0
in README.devloper. Remove g_gnuc.h since it's no longer needed. Remove tvbuff_init(), tvbuff_cleanup(), reassemble_init(), and reassemble_cleanup() since they were only used for older GLib versions which didn't support GSlices. Assume we always support the "matches" operator. svn path=/trunk/; revision=37978
2011-06-19Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.Bill Meier1-2/+1
svn path=/trunk/; revision=37716
2011-06-17Update IKEv2 to last IANA Parameters (2011-05-09)Alexis La Goutte1-3/+48
Add Notify Message Types of : * A Quick Crash Detection Method for IKE (RFC-ietf-ipsecme-failure-detection-08.txt) * Protocol Support for High Availability of IKEv2/IPsec (RFC-ietf-ipsecme-ipsecha-protocol-06.txt) svn path=/trunk/; revision=37690
2011-06-04From Michael Mann:Anders Broman1-85/+77
UATification of isakmp dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5989 svn path=/trunk/; revision=37536
2011-05-20Add #include <stdlib.h> to files which reference fcns declared in stdlib.h;Bill Meier1-8/+8
(In many cases I previously incorrectly removed the #include <stdlib.h>). svn path=/trunk/; revision=37334
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-06 09:05:02 +0000