diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-10-06 15:31:47 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2014-10-13 11:24:07 +0000 |
| commit | 4e1b5ea866dd332294246c4800efe77431010ad8 (patch) | |
| tree | 8cda568a450b29fd7bbfcbbf03d840ab9f123190 /asn1/cms | |
| parent | 94d35481b773e785c3aec31f81dea4300fdb5669 (diff) | |
ASN1: Register PDU-dissectors as NEW
Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64
Reviewed-on: https://code.wireshark.org/review/4494
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'asn1/cms')
| -rw-r--r-- | asn1/cms/cms.cnf | 2 | ||||
| -rw-r--r-- | asn1/cms/packet-cms-template.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index 6bbdf60e63..ece91a13a7 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -31,7 +31,7 @@ SignerInfos SignatureValue UnsignedAttributes -#.REGISTER +#.REGISTER_NEW ContentInfo B "1.2.840.113549.1.9.16.1.6" "id-ct-contentInfo" #OctetString B "1.2.840.113549.1.7.1" "id-data" see x509sat.cnf SignedData B "1.2.840.113549.1.7.2" "id-signedData" diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c index b0afc8e898..7e3aba57a4 100644 --- a/asn1/cms/packet-cms-template.c +++ b/asn1/cms/packet-cms-template.c @@ -160,8 +160,8 @@ void proto_register_cms(void) { proto_register_field_array(proto_cms, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU); - register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU); + new_register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU); + new_register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU); register_ber_oid_syntax(".p7s", NULL, "ContentInfo"); register_ber_oid_syntax(".p7m", NULL, "ContentInfo"); register_ber_oid_syntax(".p7c", NULL, "ContentInfo"); |