osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity
55386 commits 23 branches 0 tags 1.3 GiB
Commit graph

3101 commits

Author SHA1 Message Date
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
AndersBroman
941088262b Add a cople of missing pcap.extension IE:s 
Change-Id: I7086349f3fb9e3fd8c1ea902ef08b54c27b0a8c5
Reviewed-on: https://code.wireshark.org/review/923
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-04-02 15:53:07 +00:00
AndersBroman
9a977fc8d0 Add dissection of 3G Interface Type package and add some comments about 
the usage of variables in the h248_package_t struct.

Change-Id: Ic5419ab5c20051e56963fe8ea1728d78f95538f0
Reviewed-on: https://code.wireshark.org/review/846
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-03-27 16:54:05 +00:00
AndersBroman
482a3cd1f1 More fiddling with heuristic. 
Change-Id: I50b78cc38c6f529695ecd54ced0ed94e8a683534
Reviewed-on: https://code.wireshark.org/review/835
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-03-26 14:57:14 +00:00
AndersBroman
873a96fab1 Fix off by one error 
Change-Id: I24c9e988786a95489f918bed2c043e6eb23e4caa
Reviewed-on: https://code.wireshark.org/review/834
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-03-26 12:11:39 +00:00
Pascal Quantin
97ab466679 LTE RRC: add file forgotten in gb981173 
Change-Id: I1727e56e678c32402f6331463c06c62072c954d8
Reviewed-on: https://code.wireshark.org/review/833
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-03-26 09:58:15 +00:00
AndersBroman
d6381c6fe6 Strengthen RANAP heuristic. 
Change-Id: I8f6515d2716bb633f753243b7f86d371a22ebbad
Reviewed-on: https://code.wireshark.org/review/826
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-03-25 17:20:48 +00:00
Pascal Quantin
d2ba47392e Upgrade LPPe dissector to V1_1-20140108-C 
Change-Id: I1d5d4ed73825bb5cda0cc2e76e5000c38c50b601
Reviewed-on: https://code.wireshark.org/review/816
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-03-24 21:35:40 +00:00
Pascal Quantin
3626f860a6 Upgrade LTE RRC dissector to v11.7.0 
Change-Id: If1f64241846cc18463c8c5e9da7dd2a5eaba6733
Reviewed-on: https://code.wireshark.org/review/752
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-03-20 15:41:44 +00:00
Pascal Quantin
488f2a0974 Exported PDU: add support for data length on the wire 
Change-Id: Iff14ec4d0297ec85f3597b33871fb0ab5256a597
Reviewed-on: https://code.wireshark.org/review/728
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-03-19 05:13:30 +00:00
Pascal Quantin
d416783bc6 ULP: upgrade dissector to approved version 2.0.1 
Change-Id: I9d7b16c450cb99aa1d66b0a180241c36f8869637
Reviewed-on: https://code.wireshark.org/review/716
Reviewed-by: Evan Huus <eapache@gmail.com>
 2014-03-17 17:25:43 +00:00
Alexis La Goutte
2507ce4cb3 Revert de6bfa12b0 (break Linux and Mac OS X buildbot...) 
Change-Id: If5a6a77909b2d178052605cf2fc6fc0ef758553c
Reviewed-on: https://code.wireshark.org/review/706
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-03-17 09:42:19 +00:00
Alexis La Goutte
de6bfa12b0 Fix build on my old Windows XP Buildbot (With VS2008EE) 
../../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: I8825a2f0b6440ec5a4bbfb49ea5c183dd8cbf03f
Reviewed-on: https://code.wireshark.org/review/705
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-03-17 08:23:04 +00:00
Pascal Quantin
d6548f9301 Remove unused const variables errors seen with recent Clang version 
Fixes bug 9886

Change-Id: I8624ef1c5874aea5521d21c998510fc29c838936
Reviewed-on: https://code.wireshark.org/review/657
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-03-15 17:52:16 +00:00
Alexis La Goutte
5d2409116e Fix indent (use 2 spaces) 
Change-Id: If7872c510d20e9f04e44e3fdf09c023e5ac602d9
Reviewed-on: https://code.wireshark.org/review/648
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-03-15 09:02:56 +00:00
0xbismarck
a59ac1bd10 Bug 9704: GSM_MAP SendRoutingInfoForSM incomplete 
Added the field information for Phase 1 for the Send Routing Info
For Sm message per request of ticket 9704. Code per the suggestion of
Anders Broman. Adding Phase 1 code to GSMMAP.asn.

