Commit graph

3021 commits

Author SHA1 Message Date
Pascal Quantin
d0ac937567 Revert "Update ASN.1 source files with the API changes done in g021e7af"
This reverts commit e308e7c4de.

Change-Id: I079616d63f643f79f1bc03ef5fdf724f36df4071
Reviewed-on: https://code.wireshark.org/review/2435
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-19 18:42:28 +00:00
Pascal Quantin
248a503a97 Update ASN.1 source files with the API changes done in g971ffd6
Change-Id: Iac4952f64622cd28941f582adf54ecf7843f8c28
Reviewed-on: https://code.wireshark.org/review/2395
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:05:57 +00:00
Pascal Quantin
cc37b50334 Get rid of obsolete references to nettle
Bug: 2089
Change-Id: Ie3337a1b750d8d95f6291c77dfd19cd1b0c57e83
Reviewed-on: https://code.wireshark.org/review/2388
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 18:03:43 +00:00
Pascal Quantin
f2dd6c0a6d SABP: fix an error spotted by pre-commit hook
Change-Id: I733e2e72b52293b3c7c15f4e0c240f7e01f4b98c
Reviewed-on: https://code.wireshark.org/review/2386
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 16:15:58 +00:00
Pascal Quantin
e308e7c4de Update ASN.1 source files with the API changes done in g021e7af
Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88
Reviewed-on: https://code.wireshark.org/review/2385
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-18 16:15:42 +00:00
Evan Huus
e047e3a007 Convert tcap dissector to wmem
As far as I can tell these calls were just missed in the first initial pass,
they're not in a weird scope.

Close review from somebody else please to verify that!

Change-Id: Ic3188879124dcb8fdf42e79d200d4f244200aa7b
Reviewed-on: https://code.wireshark.org/review/2266
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-17 00:06:17 +00:00
Evan Huus
de00c49bd8 Convert a bunch of time_to_str functions to wmem
Change-Id: I24fe3cc4a3589dadc4528a77fe7ff13d06b1a983
Reviewed-on: https://code.wireshark.org/review/2245
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 17:26:25 +00:00
Evan Huus
39d7c9df0a Remove emem in SNMP UAT, use glib instead
Change-Id: Ieea8c09d6a82285b0ba20f669c35394fbf195f50
Reviewed-on: https://code.wireshark.org/review/2241
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 15:38:31 +00:00
AndersBroman
af687c581f Fix
Warn Dissector bug, protocol LPP, in packet 1: proto.c:3403:
 failed assertion "DISSECTOR_ASSERT_NOT_REACHED"
redifine FT of NavModel-GLONASS-ECEF/gloP1

Change-Id: Id865c39b8d15528417075f9e7ed0378704aa98dc
Reviewed-on: https://code.wireshark.org/review/2132
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-11 12:30:06 +00:00
Michael Mann
73217d9f3f tvb_new_subset -> tvb_new_subset_length when length parameters are equal.
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is.

Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d
Reviewed-on: https://code.wireshark.org/review/1999
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07 15:41:07 +00:00
Richard Sharpe
09b5361302 This fix now allows SASL/GSS-API with integrity only to be properly dissected
in that we now properly indicate the checksum and provide the wrapped token to
the LDAP dissector to dissect.

There is still a problem in that the wrong parts of the SASL packet can be
indicated when users click on some parts.

I am committing it for review and because it is much better than the current
code.

Bug:9398
Change-Id: I552fc249db26835b79abfc8793438a95f221663a
Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
Reviewed-on: https://code.wireshark.org/review/1905
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-04 04:27:13 +00:00
Richard Sharpe
88a64b9e2b Improve the fix by removing code that miss dissects SPNEGO stuff ... as well
as remove redundant stuff from the spnego.cnf file.

Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
Change-Id: I90a962a39dc4da0f13055c9b3893c26044f1fc97
Reviewed-on: https://code.wireshark.org/review/1809
Reviewed-by: Tomáš Kukosa <tomas.kukosa@unify.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-29 01:19:00 +00:00
Richard Sharpe
0ed2672abf Try to fix the problems with the SPNEGO negTokenInit differences in Microsoft implementations
Change-Id: Ifbfca88469a6bc479072c921deba280e667c7087
Reviewed-on: https://code.wireshark.org/review/1804
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-29 01:15:26 +00:00
Bill Meier
40a21bc99c packet-kerberos.c: Use tfs_set_notset in hf[] entry instead of a local version.
Change-Id: I00a3ae7afb46eb50d7477c22cfa340c705cbb34a
Reviewed-on: https://code.wireshark.org/review/1851
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28 21:47:48 +00:00
Bill Meier
d817b27d6d Update m3ap.cnf to match packet-m3ap.c change done in commit b40cb1ad
Change-Id: Ib94647edcdba8c71439d37a48e213c8a475c351e
Reviewed-on: https://code.wireshark.org/review/1850
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28 20:48:22 +00:00
Bill Meier
e5705070c8 packet-klerberos.c: Use typedef (true_false_string) to properly define a true_false_string.
Change-Id: Ic89e5add39b8b0b2c3db254292f12ce6ae25b73c
Reviewed-on: https://code.wireshark.org/review/1844
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28 15:30:12 +00:00
Alexis La Goutte
281616f09b Fix build on my old Windows XP Buildbot (With VS2008EE) (Try 2...)
../../asn1/atn-ulcs/packet-atn-ulcs-template.c(126) : fatal error C1083: Cannot
open include file: 'stdint.h': No such file or directory

