aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
AgeCommit message (Collapse)AuthorFilesLines
2015-10-07ssl-utils: load RSA keys based on their modulus+exponentPeter Wu2-0/+27
Load RSA private keys based on their public key instead of relying on the user to specify a valid address and port mapping. This is more reliable and prepares for simplification of the SSL Keys dialog. After this change, the "address" part of the UAT dialog will be ignored when loading the private key. The port+protocol mapping is still imported, but should probably be removed too. Change-Id: I4d7a2bfcf63d17e66e336ef770759f20510fc176 Reviewed-on: https://code.wireshark.org/review/10766 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-05H225, H245 over IPv6Michal Pazdera3-12/+50
This commit extends h225 and h245 dissectors to support dissection of ipv6 packets. Change-Id: Id8c045344711a96f15d619ddd72065aa3712c429 Reviewed-on: https://code.wireshark.org/review/10799 Reviewed-by: Tomáš Kukosa <tomas.kukosa@unify.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-05Allow use of variadic macrosPeter Wu2-34/+26
Remove variadic macros restriction (c99, c++11 feature) from README.developer. GCC, Clang, MSVC 2005 all support it. Enable -Wno-variadic-macros in configure.ac and CMakeLists.txt when -Wpedantic is enabled (which would enable -Wvariadic-macros). For all files matching 'define\s*\w+[0-9]\(', replace "FOO[0-9]" by "FOO" and adjust the macro definition accordingly. The nbap dissector was regenerated after adjusting its template and .cnf file. The generated code is the same since all files disabled the debug macros. Discussed at: https://www.wireshark.org/lists/wireshark-dev/201209/msg00142.html https://www.wireshark.org/lists/wireshark-dev/201510/msg00012.html Change-Id: I3b2e22487db817cbbaac774a592669a4f44314b2 Reviewed-on: https://code.wireshark.org/review/10781 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-09-29LTE RRC: upgrade dissector to v12.7.0Pascal Quantin6-31/+161
Change-Id: I95660eb302fde06c2034b023e60c7b83c67fe71b Reviewed-on: https://code.wireshark.org/review/10680 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-09-18pkcs1: remove unused RSAPrivateKey definitionPeter Wu2-15/+0
RSA private keys are typically not found in network captures, so let's just remove it. This removal avoids overloading the pkcs1.modulus field with the same meaning from two different contexts (RSAPrivateKey and RSAPublicKey). Change-Id: I65239718e6fc801fc53fa46c467dc86620aa3b29 Reviewed-on: https://code.wireshark.org/review/10546 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-09-15x509,ber: fix header field of large integersPeter Wu1-0/+3
In the past large integers would be displayed as text, later on this was changed into a "proper" header field. In most cases you do not want to see "ber.64bit_uint_as_bytes" though, but the original field name. This patch allows fields that are marked as FT_BYTES to be displayed with their original header field details (name, description, etc.). Change-Id: I4ab1a4cce649a225c73298fbf4dcf1692c693a03 Reviewed-on: https://code.wireshark.org/review/10539 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-14MPEG-PES: tell the user (in COL_INFO) when the stream or frame type is unknown.Jeff Morriss1-7/+2
Inspired by: https://www.wireshark.org/lists/wireshark-users/201508/msg00023.html Change-Id: Ib632b79aef5cbb4c83965a276ec955be43493455 Reviewed-on: https://code.wireshark.org/review/10472 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-09-13Make other_decode_bitfield_value private to proto.c.Michael Mann1-9/+2
This is further encouragement to not try to manually create a bitstring while formatting a field. Change-Id: I4efbeb39a210cf1fd26203cd8560859276b333b0 Reviewed-on: https://code.wireshark.org/review/10494 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-09-11LTE RRC: add a top level function for SBCCH SL BCH messagesPascal Quantin1-0/+15
Change-Id: I91c66f81d245b4398fecbd4c6b655baad5431b53 Reviewed-on: https://code.wireshark.org/review/10489 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-09-11LTE RRC: remove tree tests before decoding top level messagesPascal Quantin1-32/+18
It prevents proper update of Info column, and various other things Change-Id: I355c46e6f6b3f923250d6b5bf720ea052ef3b646 Reviewed-on: https://code.wireshark.org/review/10488 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-09-11snmp: fix 'time' var name.Dario Lombardo3-7/+7
As pointed out by checkAPI.pl Change-Id: I603465614236ec41d1050e6e3452dbf9021bf1d5 Reviewed-on: https://code.wireshark.org/review/10468 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>
2015-09-10LTE RRC: catch bounds errors triggered by subdissectorsPascal Quantin2-9/+23
Report the exception and continue dissection of the end of RRC message This is useful when there is an invalid NAS EPS message like in bug 11513 Change-Id: I74154892fe8125df57ef5a6966273d6df777977a Reviewed-on: https://code.wireshark.org/review/10463 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-09-06SV: add an option to dissect seqData as PhsMeasPascal Quantin2-2/+106
When set, this brings back the dissection code that was removed in g84a8c1d (bug 5696) Bug: 11475 Change-Id: Iba6b0ec6490e2971a3670d13cb3b84351b69f126 Reviewed-on: https://code.wireshark.org/review/10399 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>
2015-09-06OCSP: get rid of an evil global variablePascal Quantin2-7/+7
Bug: 11505 Change-Id: I87cc676426dceed05a9a95bb515c4fb2535ac9c5 Reviewed-on: https://code.wireshark.org/review/10400 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>
2015-09-03Address "shadow" warnings found by checkAPI script.Michael Mann2-7/+7
These aren't "true" shadow issues, but the script doesn't completely understand C syntax (for things like struct member names "time" and "index"). But fixing them creates less noise. Change-Id: I5a2db1549095824530428529e86cab453c031a04 Reviewed-on: https://code.wireshark.org/review/10368 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-08-26sv: remove some unnecessary checksMartin Kaiser1-10/+6
http://personal.strath.ac.uk/robert.c.atkinson/papers/sgms2011.pdf implies that appid, length and the two reserved fields are mandatory just try to dissect them, don't check if there's enough bytes remaining correct a typo while at it Change-Id: I09a315fc2c70161af527dca5661f877e09b63ff6 Reviewed-on: https://code.wireshark.org/review/10273 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-08-26Camel: fix indent (use 2 spaces)Alexis La Goutte1-1/+1
Change-Id: I0e8047fca7f24e60e4db8ad77254bcff5f8d6651 Reviewed-on: https://code.wireshark.org/review/10257 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-25[Camel] The tags used in EstablishTemporaryConnectionArg differs in V2 andAndersBroman3-2/+48
V3 versions of Camel. Add ASN1 code for EstablishTemporaryConnectionArgV2 Bug: 11466 Change-Id: I0dbb9c83e520c269dd567f3c3bc34c99c9aa5e15 Reviewed-on: https://code.wireshark.org/review/10249 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-21[Kerberos] Call to 'fseek()' without a check for a return value < 0,Bill Parker1-1/+4
indicating failure. Bug: 11056 Change-Id: Iaa6b7ca07626b78c77e3c1507726ec579764a582 Reviewed-on: https://code.wireshark.org/review/10181 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-21GSM_map: Fix indent (use 2 spaces) and add modelinesAlexis La Goutte1-161/+174
Change-Id: I1549eb55e1fa87c46e2493c37f3ed352970b794b Reviewed-on: https://code.wireshark.org/review/10168 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-21GSM/ANSI/CAMEL...: fix no previous prototype for '*_stat_init' ↵Alexis La Goutte3-3/+3
[-Wmissing-prototypes] Change-Id: I0aedefbb77899ebceac7fb08249faf47964d785b Reviewed-on: https://code.wireshark.org/review/10163 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-20ANSI: Add modelinesAlexis La Goutte1-0/+13
Change-Id: I641a9525ec5a6315cc4a2d97506a885605b3504b Reviewed-on: https://code.wireshark.org/review/10170 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-20Camel: Fix indent (use 2 spaces) and add modelinesAlexis La Goutte1-123/+137
Change-Id: I6fe835e78e58faabd5cfeeb84e39793b48d3df25 Reviewed-on: https://code.wireshark.org/review/10167 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-11H225: fix indent (use 2 spaces) and add modelines infoAlexis La Goutte3-950/+974
Change-Id: Ibe4cf8d004c6c94f745e5c620100af9483fa6a31 Reviewed-on: https://code.wireshark.org/review/9934 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-08-11Added Reload Lua plugins.Stig Bjørlykke1-2/+2
This is initial support for reloading Lua plugins without restarting the application. Still todo: - Deregister FileHandlers - Support deregister ProtoField with existing abbrev (same_name_hfinfo) - Add a progress dialog when reloading many plugins - Search for memory leakages in wslua functions Change-Id: I48870d8741251705ca15ffe1068613fcb0cb18c1 Reviewed-on: https://code.wireshark.org/review/5028 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-09H225: fix no previous prototype for 'h225_stat_init' [-Wmissing-prototypes]Alexis La Goutte1-1/+1
Change-Id: I945bbbb3b10258f22c60b04b19cf55671fc6ed94 Reviewed-on: https://code.wireshark.org/review/9933 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-08-09t124: kill evil global variablesEvan Huus2-13/+9
Bug: 11430 Change-Id: Ia4196ff693806dc1e20eae4075dda7dfe272c5b6 Reviewed-on: https://code.wireshark.org/review/9941 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-08-09Trivial: Convert 'tabs' indentation to '4 space' indentationBill Meier10-3720/+3672
Change-Id: If71dd8a04050ce11e37ad88ee862419313c06639 Reviewed-on: https://code.wireshark.org/review/9946 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-08-07Add SHA2 algos to certificate dissection in SSLTimothy Geiser2-3/+10
Change-Id: If1315496d231e5c8efc44b9235ec8ffb3ce9d8a9 Reviewed-on: https://code.wireshark.org/review/9880 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-06Fixup stat_tap table freeing.Gerald Combs2-4/+22
As it turns out we *do* need to free table elements. We also need to free the tables themselves and clear the table array. Do so. Change-Id: Ic1c81388eac8f47f74caea0169c79685a83aaff9 Reviewed-on: https://code.wireshark.org/review/9901 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-06Convert the GSM MAP stats to new "generic stat API".Gerald Combs2-3/+159
Convert both the MAP statistics and summary. As with the GSM A stats this are mostly untested. Change-Id: Ibd3a7346b09d1401e78724c0197ec2a38deb97a3 Reviewed-on: https://code.wireshark.org/review/9883 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-04Convert Camel tap stats to new "generic stat API".Gerald Combs2-14/+106
Migrate the Camel stats similar to the recent BOOTP and H.225 migrations. Change-Id: If82617068ff4b8fa186899f66dc34a08585f66cb Reviewed-on: https://code.wireshark.org/review/9865 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-04Convert H.225 tap stats to new "generic stat API".Gerald Combs2-16/+427
Migrate the H.225 stats similar to the recent BOOTP migration. Change-Id: I70ff7ab6cf3e9796f257412ba7d65ec9fe7f77ad Reviewed-on: https://code.wireshark.org/review/9859 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-31RRC: upgrade dissector to v12.6.0Pascal Quantin7-97/+3517
Change-Id: Ied56f90a8689a25d4093795bfd97d57d40e382c6 Reviewed-on: https://code.wireshark.org/review/9838 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>
2015-07-29GSM_MAP: adding dissector for sendParameters (MAPv1)Luca Melette4-12/+55
The current ASN.1 description of MAP (3GPP 29.002) is missing this operation. I recovered the needed code from an old MAP description (ets_300599e01p) and integrated the missing parts into the asn tree and C template file (via asn2wrs). Change-Id: Ibe05e6a99f3f95ac66740b5d319a7200fdb3e54b Reviewed-on: https://code.wireshark.org/review/9594 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-21LTE RRC: fix a typoPascal Quantin1-1/+1
Let's have consistent naming for dissectors Change-Id: I03d14e208692f39a7ae5017bd539f38f14abaa1f Reviewed-on: https://code.wireshark.org/review/9737 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-17Remove all preferences related to enabling/disabling heuristic dissectors.Michael Mann11-22/+16
The preferences are still supported for backwards compatibility, but the heuristic_protos file has final say on the "preference" to enable/disable a heuristic dissector. Also add parameter to heur_dissector_add() for the "default" enable/disable of a heuristic dissector. With this parameter, a few more (presumably weak) heuristic dissectors have been "registered" but of course default to being disabled. Change-Id: I51bebb2146ef3fbb8418d4f5c7f2cb2b58003a22 Reviewed-on: https://code.wireshark.org/review/9610 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-16LTE RRC: fix dissection of ETWS/CMAS warning messagesPascal Quantin2-3/+235
Change-Id: I20bb219a32b6c7e39ac415c5c13ad5379f78cba2 Reviewed-on: https://code.wireshark.org/review/9658 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-12Add "user presentable" and "unique string ids" to heuristic table entries.Michael Mann11-11/+17
This allows better presentation of heuristic dissectors to the end user. Change-Id: I2ff3985ab914e83c2989880cc0c7b9904045b3f6 Reviewed-on: https://code.wireshark.org/review/9602 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-10LTE RRC: upgrade dissector to v12.6.0Pascal Quantin6-15/+34
Change-Id: I6e8271f98cba0074b27df73a21337d388efcdc7a Reviewed-on: https://code.wireshark.org/review/9578 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-08GTK+: Add a Telephony/ANSI menu placeholder.Gerald Combs1-2/+2
Add REGISTER_STAT_GROUP_TELEPHONY_ANSI as well, and use it to add recently updated stats. Make sure we properly escape our path separators. Change-Id: I979d5c29a82acddec1a9bcae7e3cb9c5ea3f9d33 Reviewed-on: https://code.wireshark.org/review/9564 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-08RANAP: if bindingid looks like port number, extract and showMartin Mathieson1-0/+12
Change-Id: Ibfb98bf72ebbd620f21a13e5a4435144a8ef9f6a Reviewed-on: https://code.wireshark.org/review/9560 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-07-04ansi_map: fix float literals missing f suffixEvan Huus1-2/+2
Should fix OSX buildbots Change-Id: I466d4cdc0c4b52a15cadb9b5d429561ca68cc913 Reviewed-on: https://code.wireshark.org/review/9484 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-07-04asn1: split off cleanup routinesPeter Wu17-108/+135
General approach: 1. Split allocation (e.g. g_hash_table_new) from deallocation (g_hash_table_destroy) into functions named "init" and "cleanup". 2. Remove guards that test whether the hash tables are set as init is always called before cleanup. 3. Remove setting hash tables to NULL after destruction. 4. Copy register_init_routine function call and change init to cleanup. 5. Add cleanup function that calls reassembly_table_destroy if there is a reassembly_table_init function. Some templates were modified as follows: - snmp: split renew into init+cleanup, but keep renew for the uat_new callback. - ldap,ros: Rename init to cleanup as there was no initialization. - camel: remove init function from header, make it static. Remove debug print. - tcap: remove unused ssn_range assignment. Files in epan/ were regenerated using cmake && make asn1 Change-Id: Idac16ebf0ec304e0c8becaab5d32904e56eb69b9 Reviewed-on: https://code.wireshark.org/review/9136 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03Create very basic "generic" stat tap API to create a "GUI" independent table.Michael Mann1-0/+116
A few sample tap/dissectors (ANSI/A, ANSI MAP) are also included to test the API. The "GUI output" is a bit raw and could use some "prettying up", but all the basic hooks are there. Telephony "stat grouping" needs to be better alphabetized to properly populate menu (on GTK, probably Qt) Change-Id: I98514171f69c4ab3a304dccb26c71d629703c9ab Reviewed-on: https://code.wireshark.org/review/9110 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-26Added option in h245 preferences to print h245 messages content Michal Pazdera2-43/+31
into Information column in typical fashion (append) instead of just in reversed order (prepand) Change-Id: Id78c307fc6d34a378ac7b9335ac1e578837b08a6 Reviewed-on: https://code.wireshark.org/review/9170 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-26RRC: remove non ASCII characters from ASN.1 descriptionPascal Quantin5-498/+498
Change-Id: I7edb23651caa5ccf8e9989069803a8800e358670 Reviewed-on: https://code.wireshark.org/review/9172 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-25CredSSP: update template after the API change done in gcdc7d25Pascal Quantin1-1/+1
Change-Id: I548870ba423c7c3b714047f9f02c6cfb9a6a0661 Reviewed-on: https://code.wireshark.org/review/9156 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-25acse: don't THROW() an exception from a dissectorMartin Kaiser1-2/+3
we already have an expert info, we can simply exit Change-Id: I8adbfb084991195152a02bbef64c38c5aa9e841e Reviewed-on: https://code.wireshark.org/review/9113 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-23P1: fix 'dissect_p1_T_report_type' defined but not used [-Wunused-function]Alexis La Goutte1-4/+9
Change-Id: Idee443cd35846bb197070cff5fb37e3904afb856 Reviewed-on: https://code.wireshark.org/review/8757 Reviewed-by: Anders Broman <a.broman58@gmail.com>