Did not have any data to verify that the change worked.

Change-Id: Ic387e2e12e8893abb0f453f5010909ffbfd1808c
Reviewed-on: https://code.wireshark.org/review/147
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-03-13 22:14:28 +00:00
Pascal Quantin
b1a05d5517 ULP: add UDP transport 
and fix indent (use 2 spaces)

Change-Id: I558616e3030a55a845cd4ba31ac32f08bdf8376d
Reviewed-on: https://code.wireshark.org/review/634
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-03-13 15:19:11 +00:00
Guy Harris
13d635bf0f Get rid of space-before-tab in indentation. 
Change-Id: If747e7b2af34e27ca8558293140a74691a0113b4
Reviewed-on: https://code.wireshark.org/review/624
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-03-12 22:13:19 +00:00
Guy Harris
c8b6b76996 Thou shalt not put newlines in the strings in value_string tables. 
That just breaks too many things.

This catches the examples of that found in bug 9878.  There might be
others that my grepping didn't find.

We should also have the checkAPIs.pl script check for this, so this
isn't a full fix for bug 9878.

Change-Id: I3bf6f1fc0fe8654d0f54a995e72f1966ae012f5e
Reviewed-on: https://code.wireshark.org/review/623
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2014-03-12 22:10:53 +00:00
Bill Meier
0e3956ddde Remove 1 duplicate #include and several unneeded #include's. 
Change-Id: Iab434edd114082586cc13f05b38e6a9d256a74c5
Reviewed-on: https://code.wireshark.org/review/588
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-03-10 13:27:38 +00:00
Bill Meier
3003f1c791 Use tvb_length() instead of tvb_reported_length_remaining() for a heuristics length check. 
Change-Id: I197fe3d401ffb2d5894c823690a11f4a68fb7268
Reviewed-on: https://code.wireshark.org/review/585
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-03-10 13:23:08 +00:00
AndersBroman
3be07682c7 Omitting SubscriberData makes CONTENT OF fail and InsertSubscriberDataArg will not get all its tags 
Change-Id: I2ace2271d9ce5650e5239c12e64080463aae9367
Reviewed-on: https://code.wireshark.org/review/556
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-03-08 08:56:13 +00:00
Pascal Quantin
3a4b311e8b When dissecting GSM MAPv1/v2 messages, display opcode 44 or 46 as forwardSM 
Fixes bug 9829

Change-Id: Ib56bc7dc79ca27667fb89691817f6e568006d3a8
Reviewed-on: https://code.wireshark.org/review/494
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-03-04 12:19:07 +00:00
Bill Meier
1dff4e309d Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate dissectors. 
Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4
Reviewed-on: https://code.wireshark.org/review/412
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-02-26 19:38:21 +00:00
Stefan Metzmacher
98e6bb18d3 asn1/kerberos: remember in what frame a key was learned 
Change-Id: I8e64e1d02ee8b4dff3845e1b9ec8f56174e76fbf
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/363
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-02-25 21:47:10 +00:00
Alexis La Goutte
88c34ec6c8 Fix Called function pointer is null (null dereference) found by Clang 
../../asn1/h248/packet-h248-template.c:1222:31: warning: Value stored to 'prop' is never read
        if (!prop->dissector) prop = &no_param;

Change-Id: I6d380fbb5fef9dc548385b0b470aea1cb3c34df1
Reviewed-on: https://code.wireshark.org/review/301
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
 2014-02-22 16:43:50 +00:00
Jeff Morriss
8c608e6e82 Remove $Id$ from the ASN.1 dissectors and regenerate them. 
Change-Id: Ie476c6f82f318188b41ed922b92c6fec119ea954
Reviewed-on: https://code.wireshark.org/review/244
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
 2014-02-18 03:05:28 +00:00
