diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-05-23 15:17:14 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2006-05-23 15:17:14 +0000 |
| commit | 55600fb60adbd522e512b278d1da2b88dfa14039 (patch) | |
| tree | a465a11fa554bd6640bc084ce1421b6569125078 /asn1/cms | |
| parent | 8bb127d1c1a97aa10b755c9a83488b4aa3b7a5dd (diff) | |
| download | wireshark-55600fb60adbd522e512b278d1da2b88dfa14039.tar.gz | |
Ethereal -> Wireshark
asn2eth -> asn2wrs
svn path=/trunk/; revision=18214
Diffstat (limited to 'asn1/cms')
| -rw-r--r-- | asn1/cms/CryptographicMessageSyntax.asn | 2 | ||||
| -rw-r--r-- | asn1/cms/cms-exp.cnf | 9 | ||||
| -rw-r--r-- | asn1/cms/packet-cms-template.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/asn1/cms/CryptographicMessageSyntax.asn b/asn1/cms/CryptographicMessageSyntax.asn index 02fbf9759e..9159116e67 100644 --- a/asn1/cms/CryptographicMessageSyntax.asn +++ b/asn1/cms/CryptographicMessageSyntax.asn @@ -1,5 +1,5 @@ -- Extracted from RFC2630 --- and massaged/modified so it passws through our ASN2ETH compiler +-- and massaged/modified so it passws through our asn2wrs compiler CryptographicMessageSyntax { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) modules(0) cms(1) } DEFINITIONS IMPLICIT TAGS ::= diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf index a721605a36..03c3c94086 100644 --- a/asn1/cms/cms-exp.cnf +++ b/asn1/cms/cms-exp.cnf @@ -1,3 +1,12 @@ +# Do not modify this file. +# It is created automatically by the ASN.1 to Wireshark dissector compiler +# .\cms-exp.cnf +# ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn + +#.MODULE +CryptographicMessageSyntax cms +#.END + #.IMPORT_TAG ContentInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE ContentType BER_CLASS_UNI BER_UNI_TAG_OID diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index 5fcde83df6..a2c381b7a2 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -54,7 +54,7 @@ static int hf_cms_ci_contentType = -1; /* Initialize the subtree pointers */ #include "packet-cms-ett.c" -static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2eth stops generating these silly wrappers */ +static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */ static const char *object_identifier_id; |