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

62 Commits

Author SHA1 Message Date
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
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
Jörg Mayer 59417deed4 I added EXPORT_FILES in too many places, remove them 
(via "copy - modify too little - paste" cycle)

svn path=/trunk/; revision=49255
 2013-05-11 22:02:33 +00:00
Jörg Mayer b22ed68d8d Some more protocols can be generated via cmake 
svn path=/trunk/; revision=49233
 2013-05-10 14:55:15 +00:00
Jörg Mayer 243e9c0ba5 Just whitespace changes 
svn path=/trunk/; revision=49167
 2013-05-05 08:49:18 +00:00
Jörg Mayer 8faa262e90 Stub cmake support for generating the asn1 dissectors. 
It doesn't do anything yet, it is just to make svn status
readable again.

svn path=/trunk/; revision=49007
 2013-04-23 23:05:33 +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
Jeff Morriss b21b495f9f Don't generate the conformance file for exported types when building the 
dissector; instead built it only when the separate target (generate_export)
is built.

Built generate_export when building "all".

This prevents the exp_*.cnf files from being regenerated each time another one
of the exp_*.cnf files (which the current dissector depends on) has changed
(despite the fact that the exported types does not depe

Also fix the CLEANFILES definition so it actually cleans things.

svn path=/trunk/; revision=39421
 2011-10-14 10:22:01 +00:00
Jeff Morriss cf012d27b1 Build the ASN.1 dissectors directly into epan/dissectors (rather than building 
them and then copying them over).  The "all" target to builds these dissectors
now (instead of "generate_files" and/or "copy_files").

asn2wrs's "-O" option now means "the dissector goes in this directory" (rather
than "all output goes in this directory"); it also means that the "-s" (single
output file) option is now required.

Fix things up so that it's possible to build all of the ASN.1 dissectors in
one shot.

Fix building of conformance files when doing out-of-source-tree builds.


Unfortunately "make all" in the asn1 directory always builds something--I think
because of circular depedencies.

svn path=/trunk/; revision=39333
 2011-10-10 02:31:11 +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 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
Guy Harris b395a98305 Squelch a bunch of compiler warnings. 
svn path=/trunk/; revision=31961
 2010-02-23 04:35:23 +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 7ab993bee7 Remove unused NEED_PACKET_PROTO_H variable 
svn path=/trunk/; revision=30409
 2009-10-08 17:26:57 +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
Anders Broman 201b5205df Get rid of some unused code warnings and fix an Id marking and some indentation changes. 
svn path=/trunk/; revision=25803
 2008-07-23 12:45:24 +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
Tomas Kukosa 3523d6c825 get rid of get_ber_last_created_item() 
svn path=/trunk/; revision=24002
 2008-01-03 13:20:10 +00:00
Jörg Mayer 3d22aa561b asn1/*/Makefile.nmake were not part of the source package. 
Spotted by Tomas Kukosa.

svn path=/trunk/; revision=23921
 2007-12-19 10:02:50 +00:00
Tomas Kukosa 1e794fc494 ANSI TCAP regenerated and tested with -T -X asn2wrs options 
asn2wrs has -T (tagged types support) and -X (new BER sttructures) default behavior
remove all -T and -X usage

svn path=/trunk/; revision=23823
 2007-12-10 08:35:41 +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
Jörg Mayer c2d0c8fa31 - Fix svn:ignore for all directories 
- gsmmap: uncomment -s option in gsmmap.cnf
- Fix cyclic dependencies:
  + Remove EXPORT_CNF from dependencies for cnf files
  + Replace all INCLUDE ...-exp.cnf with IMPORT ...-exp.cnf

svn path=/trunk/; revision=23202
 2007-10-16 13:59:40 +00:00
Jörg Mayer 060e9ed954 Add missing dependencies and update syntax of existing ones. 
svn path=/trunk/; revision=23143
 2007-10-10 22:26:40 +00:00
Jörg Mayer 61cde0d09e - Change Makefiles to include preinc 
- Add missing new directories to asn1/Makefile.nmake

svn path=/trunk/; revision=23141
 2007-10-10 19:03:24 +00:00