Jeff Morriss
7a503703ac Add some asn1 files to .gitignore. 
(Now doing "make -C asn1" doesn't result in any untracked changes.)

Change-Id: I2971407f8227ca6f409cfb60d842d58ff2780500
Reviewed-on: https://code.wireshark.org/review/206
Reviewed-by: Evan Huus <eapache@gmail.com>
 2014-02-14 02:10:00 +00:00
Anders Broman
5236d89e26 Dissector assert in packet-nbap.c. num_items isn't reset before calling a sequence filling the array. 
Closed-bug #9726

Change-Id: Ie4bc538b0788eb32895c9eedf8e0277c6d9ed1b2
Reviewed-on: https://code.wireshark.org/review/120
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Anders Broman <a.broman58@gmail.com>
 2014-02-05 16:03:54 +00:00
Pascal Quantin
8f547d74dc Upgrade RRC dissector to v11.8.0 
Change-Id: If43fc7ec8b5f997e573a9d84fda03f2ca2bf6dc7
Reviewed-on: https://code.wireshark.org/review/94
Tested-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-02-03 22:25:12 +00:00
Stig Bjørlykke
3ba10a7051 Apply g4cc69483 to asn1 templates. 
Change-Id: Id44ef17e7293be5d713c5e9e5d55b25194b46016
Reviewed-on: https://code.wireshark.org/review/86
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
 2014-02-03 10:05:25 +00:00
Martin Mathieson
f903141d65 Send news of SecurityModeFailure to PDCP dissector, which will attempt to roll back to previous setting 
svn path=/trunk/; revision=54978
 2014-01-27 12:06:46 +00:00
Stig Bjørlykke
fbaff1f081 Add back the fix from revision 54693. 
svn path=/trunk/; revision=54976
 2014-01-27 09:55:46 +00:00
Stig Bjørlykke
face757db3 Added back x509af_get_last_algorithm_id() removed in revision 54647 to 
restore usage in cms and pkcs12.  They never got a valid value in 
actx->external.direct_reference because they use another actx in this case.

This will add back the global variable in x509af, but this is needed
until we manage to pass the value in another way.

See comments in bug 9573.

svn path=/trunk/; revision=54975
 2014-01-27 09:02:06 +00:00
Guy Harris
90e6423c38 I don't see any specification of how a H221NonStandardIdentifier is 
encoded, but let's say it's pure ASCII for now.

svn path=/trunk/; revision=54899
 2014-01-22 07:33:57 +00:00
Guy Harris
d262ff8789 Use tvb_get_string_enc() with an explicit encoding; it's a + or a -, so 
just treat it as ASCII.

svn path=/trunk/; revision=54896
 2014-01-22 04:53:43 +00:00
Guy Harris
9ec41e3db2 The stuff you get from dissect_cbs_data() is UTF-8 encoded; treat it as 
such.

Replace proto_tree_add_string(..., tvb_get_string_enc(same ...,
ENC_xxx)) with proto_tree_add_item(..., ENC_xxx).

svn path=/trunk/; revision=54895
 2014-01-22 04:50:23 +00:00
Guy Harris
d85bca8969 Another probably-wrong tvb_get_string(). 
Also, add a URL for the PKCS #12 spec.

svn path=/trunk/; revision=54894
 2014-01-22 04:39:31 +00:00
Guy Harris
051cb78cd9 To quote section B.5 "Keys for password integrity mode" of PKCS #12 
v1.1: Personal Information Exchange Syntax:

	http://www.emc.com/emc-plus/rsa-labs/pkcs/files/h11301-wp-pkcs-12v1-1-personal-information-exchange-syntax.pdf

"When password integrity mode is used to protect a PFX PDU, a password
and salt are used to derive a MAC key.  As with password privacy mode,
the password is a Unicode string, and the salt is a byte string."

So, not having found any other references to salts as text strings, copy
it with tvb_memdup(), not tvb_get_string().

svn path=/trunk/; revision=54893
 2014-01-22 04:27:15 +00:00
Guy Harris
19930d6f49 Clean up indentation and bracketing. 
svn path=/trunk/; revision=54892
 2014-01-22 04:14:05 +00:00
Guy Harris
c85b34ed66 The strings in question are generated as UTF-8 from the CBS encoding, so 
process them as such.

svn path=/trunk/; revision=54891
 2014-01-22 04:13:37 +00:00
Guy Harris
e163578906 Another tvb_get_string() replacement. 
svn path=/trunk/; revision=54890
 2014-01-22 02:41:13 +00:00
Guy Harris
c12dc67752 Strings in LDAP are generally UTF-8, although if we treat something only 
as a string if every byte in it is a printable ASCII character, it's
ASCII.  Use tvb_get_string_enc() with an appropriate encoding.

svn path=/trunk/; revision=54889
 2014-01-22 02:37:45 +00:00
Guy Harris
5e0641f271 Use tvb_get_string_enc() with an explicit encoding. 
svn path=/trunk/; revision=54886
 2014-01-22 02:04:15 +00:00
Guy Harris
e35ca75a68 It's one character, either + or -, hence ASCII. 
svn path=/trunk/; revision=54885
 2014-01-22 01:28:31 +00:00
Guy Harris
a75657bbd6 It's not a string, it's a byte array (bit array, really). 
Also, RFC 5035 isn't a complete ESS spec, it's an update to RFC 2634.

svn path=/trunk/; revision=54884
 2014-01-22 01:22:01 +00:00
Guy Harris
87f4b376f1 Fix one half-changed tvb_get_string() call. 
svn path=/trunk/; revision=54879
 2014-01-21 20:13:17 +00:00
Guy Harris
73598a7991 IA5 = ASCII. Use tvb_get_string_enc() with an explicit encoding, not 
tvb_get_string().

svn path=/trunk/; revision=54877
 2014-01-21 20:08:39 +00:00
Anders Broman
1f8d2e25d2 Update to version V12.3.0 (2013-12). 
svn path=/trunk/; revision=54815
 2014-01-15 07:13:23 +00:00
Guy Harris
f862fc40ba Don't cast away constness. 
svn path=/trunk/; revision=54800
 2014-01-14 18:35:36 +00:00
Guy Harris
570a36436c Consistently use "guint8" for "8-bit byte". 
Constify.

For routines that manipulate sequences of 8-bit bytes, have them take
guint8 pointers rather than void pointers.

Don't cast away constness.

svn path=/trunk/; revision=54795
 2014-01-14 18:03:54 +00:00
Guy Harris
13176da15b Don't cast away constness. 
svn path=/trunk/; revision=54793
 2014-01-14 17:47:31 +00:00
Guy Harris
0a99ee25d5 Don't make claims of constness that can't be guaranteed in terms the C 
compiler can verify.

svn path=/trunk/; revision=54792
 2014-01-14 17:45:03 +00:00
Pascal Quantin
a48b6f4aac Upgrade LTE RRC dissector to v11.6.0 
svn path=/trunk/; revision=54789
 2014-01-14 16:51:10 +00:00
Guy Harris
ecdc864656 Don't cast away constness. 
svn path=/trunk/; revision=54780
 2014-01-14 08:32:50 +00:00
Guy Harris
e1b57afbc9 Don't cast away constness. 
svn path=/trunk/; revision=54779
 2014-01-14 08:30:45 +00:00
Guy Harris
9232db14c7 But *do* cast const void * to the appropriate type. 
svn path=/trunk/; revision=54778
 2014-01-14 08:30:24 +00:00
Guy Harris
1ec9417a43 Don't cast away constness. 
svn path=/trunk/; revision=54777
 2014-01-14 08:26:24 +00:00
Guy Harris
6b8e8d3fea Make a routine not used outside the SNMP dissector static. 
svn path=/trunk/; revision=54751
 2014-01-14 02:06:42 +00:00
Pascal Quantin
41a13add47 Upgrade LPP dissector to v11.5.0 
svn path=/trunk/; revision=54737
 2014-01-13 22:57:31 +00:00
Alexis La Goutte
4a09abdf67 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang 
svn path=/trunk/; revision=54732
 2014-01-13 22:25:13 +00:00
Stig Bjørlykke
a7c8e678bf Added a check for valid algorithm id. 
svn path=/trunk/; revision=54653
 2014-01-08 08:19:51 +00:00
Michael Mann
92a567f20d Make global algorithm_id in x509af dissector a direct_reference instead. Bug 9573 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9573). Removes valgrind warnings as well as just being Good Code. 
svn path=/trunk/; revision=54647
 2014-01-08 04:55:59 +00:00
