diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-09 21:50:10 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-10 17:06:02 +0000 |
| commit | a33209d69e95d025466f4efaebe22f6ae686c214 (patch) | |
| tree | b54114223af7e8b9abd93dca58b8673bc8bbc823 /asn1/pkcs12 | |
| parent | 1ffbd2ae9d4e839460717e9886aeb2661dd1e3ea (diff) | |
Convert ASN.1 dissectors to remove "new" from "new-style" dissector function names that were generated from asn2wrs.py
This includes:
1. new_create_dissector_handle -> create_dissector_handle
2. new_register_dissector -> register_dissector
3. new_register_ber_oid_dissector -> register_ber_oid_dissector
4. new_register_ber_syntax_dissector -> register_ber_syntax_dissector
Also remove PDU_NEW, SYNTAX_NEW and REGISTER_NEW as there is no need for the distinction anymore.
Change-Id: I82c7de7c8ffeeab3259d1b55bb4afc5f6a1e0329
Reviewed-on: https://code.wireshark.org/review/12491
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'asn1/pkcs12')
| -rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 4 | ||||
| -rw-r--r-- | asn1/pkcs12/pkcs12.cnf | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 3dd6e03f04..18814039b2 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -496,7 +496,7 @@ void proto_register_pkcs12(void) { "Whether to try and decrypt the encrypted data within the" " PKCS#12 with a NULL password", &try_null_password); - new_register_ber_syntax_dissector("PKCS#12", proto_pkcs12, dissect_PFX_PDU); + register_ber_syntax_dissector("PKCS#12", proto_pkcs12, dissect_PFX_PDU); register_ber_oid_syntax(".p12", NULL, "PKCS#12"); register_ber_oid_syntax(".pfx", NULL, "PKCS#12"); } @@ -506,7 +506,7 @@ void proto_register_pkcs12(void) { void proto_reg_handoff_pkcs12(void) { #include "packet-pkcs12-dis-tab.c" - new_register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate"); + register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate"); } diff --git a/asn1/pkcs12/pkcs12.cnf b/asn1/pkcs12/pkcs12.cnf index 419271ac5d..a1b576e5a8 100644 --- a/asn1/pkcs12/pkcs12.cnf +++ b/asn1/pkcs12/pkcs12.cnf @@ -11,7 +11,7 @@ PKCS-5 x509af #.EXPORTS -#.REGISTER_NEW +#.REGISTER KeyBag B "1.2.840.113549.1.12.10.1.1" "keyBag" PKCS8ShroudedKeyBag B "1.2.840.113549.1.12.10.1.2" "pkcs8ShroudedKeyBag" CertBag B "1.2.840.113549.1.12.10.1.3" "certBag" @@ -50,7 +50,7 @@ PBMAC1Params B "1.2.840.113549.1.5.14" "id-PBMAC1" PrivateKeyInfo/version privateKeyVersion PBKDF2Params/salt saltChoice -#.PDU_NEW +#.PDU #AuthenticatedSafe PrivateKeyInfo |