diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-12-01 15:00:13 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-12-02 12:23:20 +0000 |
| commit | f6a4f3252bb61b2ed4944d2afad5506bb5567695 (patch) | |
| tree | d7773b358290dcd90c0bb9b35c88e5fcaa58c0b8 /epan/dissectors/packet-cms.c | |
| parent | 077b45e033a5dce78ddea7d8c4f6dd7772b68d90 (diff) | |
cms: Handle media_type pkcs7-mime and pkcs7-signature
Change-Id: I7db4e67ffe99a9f3b41d0b507d9837e0237d4547
Reviewed-on: https://code.wireshark.org/review/5558
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-cms.c')
| -rw-r--r-- | epan/dissectors/packet-cms.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 8884f348fc..533fb26b19 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -2449,6 +2449,7 @@ void proto_register_cms(void) { /*--- proto_reg_handoff_cms -------------------------------------------*/ void proto_reg_handoff_cms(void) { + dissector_handle_t content_info_handle; /*--- Included file: packet-cms-dis-tab.c ---*/ #line 1 "../../asn1/cms/packet-cms-dis-tab.c" @@ -2473,11 +2474,14 @@ void proto_reg_handoff_cms(void) { /*--- End of included file: packet-cms-dis-tab.c ---*/ -#line 176 "../../asn1/cms/packet-cms-template.c" +#line 177 "../../asn1/cms/packet-cms-template.c" oid_add_from_string("id-data","1.2.840.113549.1.7.1"); oid_add_from_string("id-alg-des-ede3-cbc","1.2.840.113549.3.7"); oid_add_from_string("id-alg-des-cbc","1.3.14.3.2.7"); + content_info_handle = new_create_dissector_handle (dissect_ContentInfo_PDU, proto_cms); + dissector_add_string("media_type", "application/pkcs7-mime", content_info_handle); + dissector_add_string("media_type", "application/pkcs7-signature", content_info_handle); } |