Anders Broman
5a3ba6c19b Omit assignment for not used types. 
svn path=/trunk/; revision=54614
 2014-01-06 08:30:53 +00:00
Anders Broman
0c3f422b30 Omit assignment for not used types. 
svn path=/trunk/; revision=54596
 2014-01-04 17:48:15 +00:00
Anders Broman
3a533ccc32 Omit assignment for not used types. 
svn path=/trunk/; revision=54593
 2014-01-04 12:03:02 +00:00
Anders Broman
c7c5e4f54e Omit assignment for not used types. 
svn path=/trunk/; revision=54592
 2014-01-04 11:54:27 +00:00
Anders Broman
6b58ef91d4 Omit assignment for not used types. 
svn path=/trunk/; revision=54591
 2014-01-04 11:48:40 +00:00
Anders Broman
42e0144f08 Remove unused function and variable. 
svn path=/trunk/; revision=54590
 2014-01-04 11:40:43 +00:00
Anders Broman
2334acec2c Omit assignment for not used types. 
svn path=/trunk/; revision=54589
 2014-01-04 11:34:46 +00:00
Anders Broman
4763f36a75 Omit assignment for not used types. 
svn path=/trunk/; revision=54588
 2014-01-04 11:26:30 +00:00
Anders Broman
2b32fed0ef Omit assignment for not used types. 
svn path=/trunk/; revision=54587
 2014-01-04 11:24:33 +00:00
