Commit Graph

30 Commits

Author SHA1 Message Date
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 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 f0f319acf1 - BER_MAX_OID_STR_LEN removed and replaced with MAX_OID_STR_LEN
- x411 and dop regenerated
- dissect_ber_tagged_type() prepared (support in asn2wrs will follow)

svn path=/trunk/; revision=18468
2006-06-15 07:46:07 +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
Tomas Kukosa 55600fb60a Ethereal -> Wireshark
asn2eth -> asn2wrs

svn path=/trunk/; revision=18214
2006-05-23 15:17:14 +00:00
Tomas Kukosa 62da958bd9 - asn2eth renamed to asn2wrs
- remove obsolete -X option from makefiles
- not generate enumerated map table for BER

dissector will be regenerated later

svn path=/trunk/; revision=18199
2006-05-21 14:36:05 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Guy Harris a6930fe4ae Add distclean and maintainerclean rules.
svn path=/trunk/; revision=17999
2006-04-25 18:45:08 +00:00
Guy Harris 015b486dc9 Get rid of an unused variable.
svn path=/trunk/; revision=17764
2006-03-29 22:11:42 +00:00
Graeme Lunt c51f4fa887 Support for P1 Strong Authentication
svn path=/trunk/; revision=17727
2006-03-25 16:48:28 +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 54f6b68edc Add parsertab.pyc in clean target
svn path=/trunk/; revision=17387
2006-02-23 20:05:52 +00:00
Anders Broman 404b556084 From Grame Lunt:
Attached is a patch that updates - 

* 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.

Note the patc for dop did not apply don't regenerate dissectors yet.

svn path=/trunk/; revision=16799
2005-12-14 21:02:56 +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 59a7f595b4 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=16565
2005-11-23 07:29:45 +00:00
Guy Harris 7586ab64db Squelch some const vs. non-const warnings.
svn path=/trunk/; revision=16525
2005-11-17 05:02:30 +00:00
Guy Harris 393ac45d83 "dissect_ber_object_identifier_str" expects a "const char **" as its
last argument; make it so.

svn path=/trunk/; revision=16523
2005-11-17 04:47:41 +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
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 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
Ronnie Sahlberg 23caf5e4d3 remove some strcpy() calls
svn path=/trunk/; revision=16228
2005-10-15 22:46:20 +00:00
Guy Harris 23661240d7 Squelch some compiler warnings.
svn path=/trunk/; revision=15953
2005-09-22 02:08:03 +00:00
Guy Harris c5b0fc27d7 Fix a bunch of places where we were calling "dissect_ber_octet_string()"
with a non-null pointer-to-pointer-to-tvbuff and not checking whether
the returned tvbuff pointer was non-null.

svn path=/trunk/; revision=15948
2005-09-22 00:51:11 +00:00
Gerald Combs adce5ed6a5 Set "COPYCMD=/Y" and remove the "/Y" from each XCOPY command in order
to fix compilation under Windows NT.  This should fix bug 403.

The changes were made using "find . -name Makefile.nmake | xargs perl
-pi.bak -e 's: /y::i'".  They appear to work under XP, but if anything
broke I blame Larry Wall.

svn path=/trunk/; revision=15710
2005-09-07 13:26:23 +00:00
Guy Harris 6978ce0759 Squelch compiler warnings.
svn path=/trunk/; revision=15697
2005-09-05 22:39:09 +00:00
Anders Broman d9e1a9c0bb 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.

svn path=/trunk/; revision=15679
2005-09-04 16:22:12 +00:00