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

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>
This commit is contained in:
Stig Bjørlykke 2014-12-01 15:00:13 +01:00 committed by Michael Mann
parent 077b45e033
commit f6a4f3252b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asn1/cms/packet-cms-template.c
View File

@ -172,11 +172,15 @@ void proto_register_cms(void) {
/*--- proto_reg_handoff_cms -------------------------------------------*/
void proto_reg_handoff_cms(void) {
dissector_handle_t content_info_handle;
#include "packet-cms-dis-tab.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);
}

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

@ -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);
}