Commit Graph

38 Commits

Author SHA1 Message Date
Graeme Lunt 1d8014fab4 Removal of various warnings, mainly by not emitting functions for ASN.1 types that are only used for COMPONENTS OF.
svn path=/trunk/; revision=33350
2010-06-28 14:24:32 +00:00
Stig Bjørlykke 5feb02cfa9 Rename some objects to avoid duplicate definitions.
svn path=/trunk/; revision=31324
2009-12-19 15:39:16 +00:00
Stig Bjørlykke fb56cceeb7 Regenerate P7 with SIZE constraints checking.
Added MSUpperBounds.asn.
Export upper bounds from X411, rename some duplicate definitions in P7.

svn path=/trunk/; revision=31321
2009-12-19 14:26:26 +00:00
Stig Bjørlykke d5f8597e03 Regenerated with SIZE constraints checking.
Added MTSUpperBounds.asn.

svn path=/trunk/; revision=31310
2009-12-18 15:21:08 +00:00
Stig Bjørlykke 9733aadcfe Re-generate asn1 dissectors after hf_register_info cleanup.
svn path=/trunk/; revision=28848
2009-06-26 03:59:01 +00:00
Graeme Lunt 57d4cea4d5 Update to:
* support the P3 protocol in addition to the P1 protocol; and 
* reduce the number of changes to the ASN.1 modules (as asn2wrs now handles more of the ASN.1 constructs).
P3 is currently only supported over ROS (and not RTSE)


svn path=/trunk/; revision=28593
2009-06-02 11:04:14 +00:00
Stig Bjørlykke c47e788c94 Regenerate all asn2wrs generated dissectors.
svn path=/trunk/; revision=28379
2009-05-16 22:07:03 +00:00
Anders Broman 612463c139 Try to fix some "defined but not used" warnings.
svn path=/trunk/; revision=26243
2008-09-21 14:23:34 +00:00
Anders Broman 80b87dfaf3 Try to fix unused code warnings.
svn path=/trunk/; revision=26122
2008-09-02 19:42:30 +00:00
Stig Bjørlykke 2f2a8edbd7 Regenerated to use the new decode function for UTCTime.
svn path=/trunk/; revision=25898
2008-08-01 16:45:30 +00:00
Graeme Lunt cad42d9103 Additional EXPORTS (for X.420 dissector) and a message store (P7) attribute.
svn path=/trunk/; revision=23979
2008-01-02 09:29:04 +00:00
Stig Bjørlykke 382bedb6ca Added type=value to BuiltInDomainDefinedAttributes items.
svn path=/trunk/; revision=23933
2007-12-21 13:23:52 +00:00
Graeme Lunt a7dec11ce6 Changes suggested/provided by Anders so that fewer changes are required to the ASN modules.
Also includes the MSAccessProtocol.asn to generate defines for the operation numbers.


svn path=/trunk/; revision=23586
2007-11-25 17:46:42 +00:00
Graeme Lunt 0c571bb235 Basic P7 (X.400 Message Store Access Protocol) dissection after request from the list:
http://www.wireshark.org/lists/wireshark-dev/200711/msg00228.html

Only a single (private) capture file is currently available which contains only a few of the P7 operations, so testing has been minimal.
General attribute types, containing information from the X.400 envelope, are also included.


svn path=/trunk/; revision=23479
2007-11-17 18:08:01 +00:00
Ronnie Sahlberg c033ee2fc7 new x411 dissector
svn path=/trunk/; revision=23457
2007-11-15 10:11:09 +00:00
Anders Broman fb00aa074f as2wrs now handles EXTERNAL(direct-reference requires no special handling).
svn path=/trunk/; revision=23386
2007-11-06 21:52:26 +00:00
Graeme Lunt b03164ec5d Update to use the -X and -T asn2wrs flags.
Removed the workaround code from the .cnf file.


svn path=/trunk/; revision=23243
2007-10-22 17:13:08 +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
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
Tomas Kukosa a70a1b3eb6 EXTERNAL type is handled in asn2wrs now
private implementations were renamed EXTERNAL -> EXTERNALt

svn path=/trunk/; revision=21662
2007-05-03 11:37:47 +00:00
Ronnie Sahlberg 8920a7e7f2 change the signature that asn2wrs generates for functions to marm all parameters as _U_
to reduce the number of compiler warnings.

update some template and cnf files to use _U_ as well 


svn path=/trunk/; revision=21088
2007-03-21 10:22:22 +00:00
Guy Harris d00fe9517b dissect_x411_mts_apdu() is an old-style dissector, so it shouldn't
return any value.

svn path=/trunk/; revision=20844
2007-02-19 01:09:55 +00:00
Stephen Fisher c97caf2a94 From Stig Bjorlykke:
I have added a new dissector for DMP (STANAG 4406 Direct Message
Profile) as defined in STANAG 4406 Annex E.  The DMP protocol has no
assigned UDP port number yet, so the default value in this dissector
is 0 (I suppose this is som sort of "disabled"?) until we get this
registered.

The dissector has been tested on OSX Intel/PowerPC and Solaris SPARC.

Changes in this patch:
* Added DMP dissector
* Added a new CRC table and functions in crc16.c
* Made NonDeliveryReasonCode and NonDeliveryDiagnosticCode available
from X.411
* Made NonReceiptReasonField and DiscardReasonField available from X.420


