aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
AgeCommit message (Collapse)AuthorFilesLines
2015-01-27Lua: Expose tcp_dissect_pdus() to LuaHadriel Kaplan8-9/+13
Provide a way for Lua-based dissectors to invoke tcp_dissect_pdus() to make TCP-based dissection easier. Bug: 9851 Change-Id: I91630ebf1f1fc1964118b6750cc34238e18a8ad3 Reviewed-on: https://code.wireshark.org/review/6778 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-01-26Roll functionality of h225-persistentdata module into packet-h225.cMichael Mann1-4/+138
Change-Id: I19b2a1b19e1e77a6456e2310daf64ddff572b0d2 Reviewed-on: https://code.wireshark.org/review/6788 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-19TCAP: support dialogue confirmationLuke Mewburn2-59/+57
TCAP permits the changing of the originating address on the first backwards continue (i.e. the establishment of the dialogue). See ITU-T Q.771 (06/97) clause 3.1.2.2.2.2 Confirmation of the dialogue. In practice, a BEGIN replied to with an END can also exhibit this behaviour. For example, a BEGIN from GT A TID TA -> GT B, and the reply CONTINUE from GT B2 TID TB -> GT A TID TA. To support this, only support a single address hash in tcaphash_begin_info_key_t and tcaphash_end_info_key_t. The match of the first CONTINUE should find the appropriate tcaphash_begin and create the appropriate tcaphash_end entries. Also fix compile warning with DEBUG_TCAPSRT. Bug: 10841 Change-Id: Ibe75e3940e757727357b20be10f9c195c5888fdd Reviewed-on: https://code.wireshark.org/review/6446 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-19Convert OID APIs to use wmem.Michael Mann14-29/+30
There are a few oid functions that are only called in oids_test.c. I'll presume the APIs are used in proprietary dissectors rather than just remove them. Change-Id: I4595e00f93bf9ab8cf2493fe0432b91960f55a3f Reviewed-on: https://code.wireshark.org/review/6592 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-18asn2wrs: autodetect if 64 bits variant is required for constrained integersPascal Quantin7-74/+6
It does not work with defines, but is already a great step forward Change-Id: I346d4124690ec46a2299d4eae8031bbb19a3db8e Reviewed-on: https://code.wireshark.org/review/6617 Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-18LDAP: g8c608e6 did not include the changes in template file, that got lost ↵Pascal Quantin1-1/+3
afterwards Change-Id: I5d79d3e48c1ad83713a312dce39b749f47b0ecc8 Reviewed-on: https://code.wireshark.org/review/6612 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-17X509AF: dissect Certificate Serial Number as INT64 instead of INT32Pascal Quantin1-0/+5
Bug: 10862 Change-Id: Ie315298dd090b3b689f6a9bfff6f6f5bf7cc715a Reviewed-on: https://code.wireshark.org/review/6594 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-16SE_COPY_ADDRESS -> WMEM_COPY_ADDRESSMichael Mann2-10/+10
Copy addresses with wmem-scope instead of (forced) seasonal scope. All existing instances were converted to wmem_file_scope, but the flexibility is there for other scopes. Change-Id: I8e58837b9ef574ec7dd87e278470d7063ae8c1c2 Reviewed-on: https://code.wireshark.org/review/6564 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-16Remove seasonal memory from everything except address resolutionsMichael Mann1-2/+2
This includes circuits, conversations and streams as well as camel and h225 dissectors. Change-Id: Ia5ee70a5e5c6bcb420f0f19df126595246a3c042 Reviewed-on: https://code.wireshark.org/review/6566 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-15Modify the errorcode defenition to suit ANSI MAP, this is (probably) OK asAndersBroman1-2/+18
ANSI MAP is currently the only user of ANSI TCAP. Bug: 6112 Change-Id: I49f89c862ddc8351091a9a939415e4ba6e7603f5 Reviewed-on: https://code.wireshark.org/review/6546 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-14[E212]Modify dissect_e212_mcc_mnc() to take E212 number type as anAndersBroman9-15/+15
argument. While at it remove deprecated APIs Change-Id: Ib1a7e9d7aeba6379fb4492816a0ac602e67493c6 Reviewed-on: https://code.wireshark.org/review/6534 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-13MAC LTE: upgrade dissector to v12.4.0Pascal Quantin2-0/+37
Change-Id: Ieb5395a6ae7a1d7625fe645d0caf14008993d3d9 Reviewed-on: https://code.wireshark.org/review/6521 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-13UAT error string pointers should not be const pointers.Guy Harris3-3/+3
UAT error strings are usually allocated by g_strdup() or g_strdup_printf(), and must ultimately be freed by the caller. Make the pointer-to-error-string-pointer arguments to various functions be "char **", not "const char **". Fix cases that finds where a raw string was being used, as that won't work if you try to free it; g_strdup() it instead. Add a missing free of an error string. Remove some no-longer-necessary casts. Remove some unnecessary g_strdup()s (the string being handed to it was already g_malloc()ated). Change some variable declarations to match. Put in XXX comments for some cases where the error string is just freed, without being shown to the user. Change-Id: I40297746a2ef729c56763baeddbb0842386fa0d0 Reviewed-on: https://code.wireshark.org/review/6525 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13[GPRS CDR]Fix faulty ASN1 modificationAndersBroman1-1/+1
Should be: egsnPDPRecord [70] EGSNPDPRecordV750 Change-Id: I4b03524c09b6ce603cf4783144d588c8839a16e6 Reviewed-on: https://code.wireshark.org/review/6523 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-13[GPRS CDR] Handle Rel 7 CDRsAndersBroman2-4/+163
Change-Id: I09833a326e486273c3eacaceba0963fe88e0dac6 Reviewed-on: https://code.wireshark.org/review/6522 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-12[GPRS CDR] Add expert info for unknown record types.AndersBroman2-0/+16
Change-Id: Ib485f435b6c423b06c7c31f2cf681d01261bfc15 Reviewed-on: https://code.wireshark.org/review/6504 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-11LTE RRC: upgrade dissector to v12.4.0Pascal Quantin5-238/+1391
Change-Id: I0bd6c124bd3aa0efe09db81135adc690751e08ae Reviewed-on: https://code.wireshark.org/review/6477 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
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>