osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

make CMS use the new ANY type and get rid of the workaround 

svn path=/trunk/; revision=12491
This commit is contained in:
Ronnie Sahlberg 2004-11-06 02:06:55 +00:00
parent 05cf6b7ced
commit d1e31a5c20
5 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asn1/cms/CryptographicMessageSyntax.asn
View File

@ -11,9 +11,6 @@ BEGIN
-- own purposes.
IMPORTS
Any
FROM DummyCms { 0 }
-- Directory Information Framework (X.501)
Name
FROM InformationFramework { joint-iso-itu-t ds(5) modules(1)
@ -32,7 +29,7 @@ IMPORTS
ContentInfo ::= SEQUENCE {
contentType ContentType,
content [0] EXPLICIT Any
content [0] EXPLICIT ANY
}
@ -226,7 +223,7 @@ UserKeyingMaterial ::= OCTET STRING
OtherKeyAttribute ::= SEQUENCE {
keyAttrId OBJECT IDENTIFIER,
keyAttr Any OPTIONAL
keyAttr ANY OPTIONAL
}
-- CMS Attributes

1
asn1/cms/cms.cnf
View File

@ -9,7 +9,6 @@ InformationFramework x509if
#.INCLUDE ../x509af/x509af_exp.cnf
#.INCLUDE ../x509if/x509if_exp.cnf
#.INCLUDE ./cms_dummy.cnf
#.EXPORTS
ContentInfo

5
asn1/cms/cms_dummy.cnf
View File

@ -1,5 +0,0 @@
# this dummy is to handle Any type until compiler knows
# about ANY
#.IMPORT_TAG
Any BER_CLASS_ANY 0

4
epan/dissectors/packet-cms.c
View File

@ -8,7 +8,7 @@
/* packet-cms.c
* Routines for RFC2630 Cryptographic Message Syntax packet dissection
*
* $Id: packet-cms-template.c 12426 2004-10-28 22:06:55Z gerald $
* $Id: packet-cms-template.c 12434 2004-10-29 12:11:42Z sahlberg $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -234,6 +234,7 @@ static int dissect_contentType(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
}
static int
dissect_cms_T_content(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);
@ -870,6 +871,7 @@ static int dissect_keyAttrId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
}
static int
dissect_cms_T_keyAttr(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree);

2
epan/dissectors/packet-cms.h
View File

@ -8,7 +8,7 @@
/* packet-cms.h
* Routines for RFC2630 Cryptographic Message Syntax packet dissection
*
* $Id: packet-cms-template.h 12426 2004-10-28 22:06:55Z gerald $
* $Id: packet-cms-template.h 12434 2004-10-29 12:11:42Z sahlberg $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>