Anders Broman
72970675bd Add the rest of the NOKIA extensions. 
svn path=/trunk/; revision=54586
 2014-01-04 10:06:04 +00:00
Anders Broman
4f62f2cfa3 Add a few more of the NOKIA extensions. 
svn path=/trunk/; revision=54580
 2014-01-03 13:29:48 +00:00
Anders Broman
b22d9ab940 Disabling building of the gnm dissector, I don't tink it was ever used. 
svn path=/trunk/; revision=54561
 2014-01-02 18:01:33 +00:00
Anders Broman
3cb2c58eaf Fix [-Wmissing-prototypes] 
svn path=/trunk/; revision=54552
 2014-01-02 11:27:10 +00:00
Bill Meier
c228237fac Change incorrect property 'keywords' to 'svn:keywords' 
svn path=/trunk/; revision=54540
 2014-01-01 18:08:30 +00:00
Pascal Quantin
6ebc058f47 Add proto_tree_add_ts_23_038_7bits_item() / tvb_get_ts_23_038_7bits_string() functions and update dissectors to use it. 
Remove gsm_sms_char_7bit_unpack() / gsm_sms_chars_to_utf8() functions.
Update documentation a bit.

svn path=/trunk/; revision=54534
 2014-01-01 14:33:19 +00:00
Pascal Quantin
aa796df61c Add SVN properties 
svn path=/trunk/; revision=54511
 2013-12-31 14:50:52 +00:00
Martin Kaiser
43e892e985 From Dirk 
dissector for Novell's PKIS certificate extensions

from me
clean up the $Id$ tags
remove packet-pkis(-template).h
remove ASN.1 definitions that cause compiler warnings
   (OID, SecurityLabelType2)
move the dissector to the clean ASN.1 dissectors
support CMake build
change the name to novell_pkis

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9597

svn path=/trunk/; revision=54508
 2013-12-31 14:20:08 +00:00
Guy Harris
1c9b36ad46 gcamel_StatSRT is set by the CLI CAMEL tap, so it can't be static. 
svn path=/trunk/; revision=54502
 2013-12-30 22:31:04 +00:00
Michael Mann
58346b6327 Move tcap and camel "persistent data" functionality to the dissectors themselves instead of being part of epan directory. 
svn path=/trunk/; revision=54499
 2013-12-30 22:07:38 +00:00
Guy Harris
edb6cf0b16 Get rid of no-longer-used variables. 
svn path=/trunk/; revision=54433
 2013-12-24 01:30:00 +00:00
Guy Harris
0d7a48a8bf Add a ENC_3GPP_TS_23_038 encoding, for the standard SMS alphabet in a 
bit-packed string, and use it in some places.

svn path=/trunk/; revision=54428
 2013-12-24 00:20:09 +00:00
Guy Harris
5084f58ce2 We support ENC_UCS_2, so use that in proto_tree_add_item() and 
tvb_get_string_enc() rather than using iconv to convert it to UTF-8.