Change-Id: Id3c3082fe91a79e44abbfd4e2b2f1fc7d5c183d4
Reviewed-on: https://code.wireshark.org/review/1814
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-27 11:46:53 +00:00
Evan Huus
08ce84ebbe Grab-bag of dead initializers and two actual bugs.
All caught by cppcheck. The two (semi)-interesting bugs are:
- in asn1/atn-cpdlc/packet-atn-cpdlc-template.c where the break statement should
  have been inside the brace, causing potential control-flow weirdness with
  exceptions
- in epan/dissectors/packet-ieee80211.c where the bounds check for tag_len did
  not match the expert info given

Change-Id: Ie173fb8d917aabb9b4571435d671d6f16e1c7569
Reviewed-on: https://code.wireshark.org/review/1793
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-25 18:12:00 +00:00
AndersBroman
2cfda31ff0 Change the signature of dissector_try_heuristic() to return hdtbl_entry
which can be used to call the found heuristic dissector on the next pass.

Introduce call_heur_dissector_direct() to be used to call a heuristic
dissector which accepted the frame on the first pass.

Change-Id: I524edd717b7d92b510bd60acfeea686d5f2b4582
Reviewed-on: https://code.wireshark.org/review/1697
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-21 20:17:29 +00:00
Guy Harris
b8f0e8cf03 Eliminate some calls to tvb_get_ptr().
Change-Id: I1c5e10467d68ed7372dfaa9109b350238418ffc1
Reviewed-on: https://code.wireshark.org/review/1645
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-15 02:31:14 +00:00
Martin Mathieson
d7befa8b26 Fix copy-and-paste error with cause value_strings, and change indentation to match generated code
Change-Id: I629f010f2430c5765c1adb41c57e6ea26d92b049
Reviewed-on: https://code.wireshark.org/review/1615
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-12 21:45:35 +00:00
Pascal Quantin
54be3eaaec TCAP: set a fence on info column after calling sub dissector
Bug: 10091
Change-Id: I7af57345e31209fb4dd02cdab7960c44c69dc0a5
Reviewed-on: https://code.wireshark.org/review/1555
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-08 10:50:59 +00:00
Pascal Quantin
4eaf1c82c5 MAC LTE: get extended BSR sizes configuration from RRC
Change-Id: I09afa7c17be5e0ed902a2c2f5ea9989df3380615
Reviewed-on: https://code.wireshark.org/review/1550
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-08 06:29:21 +00:00
AndersBroman
09a9c86473 Add the possibillity to add a string to the termination id.
Change-Id: I3b48b28273a8c1a1558045d2a4ab5104160840de
Reviewed-on: https://code.wireshark.org/review/1510
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-05 15:51:18 +00:00
Martin Mathieson
1ddce8bb4c Have RRC tell MAC about RAPID ranges so it can show for RAPIDs seen
Change-Id: Ie9adbe3015c63e53997068053b6f8ec224a5bf82
Reviewed-on: https://code.wireshark.org/review/1474
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-03 21:39:20 +00:00
Pascal Quantin
b588511c9c T38: fix access to uninitialised variables
Bug: 10050
Change-Id: I7bc2d1b99bcb1241705a2561d9360a006fb9cb47
Reviewed-on: https://code.wireshark.org/review/1382
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-27 12:15:21 +00:00
Pascal Quantin
7acaf8552b Kerberos: ensure that private data elements are stored in separate variables
Bug: 10028

