osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity
53022 commits 26 branches 0 tags 795 MiB
Commit graph

104 commits

Author SHA1 Message Date
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
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
b693f74b89 - Forward declaration of register functions. 
svn path=/trunk/; revision=53877
 2013-12-09 06:50:09 +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
Chris Maynard
ab7d8cc87d Fix a couple of EXPORT_DEPENDS 
svn path=/trunk/; revision=52135
 2013-09-18 03:58:07 +00:00
Jörg Mayer
de20bbf0ac More dependeny updates for asn1 -exp.cnf files. 
Only three remaining: p7, p22, x509ce - thanks to Chris Maynard for the list.

svn path=/trunk/; revision=52127
 2013-09-17 19:43:37 +00:00
Jeff Morriss
2df54da6e2 Move a bunch of the crypt modules and pint.h into wsutil. 
This means wsutil now links against libcrypt.

Protect a bunch of the crypt header files from multiple inclusion.

svn path=/trunk/; revision=51100
 2013-08-01 23:34:47 +00:00
Jörg Mayer
d18b094a55 Another set of asn1 protocols can now be generated with cmake 
svn path=/trunk/; revision=49197
 2013-05-07 10:50:47 +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
Stig Bjørlykke
f267dda0d5 Added attributes from RFC 2798. 
svn path=/trunk/; revision=46013
 2012-11-12 22:00:53 +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
Chris Maynard
86cbd0b559 #include <epan/crypt/crypt-*.h> => #include <epan/crypt/*.h> 
svn path=/trunk/; revision=40570
 2012-01-18 21:20:50 +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
2025f2e5f5 Add changes in r35546 to template and conformation file. 
svn path=/trunk/; revision=36010
 2011-02-20 15:05:21 +00:00
Jeff Morriss
0ff5638f37 Replace blurbs that match the name (case insensitive) with NULL. 
svn path=/trunk/; revision=34227
 2010-09-23 21:46:31 +00:00
Stig Bjørlykke
38a7ac0910 Fix modifier in .cnf file. 
svn path=/trunk/; revision=33913
 2010-08-24 15:46:33 +00:00
Stig Bjørlykke
98493ff110 Rewrote to fetch content_tvb from dissect_ber_octet_string(). 
Display eContent entry (with length) in tree.

svn path=/trunk/; revision=33912
 2010-08-24 15:43:32 +00:00
Stig Bjørlykke
cb4a91a8ca Register SignedData as a BER syntax dissector. 
svn path=/trunk/; revision=32459
 2010-04-14 07:57:01 +00:00
Bill Meier
f8b92f8d0b #include <stdio.h> not needed. 
svn path=/trunk/; revision=32405
 2010-04-06 17:01:14 +00:00
Stig Bjørlykke
cd55a9d56e Build dependencies for x509ce and x509sat. 
svn path=/trunk/; revision=32050
 2010-02-28 18:53:50 +00:00
Stig Bjørlykke
d215938257 Update to RFC5652. 
svn path=/trunk/; revision=31501
 2010-01-12 14:29:53 +00:00
Stig Bjørlykke
89980e1672 Update to RFC3369. 
svn path=/trunk/; revision=31500
 2010-01-12 11:49:17 +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
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
ac5909c827 Get rid of some unused code warnings. 
svn path=/trunk/; revision=25796
 2008-07-22 18:55:49 +00:00
Anders Broman
742ae8413d Get rid of some unused code warnings. 
svn path=/trunk/; revision=25791
 2008-07-22 17:28:38 +00:00
Anders Broman
a67838484c Get rid of ber_created_item(). 
svn path=/trunk/; revision=24007
 2008-01-03 17:49:59 +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
Anders Broman
528ac73cfd Use oid_add_from_string for adding names. 
svn path=/trunk/; revision=23318
 2007-10-31 08:26:52 +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
0e0bed500d - Remove -e option if the generated -exp.cnf file isn't used. 
- Add EXPORT_FILES to all files that still contain -e.

svn path=/trunk/; revision=23145
 2007-10-11 05:27:27 +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
Jörg Mayer
4a5f7e88a7 Convert some more protocols to new Makefile style. 
Renamed the gsmmap template files to not contain an _

svn path=/trunk/; revision=23083
 2007-10-07 20:02:30 +00:00
Jörg Mayer
548b224e28 Change some additional protocols to the new build system 
svn path=/trunk/; revision=22958
 2007-09-25 18:02:49 +00:00
Anders Broman
91828d3303 Regenerate with -X and -T option. 
Should "sha-1 OBJECT IDENTIFIER..." etc be registerd as oid names?

svn path=/trunk/; revision=22858
 2007-09-13 05:22:51 +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
0e9f4f05f1 Support for the decryption of EncryptedData which is used by PKCS12 
Uses the PBE routines from PKCS12.


svn path=/trunk/; revision=22535
 2007-08-17 19:14:39 +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