svn path=/trunk/; revision=54350
 2013-12-22 02:12:32 +00:00
Jakub Zawadzki
deb2b236f2 Add missing includes 
svn path=/trunk/; revision=54332
 2013-12-21 17:23:17 +00:00
Jakub Zawadzki
33ef0c2600 isascii(x) && isprint(x) -> g_ascii_isprint(x) 
svn path=/trunk/; revision=54328
 2013-12-21 15:12:11 +00:00
Jakub Zawadzki
064082e68a Change G_GINT64_CONSTANT(xxxxU) to G_GUINT64_CONSTANT(xxxx) 
svn path=/trunk/; revision=54314
 2013-12-20 22:39:32 +00:00
Jakub Zawadzki
90c8f5dde0 Copy Evan r54250 changes to asn/ 
Rename more to_str functions to have ep_ in the name if they return ephemeral buffers.

svn path=/trunk/; revision=54313
 2013-12-20 22:32:11 +00:00
Evan Huus
6be37815a1 Add bytestring_to_str() which takes a wmem scope and is otherwise identical to 
bytestring_to_ep_str (now deprecated). Use the new one in a few obvious places.

Also just print directly to the buffer when loading ethernet addresses for
resolution. The straight-to-buffer bytes_to_hexstr seems useful, maybe it
shouldn't be in a private header...

svn path=/trunk/; revision=54270
 2013-12-19 20:53:44 +00:00
Pascal Quantin
771dc849f5 Update file forgotten in r54250 
svn path=/trunk/; revision=54264
 2013-12-19 18:58:31 +00:00
Evan Huus
2ae8edccea Rename more to_str functions to have ep_ in the name if they return ephemeral 
buffers. Remove two unused functions.

svn path=/trunk/; revision=54250
 2013-12-19 16:28:39 +00:00
Evan Huus
a6415ece0a Rename a couple of to_str functions to have ep_ in the name. This makes it 
obvious that the returned string is ephemeral, and opens up the original names
in the API for versions that take a wmem pool (and thus can work in any scope).

svn path=/trunk/; revision=54249
 2013-12-19 15:49:09 +00:00
Guy Harris
317b828986 Use proto_tree_add_item() or tvb_get_string_enc() instead of 
tvb_get_unicode_string().  If there's an indication that the encoding is
UCS-2, use that, otherwise use UTF-16.  (For example, "BMP" stands for
"Basic Multilingual Plane", which is the part of Unicode that can be
encoded in 16 bits, hence UCS-2.)

In the description of the "Use Heuristics for UDP" preference for the
XML dissector, note that it's not just trying to recognize XML in UCS-2,
it's trying to recognize XML in *big-endian* UCS-2.

svn path=/trunk/; revision=54245
 2013-12-19 09:19:33 +00:00
Evan Huus
8f665d9b36 Add a sixteenth element to all BCD digit sets to avoid garbage values when 
decoding corrupt bytes. Some of these digit sets could probably be
deduplicated...

svn path=/trunk/; revision=54224
 2013-12-18 15:54:32 +00:00
Anders Broman
e6d09c1634 Make local functions static. Include *.h when needed. 
svn path=/trunk/; revision=54201
 2013-12-17 22:07:32 +00:00
Jakub Zawadzki
4d92f6079b Remove not needed ';' 
svn path=/trunk/; revision=54088
 2013-12-14 11:12:20 +00:00
Chris Maynard
4b609d4c92 Reject the packet if data is NULL. For now, leave the DISSECTOR_ASSERT's since both get_rose_ctx() and get_asn1_ctx() also check signatures. 
svn path=/trunk/; revision=53965
 2013-12-12 19:04:38 +00:00
Chris Maynard
a97a3152b0 Reject the packet if data is NULL. Remove _U_ where data is actually used. For now, leave the DISSECTOR_ASSERT's since both get_rose_ctx() and get_asn1_ctx() also check signatures. 
(Arguably it's the responsibility of the dissector passing this information to set the signature correctly so if there's an invalid signature, the bug is with the calling dissector and not with the one receiving the invalid signature.)

svn path=/trunk/; revision=53964
 2013-12-12 18:10:08 +00:00
