diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-12-24 11:24:35 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-12-24 11:24:35 +0000 |
| commit | 69dd4345c1bb4281fda610cfa6aebcf4bc95543b (patch) | |
| tree | f0d42886b81a14c0bdf73a31050a483f07f86df1 | |
| parent | 6b8c77703e674d29bdc8de11e964d240800238b2 (diff) | |
export EnvelopedData
svn path=/trunk/; revision=12824
| -rw-r--r-- | asn1/cms/cms-exp.cnf | 2 | ||||
| -rw-r--r-- | asn1/cms/cms.cnf | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-cms.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-cms.h | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf index 230a1deec1..4f84dfad44 100644 --- a/asn1/cms/cms-exp.cnf +++ b/asn1/cms/cms-exp.cnf @@ -10,6 +10,7 @@ SignerIdentifier -1/*choice*/ -1/*choice*/ SignedAttributes BER_CLASS_UNI BER_UNI_TAG_SET UnsignedAttributes BER_CLASS_UNI BER_UNI_TAG_SET SignatureValue BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING +EnvelopedData BER_CLASS_UNI BER_UNI_TAG_SEQUENCE IssuerAndSerialNumber BER_CLASS_UNI BER_UNI_TAG_SEQUENCE Countersignature BER_CLASS_UNI BER_UNI_TAG_SEQUENCE #.END @@ -26,6 +27,7 @@ SignerIdentifier TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(S SignedAttributes TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 UnsignedAttributes TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 SignatureValue TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 +EnvelopedData TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 IssuerAndSerialNumber TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 Countersignature TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 #.END diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index 5577b435c3..19e5c26668 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -16,6 +16,7 @@ ContentType Countersignature DigestAlgorithmIdentifiers EncapsulatedContentInfo +EnvelopedData IssuerAndSerialNumber SignedAttributes SignedData diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index cbbc061394..f9ba9d2323 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -9,7 +9,7 @@ * Routines for RFC2630 Cryptographic Message Syntax packet dissection * Ronnie Sahlberg 2004 * - * $Id: packet-cms-template.c 12573 2004-11-22 03:36:26Z sahlberg $ + * $Id: packet-cms-template.c 12740 2004-12-13 08:15:34Z sahlberg $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1153,7 +1153,7 @@ static const ber_sequence_t EnvelopedData_sequence[] = { { 0, 0, 0, NULL } }; -static int +int dissect_cms_EnvelopedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, EnvelopedData_sequence, hf_index, ett_cms_EnvelopedData); diff --git a/epan/dissectors/packet-cms.h b/epan/dissectors/packet-cms.h index 79ceeaf026..ab38bf3a35 100644 --- a/epan/dissectors/packet-cms.h +++ b/epan/dissectors/packet-cms.h @@ -48,6 +48,7 @@ int dissect_cms_SignerIdentifier(gboolean implicit_tag, tvbuff_t *tvb, int offse int dissect_cms_SignedAttributes(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_cms_UnsignedAttributes(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_cms_SignatureValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_cms_EnvelopedData(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_cms_IssuerAndSerialNumber(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_cms_Countersignature(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); |