osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
54,415 Commits 26 Branches 0 Tags 795 MiB
Commit Graph

61 Commits

Author SHA1 Message Date
Michael Mann cd02af56a1 Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors. 
This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions.

Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree.

Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141
Reviewed-on: https://code.wireshark.org/review/3500
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
 2014-08-09 01:57:08 +00:00
Joerg Mayer 836feeb559 Remove unneeded sys/types.h 
Change-Id: I03cd66cb9a2d01ea40308b338955756d08a36516
Reviewed-on: https://code.wireshark.org/review/2604
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
 2014-06-24 02:08:07 +00:00
Evan Huus 37b903d7ab batch of tvb-length conversions 
Change-Id: I76ca4d075756e3ac691070e0c05344a410ea2498
Reviewed-on: https://code.wireshark.org/review/2507
Reviewed-by: Evan Huus <eapache@gmail.com>
 2014-06-21 04:01:52 +00:00
Michael Mann 14824e6adf Revert "Fixup: tvb_* -> tvb_captured" 
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
 2014-06-19 18:25:59 +00:00
Dario Lombardo 246fe2ca4c Fixup: tvb_* -> tvb_captured 
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
 2014-06-18 14:14:58 +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
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
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 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
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
Michael Mann c0fcebb07a Add a data parameter to call_ber_oid_callback to be able to pass data to subdissectors found with dissector_try_string_new. 
The intention is to aid in the removal of pinfo->private_data use as well as static global variables in a dissector.  For now, all calls to call_ber_oid_callback have the data parameter set to NULL.

svn path=/trunk/; revision=52994
 2013-10-31 00:57:03 +00:00
Pascal Quantin a0c53ffaa1 emem -> wmem conversion: 
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly

svn path=/trunk/; revision=52172
 2013-09-22 15:50:55 +00:00
Evan Huus 0d3718b467 Add some missing wmem includes that apparently only show up on Windows. 
svn path=/trunk/; revision=50071
 2013-06-19 23:53:25 +00:00
Evan Huus 8b0f1addd9 Apparently one of our major global headers must include emem.h, because I just 
found a bunch more asn1 dissectors using emem without ever directly including
the header. Convert those to wmem as well, which involves add a number of
#include directives since dissectors do *not* automatically pull in the wmem
headers.

svn path=/trunk/; revision=50066
 2013-06-19 23:08:58 +00:00
Pascal Quantin 0ee4d0a00a Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402

svn path=/trunk/; revision=49599
 2013-05-27 20:26:49 +00:00
Pascal Quantin a37c044203 Update the ASN.1 based dissectors following the changes done in r48812 
svn path=/trunk/; revision=48820
 2013-04-11 18:14:53 +00:00
Anders Broman dafdc19d9e -Wmissing-prototypes 
svn path=/trunk/; revision=48609
 2013-03-28 07:34:13 +00:00
Anders Broman 9991973c37 Use explicit casts. 
svn path=/trunk/; revision=48008
 2013-03-02 14:51:04 +00:00
Martin Kaiser 38a73a32f3 include the wsutil/wsgcrypt.h instead of including gcrypt.h directly 
svn path=/trunk/; revision=47802
 2013-02-21 18:23:29 +00:00
Bill Meier 52e47754f1 Fix [-Wshadow] warnings. 
svn path=/trunk/; revision=46357
 2012-12-03 22:27:46 +00:00
Jakub Zawadzki 7a9d27c33f Regenerate asn.1 dissectors. 
svn path=/trunk/; revision=45110
 2012-09-24 19:38:46 +00:00
Jeff Morriss 2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not. 
svn path=/trunk/; revision=45017
 2012-09-20 02:03:38 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address. 
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
 2012-06-28 22:56:06 +00:00
Anders Broman 42b44648c8 Get rid of Warnings. 
svn path=/trunk/; revision=39954
 2011-11-20 08:59:19 +00:00
Bill Meier 24cf0aad06 Update generated ASN1 *.[hc] files after recent work done by Jeff Morriss; 
The only change in each file is in a comment showing the asn2wrs cmd used to build that file.

svn path=/trunk/; revision=39427
 2011-10-15 19:27:27 +00:00
Stig Bjørlykke 51864807b3 Corrected "old-style function definition". 
svn path=/trunk/; revision=37433
 2011-05-27 11:03:04 +00:00
Stig Bjørlykke a7c5d642d5 Regenerate ASN.1 dissectors to update the #line directive. 
svn path=/trunk/; revision=37118
 2011-05-13 08:12:27 +00:00
