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

48 Commits

Author SHA1 Message Date
Guy Harris 65303efe4d Remove some unneeded includes of <sys/time.h>. 
Change-Id: I9e4e6efa9f8c7dbff7627f8d5fc3278ab383618d
Reviewed-on: https://code.wireshark.org/review/7441
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2015-02-28 04:59:08 +00:00
Michael Mann e333e4c90f Convert OID APIs to use wmem. 
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-19 02:52:11 +00:00
Bill Meier dd859eada4 asn1 generated dissectors: cleanup #include usage 
Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387
Reviewed-on: https://code.wireshark.org/review/6008
Reviewed-by: Bill Meier <wmeier@newsguy.com>
 2014-12-23 05:39:00 +00:00
Stig Bjørlykke 4e1b5ea866 ASN1: Register PDU-dissectors as NEW 
Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64
Reviewed-on: https://code.wireshark.org/review/4494
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
 2014-10-13 11:24:07 +00:00
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
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 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
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
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
Jeff Morriss 3551a86c36 We always HAVE_CONFIG_H so don't bother checking whether we have it or not. 
svn path=/trunk/; revision=45015
 2012-09-20 01:29:52 +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
Stig Bjørlykke 51864807b3 Corrected "old-style function definition". 
svn path=/trunk/; revision=37433
 2011-05-27 11:03:04 +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 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 a7c9f33f3c Guard #include <sys/types.h> with HAVE_SYS_TYPES_H. 
svn path=/trunk/; revision=31054
 2009-11-23 18:54:26 +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
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
Bill Meier fe5c2d9820 g_string_sprintf --> g_string_printf and g_string_sprintfa --> g_string_append_printf 
svn path=/trunk/; revision=25276
 2008-05-11 18:33:49 +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
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
Graeme Lunt 98688eb828 Further tidy up for preference. 
svn path=/trunk/; revision=22539
 2007-08-17 19:40:40 +00:00
Graeme Lunt 3d19c5130b Fix for OSX gremlin in PKCS12 template. 
svn path=/trunk/; revision=22537
 2007-08-17 19:23:15 +00:00
Graeme Lunt 54aa46c2bb Support for decrypting of PKCS#12 bag contents. 
Supports RC2, RC4 and 3DES with SHA1 Password-based Encryption using libgcrypt functions.
Password is provided as a preference, as is trying to decode with a empty/NULL password. 


svn path=/trunk/; revision=22534
 2007-08-17 18:52:40 +00:00
Tomas Kukosa 31e45c7a21 not allow #.FN_HDR/FTR for Wireshark types but only for ASN.1 types 
it makes interconnection between .cnf file and ASN.1 source more readable
(changes for #.FN_BODY will follow)

svn path=/trunk/; revision=22043
 2007-06-05 12:00:57 +00:00
Anders Broman c01f382974 Second step in introducing asn context to BER dissectors just like in PER. 
svn path=/trunk/; revision=21753
 2007-05-13 20:58:29 +00:00
Anders Broman 4c692a62b6 Start introducing actx to ber functions. 
svn path=/trunk/; revision=21705
 2007-05-06 22:34:05 +00:00
Guy Harris 8bc5fca60a Get rid of an unused variable. 
svn path=/trunk/; revision=20845
 2007-02-19 01:15:22 +00:00
Graeme Lunt 7d3a4e9264 New protocol dissector for PKCS#12 - Personal Information Exchange Syntax. 
Generally found within a file (.p12 or .pfx) or as a directory attribute (userPKCS12 from iNetOrgPerson).

Wiki page and sample file to follow.


svn path=/trunk/; revision=20416
 2007-01-13 15:26:13 +00:00