Commit graph

56 commits

Author SHA1 Message Date
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
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
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
Gerald Combs
f67fdf4865 Move sha1.[ch] to epan/crypt/crypt-sha1.[ch]. Remove duplicate code.
svn path=/trunk/; revision=20399
2007-01-12 00:33:32 +00:00
Gerald Combs
53689800e6 Move epan/crypt-md5.[ch] to epan/crypt. Remove
epan/crypt/airpdcap_md5.[ch].  Fix up whitespace.

svn path=/trunk/; revision=20277
2007-01-02 22:49:57 +00:00
Ulf Lamping
647533a5ef put every python script name into "" so the call won't fail on Win32 native python.
The problem is the slash in e.g.:

 @$(PYTHON) ../../tools/make-dissector-reg.py

is interpreted as an option instead of being part of the path.

I didn't wanted to use backslashes as this might introduce new problems with cygwin's python port.

svn path=/trunk/; revision=19730
2006-10-29 17:19:52 +00:00
Guy Harris
fa10d33734 Include <epan/oid_resolv.h> to declare get_oid_str_name().
svn path=/trunk/; revision=18627
2006-07-01 00:11:49 +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
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
Graeme Lunt
ab19b927c8 "Field Information" context menu item that will bring up a web page reference to a field type of FT_OID
svn path=/trunk/; revision=18125
2006-05-10 19:50:54 +00:00
Guy Harris
a6930fe4ae Add distclean and maintainerclean rules.
svn path=/trunk/; revision=17999
2006-04-25 18:45:08 +00:00
Anders Broman
4e13ea2982 Add parsertab.pyc in clean target
svn path=/trunk/; revision=17386
2006-02-23 20:05:05 +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
Guy Harris
e2c9bcf703 The SHA-1 routines now take const pointers; don't cast away constness.
tvb_get_ptr() returns a "const guint8 *"; don't bother casting its
return value to "const guint8 *".

"cms_verify_msg_digest()" can be passed a const pointer for "alg"; make
its argument a "const char *".

svn path=/trunk/; revision=16534
2005-11-17 11:50:36 +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
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
92e0e21362 Regenerate dissectors with the current asn2eth.
svn path=/trunk/; revision=15664
2005-09-02 05:43:49 +00:00
Ronnie Sahlberg
0ca30abe65 change the symbol dissect_ber_CHOICE back into dissect_ber_choice
svn path=/trunk/; revision=14980
2005-07-21 21:12:09 +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
Gerald Combs
082651c83e Define a maximum OID string length, and use it in a lot of places. Fixes a
buffer overflow found while fuzz testing.

svn path=/trunk/; revision=14169
2005-04-22 21:17:13 +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
fbf762bda5 update asn2eth and all generated dissectors to new dissect_ber_boolean that takes a implicit_tag parameter
svn path=/trunk/; revision=13479
2005-02-23 08:57:47 +00:00
Lars Roland
13bf5539af When using Cygwin's python asn2eth.py
generates dissectors with mixed EOL! SVN doesn't allow you to commit such files.
Add a target to all nmake makefiles in asn1 subdirectory which will fix these files.

svn path=/trunk/; revision=13077
2005-01-16 23:26:02 +00:00
Guy Harris
f4a0e4c783 Supply Makefile.nmake files.
svn path=/trunk/; revision=13072
2005-01-16 10:38:21 +00:00
Guy Harris
eaf9490e04 Make the Makefile look like the h235 Makefiles, with the new rules.
Get rid of their "executable" property, and set svn:keywords to Id and
svn:eol-style to native if they're not already set.

svn path=/trunk/; revision=13071
2005-01-16 10:19:21 +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
0e528dc7a1 updates from tomas and anders
create some missing makefiles for autogenerated dissectors

finish the transition to the new ber integer dissetor helper signature
and regenerate all ber dissectors



svn path=/trunk/; revision=12724
2004-12-12 01:14:03 +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
Guy Harris
ba80dd691f Turn off execute permission on .asn files.
svn path=/trunk/; revision=12418
2004-10-27 20:36:20 +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
4c9d419db3 Make the ber_sequence tables "const".
svn path=/trunk/; revision=12245
2004-10-08 20:28:04 +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