Change-Id: I599cd5475d19b64c0d5b9d31d7054a3befc84af2
Reviewed-on: https://code.wireshark.org/review/1348
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-04-25 14:23:37 +00:00
Pascal Quantin
853e391dfa Kerberos: use dissect_kerberos_ADDR_TYPE (removes an unused function warning)
Change-Id: I87d9c88d9db06c8f7dedd6e39152c39c13f8d32d
Reviewed-on: https://code.wireshark.org/review/1314
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-23 22:12:35 +00:00
Stig Bjørlykke
4eb4bae413 Add check for no kerberos keytab file.
Avoid printf warnings when loading a capture with kerberos packets
when not having configured a keytab file.

Change-Id: I0950daa18c42f4687d29101fac74f6f6bd6071b1
Reviewed-on: https://code.wireshark.org/review/1300
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-23 19:28:24 +00:00
Pascal Quantin
abbcaabccc Kerberos: use auto generated code for ADDR-TYPE instead of a hand made value_string array
Change-Id: I74089fe609368fdd582aef1f2cb00a3905e0641b
Reviewed-on: https://code.wireshark.org/review/1301
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-23 15:22:02 +00:00
Pascal Quantin
11b78ffbfa Kerberos: put PDU dissection under Kerberos tree and remove duplicate PDU name
Change-Id: Id4824ad3a7bca1959579e5fd0a17a67c6bcda174
Reviewed-on: https://code.wireshark.org/review/1293
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-23 08:03:57 +00:00
Pascal Quantin
490a8a6148 Kerberos: define HostAddress/addr-type as a FT_UINT32 field
Fixes part of bug 10019

Change-Id: Id367d6c86533c840ea2ff40ef96b1c1854b96150
Reviewed-on: https://code.wireshark.org/review/1288
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-22 22:08:30 +00:00
AndersBroman
3b4a591f75 Update to latsest spec. number while we are at it(no change).
Change-Id: I5064bbbd1d4961cbff6202967cbd2ee66f7a2c0b
Reviewed-on: https://code.wireshark.org/review/1235
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-21 16:08:47 +00:00
Guy Harris
6c6aeb1841 Fix various white space issues and typoes and regenerate SABP dissector.
Change-Id: Ic036dcbb36b2f0e1eda46062867b762d150b78e0
Reviewed-on: https://code.wireshark.org/review/1232
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-21 00:48:40 +00:00
Stig Bjørlykke
1fb902f217 Use new BER functions in kpasswd.
Added RFC 3244 ChangePasswdData to the kerberos dissector.

This is the last dissector using the "old BER" functions.

Change-Id: I1d79047103c07c268d08e652745391f1ac37c82c
Reviewed-on: https://code.wireshark.org/review/1198
Reviewed-by: Tomáš Kukosa <tomas.kukosa@unify.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 21:42:51 +00:00
Alexis La Goutte
d35f09761e Add kerberos-exp.cnf to asn1 gitignore
Change-Id: I48e225a6a68675afe6cacf57e5f3aa6b2eaaa407
Reviewed-on: https://code.wireshark.org/review/1201
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 21:40:05 +00:00
Alexis La Goutte
be76ba5f0d Fix warning found by -Wunused-const-variable (Clang 3.5)
../../asn1/kerberos/packet-kerberos-template.c:1076:27: error: unused variable 'w2k_pac_types' [-Werror,-Wunused-const-variable]
../../asn1/kerberos/packet-kerberos-template.c:1089:27: error: unused variable 'krb5_princ_types' [-Werror,-Wunused-const-variable]
../../asn1/kerberos/packet-kerberos-template.c:1146:27: error: unused variable 'krb5_encryption_types' [-Werror,-Wunused-const-variable]
../../asn1/kerberos/packet-kerberos-template.c:1184:27: error: unused variable 'krb5_checksum_types' [-Werror,-Wunused-const-variable]
../../asn1/kerberos/packet-kerberos-template.c:1222:27: error: unused variable 'krb5_ad_types' [-Werror,-Wunused-const-variable]
../../asn1/kerberos/packet-kerberos-template.c:1239:27: error: unused variable 'krb5_transited_types' [-Werror,-Wunused-const-variable]
../../asn1/kerberos/packet-kerberos-template.c:1244:27: error: unused variable 'krb5_address_types' [-Werror,-Wunused-const-variable]
../../asn1/kerberos/kerberos.cnf:153:27: error: unused variable 'kerberos_Applications_vals' [-Werror,-Wunused-const-variable]

