Commit Graph

48 Commits

Author SHA1 Message Date
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
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
Stig Bjørlykke f267dda0d5 Added attributes from RFC 2798.
svn path=/trunk/; revision=46013
2012-11-12 22:00:53 +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
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 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
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
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
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 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
Graeme Lunt 4829b901de Support for recognising RC4 algorithm.
svn path=/trunk/; revision=21151
2007-03-23 16:45:49 +00:00
Graeme Lunt c4b562e988 Support for SMIMECapabilities and KeyPreference attributes.
ContentInfo syntax for .p7s, .p7c and .p7m files.


svn path=/trunk/; revision=20585
2007-01-28 10:20:51 +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
Tomas Kukosa 56d7db0c08 remove functions register_ber_oid_name() and get_ber_oid_name() from packet-ber.c, they were only OID but not BER related
use add_oid_str_name() and get_oid_str_name() instead of them

svn path=/trunk/; revision=18595
2006-06-28 14:19:08 +00:00
Tomas Kukosa 604000a6b3 - remove some #.MODULE_IMPORT from .cng files
- regenerate BER dissectors so as to change rest of Ethereal->Wireshark and asn2eth -> asn2wrs

svn path=/trunk/; revision=18217
2006-05-24 12:24:54 +00:00
Guy Harris 76bcc9bd3f Squelch some compiler const vs. non-const warnings.
svn path=/trunk/; revision=16710
2005-12-06 22:59:30 +00:00
Anders Broman f27bf13022 From Grame Lunt:
a patch for the X.411, X420 and CMS dissectors to implement the remaining heading extensions and bodyparts.

This includes GeneralText BP, forwarded content BP (forwarded p22 and forwarded p772), PKCS#7 BP, and "business class" messaging extensions.

The X.411 extensions using the SIGNATURE macro have also been implemented. There is also a fix for a bug in the dissection of integer 22 content type.

Graeme

svn path=/trunk/; revision=16689
2005-12-05 23:00:03 +00:00
Anders Broman c33182b898 From Graeme Lunt:
Here are a number of small patches for asn1 based dissectors:

acse:
  release request/response column information (many X.400/X.500 unbinds are
empty)
  "standardised" PNAME to "ISO 8650-1 OSI Association Control Service"
  fix for crash when using EXTERNAL dissector

rtse:
  column information when attempting a resume

x509if:
  generation of LDAP-style DNs from RDNSequences 
  new function x509if_get_last_dn() to get the last DN generated.

x509af:
  DSS parameters
  certificate extension naming
  subject naming of certificate

x509sat:
  Guide syntax (as SET now supported)
  PDU exports.
  
cms:
  verification of message digest attribute (SHA-1 and MD5)
  
ess:
  enumerated/restrictive/permissive/informative security categories

x411:
  generation of string encoding of X.400 addresses, trace information and message identifiers.

s4406:
  separate types for primary and copy precedence to allow better filtering (e.g. primary precedence = flash)
  priority-level-qualifier


svn path=/trunk/; revision=16508
2005-11-16 07:13:12 +00:00
Tomas Kukosa 3b770d5c7c - dissect_ber_object_identifier() returns value as tvb
- new dissect_ber_object_identifier_str() function
 - BER dissectors adapted and regenerated

svn path=/trunk/; revision=16501
2005-11-14 10:02:31 +00:00
Anders Broman 8a31ec4d19 From Graeme Lunt
X420 - incorrect ExtendedBodyPart handling
ACSE - support for implicitly tagged EXTERNALs and dissection based upon direct-reference RTSE - same change for RTSE EXTERNAL handling as above CMS  - support for ContentType, MessageDigest, SigningTime and CounterSignature attributes ESS  - support for ESSSecurityLabel and EquivalentLabels attributes


svn path=/trunk/; revision=16071
2005-10-03 05:16:57 +00:00
Anders Broman 2bac3e70c5 From Graeme Lunt
allows the dissection of ContentInfo based upon it's OID - something that is used for a secure X.400 messages (Protecting Content Type (PCT)).