Alexis La Goutte
16f85131bd Fix (-W)unused-const-variable error found by Clang 
svn path=/trunk/; revision=53935
 2013-12-11 13:14:00 +00:00
Anders Broman
25ce6c262e - Forward declaration of register functions. 
svn path=/trunk/; revision=53908
 2013-12-10 17:41:57 +00:00
Martin Kaiser
ff42551d71 comment out unused functions 
fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9538
reported by Yaniv Kaul

svn path=/trunk/; revision=53902
 2013-12-10 10:52:29 +00:00
Anders Broman
acf2fed688 - Forward declaration of register functions. 
svn path=/trunk/; revision=53901
 2013-12-10 06:01:16 +00:00
Chris Maynard
babc735c3a Reject the packet if data is NULL. For now, leave the DISSECTOR_ASSERT(rose_ctx_tmp) since get_rose_ctx() also checks the signature, which might be invalid even if data is not NULL. 
svn path=/trunk/; revision=53896
 2013-12-09 22:38:42 +00:00
Chris Maynard
79fa0d0a3f Reject the packet if data is NULL without doing anything else. 
Note: We *might* want to do _something_ but that _something_ should be well-defined and consistent across all dissectors.  Previously, some dissectors called proto_tree_add_text() to add some error message text to the tree, while others called DISSECTOR_ASSERT().

svn path=/trunk/; revision=53895
 2013-12-09 22:23:44 +00:00
Anders Broman
b693f74b89 - Forward declaration of register functions. 
svn path=/trunk/; revision=53877
 2013-12-09 06:50:09 +00:00
Anders Broman
0d46cdae53 - Forward declaration of register functions. 
svn path=/trunk/; revision=53876
 2013-12-09 06:20:42 +00:00
Anders Broman
6e2465b94e - Forward declaration of register functions. 
svn path=/trunk/; revision=53873
 2013-12-08 22:11:18 +00:00
Anders Broman
4124b7aa17 - Forward declaration of register functions. 
svn path=/trunk/; revision=53872
 2013-12-08 22:02:12 +00:00
Pascal Quantin
93398e794e Use STR_UNICODE display instead of proto_tree_add_unicode_string() in the remaining dissectors 
svn path=/trunk/; revision=53867
 2013-12-08 20:03:15 +00:00
Anders Broman
5db045212e - Forward declaration of register functions. 
svn path=/trunk/; revision=53862
 2013-12-08 16:50:07 +00:00
Anders Broman
8983ae005a - Forward declaration of register functions. 
svn path=/trunk/; revision=53861
 2013-12-08 16:40:49 +00:00
Anders Broman
c9884f573a - Forward declaration of register functions. 
svn path=/trunk/; revision=53860
 2013-12-08 15:52:29 +00:00
Anders Broman
b630ccec17 - Forward declaration of register functions. 
svn path=/trunk/; revision=53859
 2013-12-08 15:40:10 +00:00
Anders Broman
eb252d2d34 - Make local functions static. 
- Forward declaration of register functions.

svn path=/trunk/; revision=53821
 2013-12-07 11:37:58 +00:00
Stig Bjørlykke
470a022c6d Fix for dissecting cdt without having a tree. 
svn path=/trunk/; revision=53777
 2013-12-04 09:39:19 +00:00
Jakub Zawadzki
65db82872c When including <epan/prefs.h> don't force inclusion of <epan/uat.h> 
svn path=/trunk/; revision=53769
 2013-12-03 22:16:49 +00:00
Chris Maynard
231e52a9ea Reject the packet if data is NULL without doing anything else. 
svn path=/trunk/; revision=53737
 2013-12-02 21:52:46 +00:00
Chris Maynard
9b38829b34 Reject the packet if data is NULL without doing anything else. 
svn path=/trunk/; revision=53708
 2013-12-02 02:31:04 +00:00
Chris Maynard
42a64c3557 If data is NULL, the bug, if any, is not with *this* dissector, but with whichever one failed to pass the data properly. 
svn path=/trunk/; revision=53706
 2013-12-02 02:07:42 +00:00
Jörg Mayer
40c6d9abcb Copy over rev 53700 to cmake 
svn path=/trunk/; revision=53702
 2013-12-01 21:56:40 +00:00