summaryrefslogtreecommitdiff
path: root/asn1/x509af
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2014-10-06 15:31:47 +0200
committerStig Bjørlykke <stig@bjorlykke.org>2014-10-13 11:24:07 +0000
commit4e1b5ea866dd332294246c4800efe77431010ad8 (patch)
tree8cda568a450b29fd7bbfcbbf03d840ab9f123190 /asn1/x509af
parent94d35481b773e785c3aec31f81dea4300fdb5669 (diff)
downloadwireshark-4e1b5ea866dd332294246c4800efe77431010ad8.tar.gz
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/x509af')
-rw-r--r--asn1/x509af/packet-x509af-template.c20
-rw-r--r--asn1/x509af/x509af.cnf4
2 files changed, 12 insertions, 12 deletions
diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c
index bad4dee392..561176071b 100644
--- a/asn1/x509af/packet-x509af-template.c
+++ b/asn1/x509af/packet-x509af-template.c
@@ -106,9 +106,9 @@ void proto_register_x509af(void) {
proto_register_subtree_array(ett, array_length(ett));
- register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_PDU);
- register_ber_syntax_dissector("CertificateList", proto_x509af, dissect_CertificateList_PDU);
- register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU);
+ new_register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_PDU);
+ new_register_ber_syntax_dissector("CertificateList", proto_x509af, dissect_CertificateList_PDU);
+ new_register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU);
register_ber_oid_syntax(".cer", NULL, "Certificate");
register_ber_oid_syntax(".crt", NULL, "Certificate");
@@ -156,15 +156,15 @@ void proto_reg_handoff_x509af(void) {
/* these will generally be encoded as ";binary" in LDAP */
- register_ldap_name_dissector("cACertificate", dissect_x509af_Certificate_PDU, proto_x509af);
- register_ldap_name_dissector("userCertificate", dissect_x509af_Certificate_PDU, proto_x509af);
+ new_register_ldap_name_dissector("cACertificate", dissect_x509af_Certificate_PDU, proto_x509af);
+ new_register_ldap_name_dissector("userCertificate", dissect_x509af_Certificate_PDU, proto_x509af);
- register_ldap_name_dissector("certificateRevocationList", dissect_CertificateList_PDU, proto_x509af);
- register_ldap_name_dissector("crl", dissect_CertificateList_PDU, proto_x509af);
+ new_register_ldap_name_dissector("certificateRevocationList", dissect_CertificateList_PDU, proto_x509af);
+ new_register_ldap_name_dissector("crl", dissect_CertificateList_PDU, proto_x509af);
- register_ldap_name_dissector("authorityRevocationList", dissect_CertificateList_PDU, proto_x509af);
- register_ldap_name_dissector("arl", dissect_CertificateList_PDU, proto_x509af);
+ new_register_ldap_name_dissector("authorityRevocationList", dissect_CertificateList_PDU, proto_x509af);
+ new_register_ldap_name_dissector("arl", dissect_CertificateList_PDU, proto_x509af);
- register_ldap_name_dissector("crossCertificatePair", dissect_CertificatePair_PDU, proto_x509af);
+ new_register_ldap_name_dissector("crossCertificatePair", dissect_CertificatePair_PDU, proto_x509af);
}
diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf
index 0a86365714..5752bfb518 100644
--- a/asn1/x509af/x509af.cnf
+++ b/asn1/x509af/x509af.cnf
@@ -31,9 +31,9 @@ Time
Validity
Version
-#.PDU
+#.PDU_NEW
-#.REGISTER
+#.REGISTER_NEW
Certificate B "2.5.4.36" "id-at-userCertificate"
Certificate B "2.5.4.37" "id-at-cAcertificate"
CertificateList B "2.5.4.38" "id-at-authorityRevocationList"