aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
AgeCommit message (Collapse)AuthorFilesLines
2015-01-11Restore #undef HAVE_STDLIB_H and #undef HAVE_STRING_H in kerberos dissector.Michael Mann1-0/+2
These were removed when the kerberos dissector was switched to being a pure ASN.1 dissector (see dea68bf00f7c5872950814da81ba532a6372ccb3). Change-Id: I04177046250d039a750f4e4e4dd956d8beab23bc Reviewed-on: https://code.wireshark.org/review/6476 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-08Replace some ep_alloc and ep_alloc0 with its wmem equivalent.Michael Mann2-3/+2
These cases were pretty easy to identify. Also replaced some comments that referenced ep_alloced memory, when it's now in fact wmem_alloced. Change-Id: I07d2f390a9c0b34aa2956880476755d1acf5db0a Reviewed-on: https://code.wireshark.org/review/6392 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-07tvb_bytes_to_ep_str -> tvb_bytes_to_strMichael Mann4-6/+6
Change-Id: I79c613cbdd8dc939dd4c29ebc477fb6eefd5bfc4 Reviewed-on: https://code.wireshark.org/review/6371 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04ACSE: get rid of an evil global variablePascal Quantin2-12/+30
Bug: 10787 Change-Id: I225dab439e195bbd308bcafd4658e77ef9023c0f Reviewed-on: https://code.wireshark.org/review/6263 Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04PKIX1Explicit: get rid of an evil global variablePascal Quantin2-9/+16
Bug: 10744 Change-Id: I9fbd7c881ab6b17fa9febb55a4f33dbb229c900b Reviewed-on: https://code.wireshark.org/review/6264 Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-03Remove the probes from packet-kerberos.c.Guy Harris1-14/+0
None of HAVE_KERBEROS, HAVE_MIT_KERBEROS or HAVE_HEIMDAL_KERBEROS or HAVE_LIBNETTLE defined when it's compiled. So how is HAVE_KERBEROS getting defined when wireshark-qt.cpp is compiled? Change-Id: If238ff54aa4f0cda662c7a52d76e33363a77240d Reviewed-on: https://code.wireshark.org/review/6262 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-03Stick some #define probes in on Windows.Guy Harris1-0/+14
Let's try to figure out why, on the 64-bit Windows build, wireshark-qt.cpp is being compiled to call read_keytab_file() but packet-kerberos.c is not being compiled to define it. Change-Id: I782406e2189819d9400b84b6632fe0fb62c5996d Reviewed-on: https://code.wireshark.org/review/6261 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-02Replace proto_tree_add_text in dissector header files where it was used in a ↵Michael Mann1-1/+1
macro that should be expert info. Change-Id: I045368a0a91586231fc4b1e2700c2275088b76af Reviewed-on: https://code.wireshark.org/review/6244 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-02Don't define a stub read_keytab_file() on Windows if we don't have Kerberos.Guy Harris1-22/+3
We don't declare it, so all the DLL export stuff won't work, and we shouldn't need it, as we shouldn't be calling it if we don't have Kerberos (we shouldn't support the -K option if we don't have Kerberos, for example). Change-Id: I7e7b12aa93c4f31953300ef513fc09a1f55f8aef Reviewed-on: https://code.wireshark.org/review/6255 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01Declare read_keytab_file() in epan/dissectors/packet-kerberos.h.Guy Harris2-3/+3
Don't throw its declaration in file.h, as it's not defined in file.c. Instead, include it in epan/dissectors/packet-kerberos.h and include that wherever read_keytab_file() is called. Yes, that means you also have to include <epan/asn1.h> and, therefore, you have to include <epan/packet.h>. Yes, that should be cleaned up, perhaps by splitting the Kerberos support code into "stuff that handles encryption keys without any reference to dissection" and "stuff that does dissection-related work". Change-Id: Ide5c31e6d85e6011d57202f728dbc656e36138ef Reviewed-on: https://code.wireshark.org/review/6210 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01Let routines from the Kerberos dissector be called from C++.Guy Harris1-2/+8
Wrap its declarations in the usual "extern "C"" stuff. Change-Id: I353ab334bc08a69fdacaaab5672edf758b14766a Reviewed-on: https://code.wireshark.org/review/6201 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31rtse.cnf: fix Nesting level does not match indendation (CID 1159214)Alexis La Goutte1-1/+2
Change-Id: I86e6c9103990bedf93c323e1360394a7c0a39db4 Reviewed-on: https://code.wireshark.org/review/6173 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-28Removed duplicated #include linesDario Lombardo2-2/+0
Change-Id: I9cafa3cd5c74121168777d8c656e7e94e89efd3c Reviewed-on: https://code.wireshark.org/review/6065 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-25 NBAP: fix ddi missed for non first macdflow_id in E-DCH channelIlya Gavrilov1-4/+3
Change-Id: Ib93cac8a4b186114f50ef4a26bdace2d72219644 Reviewed-on: https://code.wireshark.org/review/6022 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-23kerberos: Re-add needed #include <stdio.h>Bill Meier1-0/+2
Change-Id: I85c0e5f022b5c04df6079e118e376e8d598675aa Reviewed-on: https://code.wireshark.org/review/6011 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-23asn1 generated dissectors: cleanup #include usageBill Meier99-269/+70
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 Reviewed-on: https://code.wireshark.org/review/6008 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-23asn1/Makefile.nmake: packet-c1222.c not autogenerated using Windows nmakeBill Meier1-4/+5
Change-Id: I21628bdd1a08348629350a373f1c20e02c3618f7 Reviewed-on: https://code.wireshark.org/review/6007 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-22Cast a parameter in the kerberos dissector so it compiles withoutStephen Fisher1-1/+1
warnings on NetBSD. Change-Id: Id1ab5020fa53656065b0b2438071342eae4f7adb Reviewed-on: https://code.wireshark.org/review/5987 Petri-Dish: Stephen Fisher <sfisher@sdf.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-22Fix unknown command tag name [-Wdocumentation-unknown-command]Alexis La Goutte1-1/+1
Change-Id: I6c2564a86e13d9321001856ba1f51681a9f20976 Reviewed-on: https://code.wireshark.org/review/5979 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22ANSI_MAP: Fix unused function (by add to .OMIT list)Alexis La Goutte1-0/+3
Change-Id: I4e2278d563659db6acc6c02b9e66d58c67939e30 warning: unused function 'dissect_ansi_map_InvokeData' [-Wunused-function] warning: unused function 'dissect_ansi_map_ReturnData' [-Wunused-function] Reviewed-on: https://code.wireshark.org/review/5976 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-21Have a heur_dissector_list_t be an opaque handle.Guy Harris4-6/+4
This allows dissector lists to be looked up by name, so they can be shared by multiple dissectors. (This means that there's no "udplite" heuristic dissector list, but there shouldn't be one - protocols can run atop UDP or UDPLite equally well, and they share a port namespace and uint dissector table, so they should share a heuristic dissector table as well.) Change-Id: Ifb2d2c294938c06d348a159adea7a57db8d770a7 Reviewed-on: https://code.wireshark.org/review/5936 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-20Use ENCTYPE_NULL in the krb5_crypto_init() call.Guy Harris1-1/+1
That appears to be a name supplied both by MIT and Heimdal Kerberos. Using it makes it a bit clearer what the code is doing, and might avoid type clash warnings if it's the right type (e.g., if it's a member of an enum, as it is in Heimdal, and the corresponding argument to krb5_crypto_init() is of the same type, the types will match). Change-Id: I81b79223f789b8d1ec47180b7636ac1d83e03681 Reviewed-on: https://code.wireshark.org/review/5898 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-19Throw some casts at compiler warnings.Guy Harris1-5/+5
Change-Id: I609fcba0b015599f98edb1b3927edb5684bcf2b1 Reviewed-on: https://code.wireshark.org/review/5887 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-17Update to V12.5.0AndersBroman6-14/+1872
Bug: 10782 Change-Id: I5fd4ec14279411682d8a23f5e0f503180113f093 Reviewed-on: https://code.wireshark.org/review/5790 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-14Kerberos: import KRB5_AD_WIN2K_PAC dissection from old non ASN.1 based dissectorPascal Quantin2-5/+455
Bug: 10539 Change-Id: I06d1179210bdcc63800ef9580bb274c714a77c6e Reviewed-on: https://code.wireshark.org/review/5761 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-12LPP: avoid doing an out of bound access in case the PER decoding gives an ↵Pascal Quantin1-1/+3
invalid value Bug: 10773 Change-Id: I4fcde84d7be1e42729b6ec0763064e9885951468 Reviewed-on: https://code.wireshark.org/review/5729 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-10LCSAP: fix dissection of negative longitude and latitudePascal Quantin1-2/+2
Bug: 10767 Change-Id: I4ab0ffd3bd22f1884895f3118673b433d980de2f Reviewed-on: https://code.wireshark.org/review/5704 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-10GPRSCDR: fix warning: 'dissect_gprscdr_MBMSInformation' defined but not useAlexis La Goutte1-0/+11
Change-Id: I4bdbaeb3c1e3327af6f5e3de22ebcd4472b9f3e7 Reviewed-on: https://code.wireshark.org/review/5706 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-09LTE RRC: upgrade dissector to v12.3.0Pascal Quantin5-53/+637
Change-Id: Iac974bf505bed270fc1f9409a7d61c80ebca17a5 Reviewed-on: https://code.wireshark.org/review/5691 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-09LTE: Update MAC and RLC dissectors to Release 12Pascal Quantin2-13/+15
Change-Id: I036a0d1180b6481e8cc27210ed44eda4ba078a27 Reviewed-on: https://code.wireshark.org/review/5659 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-09LDAP's DirSyncFlags are a bitfield, so show it as an unsigned integer in hex.Guy Harris1-0/+1
Change-Id: I2a06b13528ad7dfc587bfb9c1333d4f7a497614e Reviewed-on: https://code.wireshark.org/review/5684 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-02cms: Handle media_type pkcs7-mime and pkcs7-signatureStig Bjørlykke1-0/+4
Change-Id: I7db4e67ffe99a9f3b41d0b507d9837e0237d4547 Reviewed-on: https://code.wireshark.org/review/5558 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-02Make it possible to register an OID dissector to dissectAndersBroman2-1/+15
ManagementExtension. Change-Id: I52c626b0d7a63214ccecf13d62e0a2850c2dee07 Reviewed-on: https://code.wireshark.org/review/5569 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-01Use proto_tree_add_bitmask for groups of proto_tree_add_boolean.Michael Mann1-18/+8
Part 3 of many, but this concludes the strict conversion to proto_tree_add_bitmask. Patches to follow with use proto_tree_add_bitmask_xxx (some functions still need to be written) Change-Id: Ic2435667c6a7f1d40602124e5044954d2a296180 Reviewed-on: https://code.wireshark.org/review/5553 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-26Remove sccp_info member from packet_info structure.Michael Mann4-18/+72
sccp_msg_info_t* is now passed from SCCP dissector to its subdissectors through dissector data parameter. Change-Id: Iab4aae58f8995e844f72e02e9f2de36e83589fc0 Reviewed-on: https://code.wireshark.org/review/5442 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-25Remove use of pinfo->private_data since it's not used anywhere.Michael Mann2-12/+0
Change-Id: Ibb47fd1a0d498cc9791ca31ee625395905a7e999 Reviewed-on: https://code.wireshark.org/review/5464 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-17H248: Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte1-17/+19
Also fix some indent issue Change-Id: I262bdddd031fec6a0f91b7172bb2d67be3c33000 Reviewed-on: https://code.wireshark.org/review/5370 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-16Remove ipproto member of packet_info.Michael Mann1-14/+1
All situations can be handled with "shimmed" dissector functions. Change-Id: Ic85483b32d99d3270b193c9f6b29574d8fad46a8 Reviewed-on: https://code.wireshark.org/review/5327 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-14[S1AP) Wrong tree usedAndersBroman1-1/+1
s1ap.cnf:547:14: error: variable 'subtree' set but not used Change-Id: I84a345709b1ef9688f3f1a4e876a75dd575c1c2e Reviewed-on: https://code.wireshark.org/review/5299 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-14[S1AP] Let the A21 dissector do further dissection of Cdma2000SectorIDAndersBroman2-0/+23
Change-Id: I8c503acf6860b34d24769cdf981dcaeea4667ffb Reviewed-on: https://code.wireshark.org/review/5298 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-10Improved deregistering fields.Stig Bjørlykke1-5/+1
This improvement avoids use of deallocated memory (crash) if using a deregistered field in display filter, color filter, custom column and other cases when the field is used as "interesting field". This functionality is currently used in http, imf and ldap preferences. Also removed unused proto_registrar_n() as this does not work correctly after deregistering fields. Change-Id: I043e3bf7a98bd773c9801e712a012d1eab8a7f94 Reviewed-on: https://code.wireshark.org/review/5161 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-11-08SNMP: Fix warning found by -Wunused-const-variableAlexis La Goutte1-0/+2
Change-Id: If3fcab128e3e6bce04f4922568ab7ff8575b01fe warning: unused variable 'smux_types' [-Wunused-const-variable] Reviewed-on: https://code.wireshark.org/review/5194 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-04Fix some compilation errors (size_t to guint/gint) and an unused parameterStephen Fisher1-5/+5
Change-Id: I2d64d840c93f951dd5481ca5950ff5587da6843d Reviewed-on: https://code.wireshark.org/review/5112 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-31CAMEL: tvb_length... -> tvb_reported_length...AndersBroman1-8/+8
Change-Id: Ia9013127d72f9228b8151338429d9f612ba9a1f4 Reviewed-on: https://code.wireshark.org/review/5020 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-29Replace isalpha() with g_ascii_isprint().AndersBroman2-2/+1
Change-Id: I416fd36f65ee80a0b17939bc081ddae0f3f72a32 Reviewed-on: https://code.wireshark.org/review/4984 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-29Don't include ctype.h and replace isascii() with _ascii_isprint().AndersBroman2-4/+3
Remove deprecated APIs while at it. Change-Id: I002ed4a696782caaeeb70a3e4ced4ae81f3d5372 Reviewed-on: https://code.wireshark.org/review/4983 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-28Refactor pinfo->circuit_id from H.223 dissector.Michael Mann2-5/+5
Change-Id: Id63e0088047c7948fd190ba4dd5fbcb536e0cc6b Reviewed-on: https://code.wireshark.org/review/4921 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-22S1AP: Add an S1AP context to be able to determine which message andAndersBroman2-8/+30
message type an IE was sent in. Needed to dissect proprietarry data. Change-Id: Ie75a2f6a544cb33e22c42457b0edd83e6456bfe5 Reviewed-on: https://code.wireshark.org/review/4910 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-21Add OID callback for private IEs making it possible to call a dissectorAndersBroman2-5/+22
for the private OID. Change-Id: Ibb86d8523f1aee14ba1a843ec3ad4becc7729013 Reviewed-on: https://code.wireshark.org/review/4893 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-18Get rid of unnecessary includes of ctype.h.Guy Harris3-3/+0
Change-Id: I9e2cd7a9fed33fc2f4b0c0da3603690450f6952d Reviewed-on: https://code.wireshark.org/review/4809 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 15:20:02 +0000