Jeff Morriss a0c858efcd Add a little more code to avoid not-very-useful blurbs: 
- Change spaces in the name to underscores before comparing it to the blurb.
  - Check if the type simply as T_ prepended to the name.
  - Don't put in a blurb of "NULL".

and regenerate the dissectors.

svn path=/trunk/; revision=32748
 2010-05-11 03:53:31 +00:00
Jeff Morriss e47ad9a37f Regenerate a few more of the ASN.1 dissectors 
svn path=/trunk/; revision=32745
 2010-05-11 02:37:46 +00:00
Bill Meier 9ade30a7b1 #include <string.h> and/or #include <stdio.h> not needed. 
svn path=/trunk/; revision=32417
 2010-04-07 16:54:29 +00:00
Anders Broman 176c304090 Try to fix Bug 4648 - pkcs12 ASN1 generated dissector differs from epan/dissectors version. 
It's a pain to get these circular dependencies right.

svn path=/trunk/; revision=32409
 2010-04-06 20:22:19 +00:00
Anders Broman 324af9e6fa Fix part of Bug 3917 "tvb_new_real_data is prone to memory leak" 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3917

svn path=/trunk/; revision=31499
 2010-01-11 16:14:26 +00:00
Gerald Combs 8fc1491a60 Switch to using a bundled version of the openSUSE Build Service packages 
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
longer have winposixtype.h, so remove its #includes and add a ssize_t
typedef to config.h.win32.

svn path=/trunk/; revision=31341
 2009-12-21 21:06:01 +00:00
Stig Bjørlykke d577ca0fa7 Guard #include <sys/types.h> with HAVE_SYS_TYPES_H. 
svn path=/trunk/; revision=31053
 2009-11-23 18:47:52 +00:00
Stig Bjørlykke 6d1dae6f28 Make all proto_* values static. 
svn path=/trunk/; revision=30516
 2009-10-11 16:24:29 +00:00
Kovarththanan Rajaratnam 66afe84075 Use <gcrypt.h> instead of 'gcrypt.h' 
svn path=/trunk/; revision=29501
 2009-08-21 20:40:49 +00:00
Stig Bjørlykke b228488bc0 From Kovarththanan Rajaratnam via bug 3548: 
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770
 2009-06-18 21:30:42 +00:00
Stig Bjørlykke c47e788c94 Regenerate all asn2wrs generated dissectors. 
svn path=/trunk/; revision=28379
 2009-05-16 22:07:03 +00:00
Bill Meier 35e5fa9bc1 #include <epan/conversation.h> and/or #include <epan/emem.h> not req'd ... 
svn path=/trunk/; revision=27390
 2009-02-07 14:33:47 +00:00
Tomas Kukosa 4726aec5b0 fix problem with X.411 asn2wrs compilation, all dissectors regenerated 
svn path=/trunk/; revision=26740
 2008-11-10 13:36:24 +00:00
Anders Broman e375c3990a Regenerate all asn2wrs generated dissectors 
svn path=/trunk/; revision=26670
 2008-11-01 22:30:14 +00:00
Bill Meier 61465d4141 Fix some of the Errors/warnings detected by checkapi 
svn path=/trunk/; revision=25274
 2008-05-11 17:27:41 +00:00
Stig Bjørlykke 7629966a00 - Removed some unused variables in asn1 dissectors 
- Fixed last parameter to cry_cipher_open() in pkcs12

svn path=/trunk/; revision=24116
 2008-01-16 20:41:23 +00:00
Tomas Kukosa 3523d6c825 get rid of get_ber_last_created_item() 
svn path=/trunk/; revision=24002
 2008-01-03 13:20:10 +00:00
Anders Broman 9492700608 Change: 
get_oid_str_name() -> oid_resolved_from_string()
get_oid_name() -> oid_resolved_from_encoded()

svn path=/trunk/; revision=23331
 2007-11-01 19:36:39 +00:00
Bill Meier 7e4a5b0194 Include winposixtype.h only if building with GNUTLS; Bug #1949: Part 1 of fix 
[asn1 template plu generated .c file]

svn path=/trunk/; revision=23301
 2007-10-29 00:58:06 +00:00
Luis Ontanon 00c5e48a17 get users of oid_resolv to use the new oids, rollout packet-snmp.c 
svn path=/trunk/; revision=22651
 2007-08-25 01:14:24 +00:00
Jörg Mayer b312e64f6a get_ber_length doesn't need the tree argument, get rid of it. 
Rebuild asn1 dissectors.

svn path=/trunk/; revision=22627
 2007-08-24 07:12:04 +00:00