svn path=/trunk/; revision=16069
2005-10-02 21:14:35 +00:00
Guy Harris 34ae8c850f Fix up a bunch of arguments to "dissect_ber_identifier()" to match its
current signature ("class" is a "gint8 *", not a "guint8 *", and "tag"
is a "gint32 *", not a "guint32 *").  Re-generate the dissectors from
the ASN.1 and the .cnf files in the cases where the arguments were fixed
in a .cnf file.

Give some dissectors the right svn:keywords and svn:eol-style settings.

svn path=/trunk/; revision=14885
2005-07-09 02:58:07 +00:00
Ronnie Sahlberg 20a4d3257e Add a tree parameter to get_ber_length() so that
IF the length seems bogus, like longer than the reported tvb_length
we add a helpful text item to the tree  and generate a [malformed packet]


change all callers of get_ber_length to the new signature.



svn path=/trunk/; revision=14145
2005-04-20 08:35:47 +00:00
Ronnie Sahlberg 69dd4345c1 export EnvelopedData
svn path=/trunk/; revision=12824
2004-12-24 11:24:35 +00:00
Ronnie Sahlberg 8afae320de update of the asn2eth compiler to use the types ber_[choice|sequence]_t instead of ber_[choice|sequence]
regenerated all dissectors


fixed the choice/sequence struct to use unsigned entities for class and tag
(to reduce some compiler warning and because it should be signed quantities)



svn path=/trunk/; revision=12740
2004-12-13 08:15:34 +00:00
Ronnie Sahlberg f102c20151 New protocol: RFC2634 ExtendedSecurityServices
updates to cms to accomodate the new protocol

add author to some files


svn path=/trunk/; revision=12573
2004-11-22 03:36:26 +00:00
Ronnie Sahlberg 00e3474dec cleanup for x509af
svn path=/trunk/; revision=12558
2004-11-21 10:16:06 +00:00
Ronnie Sahlberg 8b9b044698 update to x509if autogenerate the exports conformance file and create a small makefile since i am tired of typing that long command line every time
svn path=/trunk/; revision=12555
2004-11-21 08:22:21 +00:00
Ronnie Sahlberg d1e31a5c20 make CMS use the new ANY type and get rid of the workaround
svn path=/trunk/; revision=12491
2004-11-06 02:06:55 +00:00
Ronnie Sahlberg b2160d6d25 update to cms to use workaround to lack of ANY and reducing the template significantly
svn path=/trunk/; revision=12434
2004-10-29 12:11:42 +00:00
Gerald Combs 24f30a8850 Add support for pkauthdata and pkdhkeydata OIDs.
svn path=/trunk/; revision=12426
2004-10-28 22:06:55 +00:00
Ronnie Sahlberg 44bd159f06 use the nice #.REGISTER directive instead of handcoding it in teh template
svn path=/trunk/; revision=12394
2004-10-26 13:54:09 +00:00
Ronnie Sahlberg 9ccd4e5025 get rid of some compiler warnings for cms
svn path=/trunk/; revision=12290
2004-10-13 00:21:00 +00:00
Guy Harris c11306933e Set svn:keywords to Id to expand RCS IDs, and set svn:eol-style to
native to canonicalize line endings.

svn path=/trunk/; revision=12203
2004-10-05 09:18:55 +00:00
Ronnie Sahlberg 4cb62f797d Update to CMD to prepare for PKINIT support
svn path=/trunk/; revision=12009
2004-09-16 08:31:01 +00:00
Ronnie Sahlberg 13451f85d3 cms update forgot that Name had been commented out in one of the structure.
svn path=/trunk/; revision=11519
2004-07-25 10:41:39 +00:00
Ronnie Sahlberg 2d069de8b4 large CMS update.
most of cms is now implemented


svn path=/trunk/; revision=11518
2004-07-25 10:34:07 +00:00
Ronnie Sahlberg 5d366ee1e2 work in progress
New protocol CryptogrtaphicMessageSyntax
As the X.509xx protocols this protocol is not yet linked with ethereal but a work in progress.

Within the next few days the changes needed to packet-kerberos and packet-ber will be added to implement an embryonic pkinit implementation inside packet-kerberos which will in turn call cms and the x509 dissectors.

The dissectors are still very incomplete but already relatively useful.



svn path=/trunk/; revision=11432
2004-07-19 09:03:28 +00:00