Change-Id: Ie842d236628efb46450f3e6c23b5590b2e622c25
Reviewed-on: https://code.wireshark.org/review/1199
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-04-18 20:12:51 +00:00
Alexis La Goutte
acd640c861 Fix mix tab and space
Change-Id: Ife12c5118dcd70ba6b2540d53697f7c9cc9207c9
Reviewed-on: https://code.wireshark.org/review/1196
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-18 19:22:14 +00:00
AndersBroman
dea68bf00f Switch to using the ASN1 based kerberos dissector.
Change-Id: Ib8945cdad149b71e3f79bd88032fd10f55ba556d
Reviewed-on: https://code.wireshark.org/review/1174
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-17 08:29:39 +00:00
AndersBroman
f0125746ca From Martin Mathieson:
For S1AP PDUs that contain a cause, show that cause in the Info column.

Change-Id: Icecb8da278c16e0d47395b17b54dee6ebd7be646
Reviewed-on: https://code.wireshark.org/review/1170
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-16 14:30:01 +00:00
Bill Meier
d063b324e4 Fix "might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]" warning from gcc 4.9.
Change-Id: I8495d746f47c0e2528f88295771f86197d22d159
Reviewed-on: https://code.wireshark.org/review/1166
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-16 03:05:21 +00:00
Martin Mathieson
bd6ffea1cd LTE RRC: break the sr-configIndex down into periodicity and subframe offset
Change-Id: I5e153ebba9957f3dc5551f540cf333a1d0ff89f7
Reviewed-on: https://code.wireshark.org/review/1141
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-15 04:16:52 +00:00
Alexis La Goutte
d685e9b3fe Fix warning found by -Wunused-const-variable (Clang 3.5)
Change-Id: I246aa28be28194576b4bd58714b2e6ac36f7a29a
Reviewed-on: https://code.wireshark.org/review/1121
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-14 18:23:43 +00:00
Stig Bjørlykke
9ce003a620 Added P1 extension 34.
Change-Id: Iccaaf39d4de21e1a12a26c40a184321a67b41f3e
Reviewed-on: https://code.wireshark.org/review/1068
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-04-11 11:21:58 +00:00
Guy Harris
45f019249c Get rid of some unused functions.
Change-Id: I3b1529826c04334d2df8e3f80a69e8b51651b9cf
Reviewed-on: https://code.wireshark.org/review/1022
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-08 16:14:03 +00:00
AndersBroman
fa4c104812 Update to V11.6.0
Change-Id: I91def9d33901f82b9516a0be464ba9e609da0007
Reviewed-on: https://code.wireshark.org/review/1019
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-08 15:15:28 +00:00
Guy Harris
26f46d40e9 Handle string types with somewhat appropriate encodings.
For various string types defined in X.680, use the appropriate encoding,
or ENC_ASCII|ENC_NA in some cases where we don't have an appropriate
encoding yet.

This most significantly fixes the handling of BMPString and
UniversalString, which are supersets of ASCII (Unicode Basic
Multilingual Plane and Unicode, respectively), but don't encode ASCII
characters as single octets.  It also fixes UTF8String to, well,
properly recognize UTF-8.

This also lets us get rid of the special handling of SyntaxBMPString in
X.509sat (and, in fact, *requires* us to get rid of it, as, otherwise,
the string value appears twice).

Change-Id: I325c4e71a6110278eb23b86e0d986e6439cfc328
Reviewed-on: https://code.wireshark.org/review/994
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-07 22:46:30 +00:00
Michael Mann
b40cb1adea Apply found fix-encoding-args.pl errors in the dissector directory.
I coincidentally found a few files with errors, so I thought it might be time to run it on the whole directory again.

Change-Id: Ia32e54b3b1b94e5a418ed758ea79807c8bc7e798
Reviewed-on: https://code.wireshark.org/review/978
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-06 15:11:36 +00:00
Michael Mann
fdeed480bf Convert ep_address_to_str -> address_to_str(wmem_packet_scope, ...) for all dissectors
Change-Id: I7489e2fb3a1f2630ca17b0a5fe1aa873992f1061
Reviewed-on: https://code.wireshark.org/review/975
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-06 01:31:28 +00:00
Hadriel Kaplan
04c05a21e3 Fix Bug 9920 Buildbot crash due to SDP/RTP mismatch
For details see comments in Bug 9920.

The executive summary:
Bug 9920 is a crash caused by a couple of issues:

1) The memory ownership model for the rtp_dyn_payload hashtable is split: SDP
creates the rtp_dyn_payload hashtable, but RTP can free it. Since there isn't
*one* pointer to the hashtable, RTP freeing it means SDP has a dangling
pointer.

2) Either the SDP dissector shouldn't be creating two separate, unique
hashtables for multiple media channels of the same addr:port, or RTP shouldn't
be free'ing the previous one.

Change-Id: I436e67de6882f84aa82dcbdfe60bf313fe4fd99c
Reviewed-on: https://code.wireshark.org/review/918
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-03 04:40:20 +00:00