diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-06-28 10:34:15 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-06-28 10:34:15 +0000 |
| commit | 8246e874320aa13700d4c98ece43c229fb1ab1e6 (patch) | |
| tree | 29097179034a4938937e938416e8d36703774e7f /asn1/x509af | |
| parent | 342fc4cfb427e48abc57fb8b7e8dbfb338f724d4 (diff) | |
| download | wireshark-8246e874320aa13700d4c98ece43c229fb1ab1e6.tar.gz | |
Moved register_ber_syntax_dissector() and register_ber_oid_syntax() from
proto_reg_handoff_* to proto_register_*.
svn path=/trunk/; revision=33345
Diffstat (limited to 'asn1/x509af')
| -rw-r--r-- | asn1/x509af/packet-x509af-template.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c index 7f6ad969c2..e2ca9f4e99 100644 --- a/asn1/x509af/packet-x509af-template.c +++ b/asn1/x509af/packet-x509af-template.c @@ -113,6 +113,14 @@ void proto_register_x509af(void) { proto_register_field_array(proto_x509af, hf, array_length(hf)); 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); + + register_ber_oid_syntax(".cer", NULL, "Certificate"); + register_ber_oid_syntax(".crt", NULL, "Certificate"); + register_ber_oid_syntax(".crl", NULL, "CertificateList"); } @@ -166,13 +174,5 @@ void proto_reg_handoff_x509af(void) { register_ldap_name_dissector("arl", dissect_CertificateList_PDU, proto_x509af); register_ldap_name_dissector("crossCertificatePair", dissect_CertificatePair_PDU, proto_x509af); - - register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_PDU); - register_ber_oid_syntax(".cer", NULL, "Certificate"); - register_ber_oid_syntax(".crt", NULL, "Certificate"); - register_ber_syntax_dissector("CertificateList", proto_x509af, dissect_CertificateList_PDU); - register_ber_oid_syntax(".crl", NULL, "CertificateList"); - register_ber_syntax_dissector("CrossCertificatePair", proto_x509af, dissect_CertificatePair_PDU); - } |