svn path=/trunk/; revision=20133
2006-12-14 00:16:06 +00:00
Graeme Lunt 5f1d7923bf Support for the message-token, proof-of-delivery and recipient-certificate p1 envelope extensions.
Patch for unknown built-in content type.


svn path=/trunk/; revision=18598
2006-06-28 19:07:10 +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
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Graeme Lunt 77cf86d3d6 ACP133 attribute syntaxes and attribute definitions used by the DAP, DSP and DISP dissectors. Also includes X.402 definitions and OID registrations for object classes.
svn path=/trunk/; revision=17471
2006-03-05 11:28:13 +00:00
Anders Broman 483ec5bd05 From Graeme Lunt:
* DOP - This has now been successfully tested and so is now enabled by default and workaround code removed. 
Also now uses the correct EXPORTs from the other modules/dissectors.

* X509SAT - Most of the selected attributes are now supported in addition to the DirectoryString syntax attributes. This includes restoring the correct DirectoryString syntax and also providing the basic syntaxes (e.g. OBJECT IDENTIFIER, PrintableString). The latter requires a sed line in the Makefile which I assume should be OK? Not all the SAT can be defined in x509sat - so some have been included in x509if and x509af - though x509sat.cnf contains the master list and references the other dissectors where appropriate.

(I still prefer a syntax registration approach but I don't think that is going to be agreed in the short term.)

* X509IF - a mechanism to register some formating, based upon the hf_index, that is used in the cnf file.

* A couple of fixes identified by Stig.

svn path=/trunk/; revision=16814
2005-12-16 06:47:22 +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
Ronnie Sahlberg 7efbafb6e5 from Stig B:
I have made a small change in packet-x411-template.c to make the X.
411 message heading in CDT look like in COTP.




svn path=/trunk/; revision=16657
2005-12-02 22:01:00 +00:00
Anders Broman cf0d307ef6 From Stig Bjørlykke
Added a new dissector for CDT (CompressedDataType) as
 defined in STANAG 4406 Annex E.  This dissector is used in P_Mul to  
 decode encapsulated X.411 content.  I have added a function in the  
 X.411 dissector to decode a MTS APDU without having a ROS

 Changes in this patch:
 * Added CDT dissector
 * Use CDT dissector in P_Mul
 * Added function to decode MTS APDU in the X.411 dissector

svn path=/trunk/; revision=16567
2005-11-23 07:33:03 +00:00
Ronnie Sahlberg 898dc49980 add a simple g_strlcat define in strutil for gtk==1 where this symbol does not exist
svn path=/trunk/; revision=16511
2005-11-16 09:27:43 +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
Ronnie Sahlberg f4e55c1155 move the include of emem.h a bit further down
so it does know what size_t is when emem is included.

i needed this change to get it to compile on my box


svn path=/trunk/; revision=16504
2005-11-14 13:02:23 +00:00
Anders Broman 314c36da9a From Graeme Lunt:
The ftbp.patch file includes:
a) A fix to acse.cnf which works around an asn2eth bug (it is the AE-qualifier EXPORT I want, but asn2eth doesn't generate the appropriate extern for the values). Also a small cosmetic change for EXTERNAL decodings.
b) New EXPORTs for the FTAM dissector for use in FTBP.
c) A fix to asn2eth to solve the problem if you EXPORT types that include a '-' character in the name (e.g. "AE-qualifier" from acse.cnf, "Date-and-Time-Attribute" from ftam.cnf). The problem is that asn2eth generates the "xxxx-exp.cnf" file using the 'C' name (which has replaced '-' with '_') rather than the original 'ASN' name. The fix just undoes the replacement as I couldn't see the original name being preserved anywhere. There still remains a problem if the type has a '.' in the name - but generally I don't think they do.

* Better ROS handling and registration
* Simplified RTSE registration
* X411 column information, extension naming and use of new RTSE/ROS registration
* X420 notification extensions, warnings removal and export of ExtensionsField (missed from recent FTBP patch).
* Better highlighting of S4406 protocol.


svn path=/trunk/; revision=16296
2005-10-24 21:42:19 +00:00
Guy Harris 6978ce0759 Squelch compiler warnings.
svn path=/trunk/; revision=15697
2005-09-05 22:39:09 +00:00
Anders Broman bbf0fb6dde From Graeme Lunt
I attach my RTSE dissector (in tar file) which requires the included ROS dissector, as well as a patch to the latest pres.{cnf,asn}. The ROS dissector uses a new field in the SESSION_DATA_STRUCTURE to pass the ROS operation to the sub-dissector, though this is also set by other dissectors (RTSE uses it in X.410 mode). 
 
 Note that X.400 P1 in X.410 mode doesn't use ROS, so it is useful not to explicitly include ROS in my X411 dissector. However, the inclusion of a ROS dissector won't effect any dissectors that currently implement their own ROS.
 
 I also include dissectors for:
 
 X.411 	(P1) 		X.400 OSI Message Transfer Service
 X.420 	(P22) 	X.400 OSI Information Object
 STANAG 4406	(P772)	STANAG 4406 Military Message Extensions (to P22)
 
 These rely on the RTSE and ROS dissectors.

Withs some changes to remove various warnings and errors.

svn path=/trunk/; revision=15680
2005-09-04 20:30:31 +00:00