diff options
-rw-r--r-- | asn1/x509af/packet-x509af-template.c | 6 | ||||
-rw-r--r-- | asn1/x509af/x509af.cnf | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-x509af.c | 28 | ||||
-rw-r--r-- | epan/dissectors/packet-x509af.h | 1 |
4 files changed, 19 insertions, 17 deletions
diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c index 4cdf7c2b4b..7f6ad969c2 100644 --- a/asn1/x509af/packet-x509af-template.c +++ b/asn1/x509af/packet-x509af-template.c @@ -156,8 +156,8 @@ void proto_reg_handoff_x509af(void) { /* these will generally be encoded as ";binary" in LDAP */ - register_ldap_name_dissector("cACertificate", dissect_Certificate_PDU, proto_x509af); - register_ldap_name_dissector("userCertificate", dissect_Certificate_PDU, proto_x509af); + register_ldap_name_dissector("cACertificate", dissect_x509af_Certificate_PDU, proto_x509af); + 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); @@ -167,7 +167,7 @@ void proto_reg_handoff_x509af(void) { register_ldap_name_dissector("crossCertificatePair", dissect_CertificatePair_PDU, proto_x509af); - register_ber_syntax_dissector("Certificate", proto_x509af, dissect_Certificate_PDU); + 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); diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf index e3decd78fb..763ca7336b 100644 --- a/asn1/x509af/x509af.cnf +++ b/asn1/x509af/x509af.cnf @@ -17,6 +17,7 @@ AttributeCertificateAssertion AttributeCertificateInfo AttributeCertificationPath Certificate +Certificate_PDU Certificates CertificateList CertificatePair diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 415ef3b262..b715d99007 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -58,7 +58,7 @@ static int hf_x509af_extension_id = -1; /*--- Included file: packet-x509af-hf.c ---*/ #line 1 "packet-x509af-hf.c" -static int hf_x509af_Certificate_PDU = -1; /* Certificate */ +static int hf_x509af_x509af_Certificate_PDU = -1; /* Certificate */ static int hf_x509af_CertificatePair_PDU = -1; /* CertificatePair */ static int hf_x509af_CertificateList_PDU = -1; /* CertificateList */ static int hf_x509af_AttributeCertificate_PDU = -1; /* AttributeCertificate */ @@ -214,7 +214,7 @@ dissect_x509af_CertificateSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_x509af_T_algorithmId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 69 "x509af.cnf" +#line 70 "x509af.cnf" const char *name; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_algorithm_id, &algorithm_id); @@ -235,7 +235,7 @@ dissect_x509af_T_algorithmId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o static int dissect_x509af_T_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 80 "x509af.cnf" +#line 81 "x509af.cnf" offset=call_ber_oid_callback(algorithm_id, tvb, offset, actx->pinfo, tree); @@ -326,7 +326,7 @@ static const ber_choice_t SubjectName_choice[] = { static int dissect_x509af_SubjectName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 107 "x509af.cnf" +#line 108 "x509af.cnf" const char* str; offset = dissect_ber_choice(actx, tree, tvb, offset, @@ -372,7 +372,7 @@ dissect_x509af_SubjectPublicKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ static int dissect_x509af_T_extnId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 86 "x509af.cnf" +#line 87 "x509af.cnf" const char *name; offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_extension_id, &extension_id); @@ -402,7 +402,7 @@ dissect_x509af_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_x509af_T_extnValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 97 "x509af.cnf" +#line 98 "x509af.cnf" gint8 class; gboolean pc, ind; gint32 tag; @@ -861,10 +861,10 @@ dissect_x509af_DSS_Params(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs /*--- PDUs ---*/ -static void dissect_Certificate_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { +void dissect_x509af_Certificate_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - dissect_x509af_Certificate(FALSE, tvb, 0, &asn1_ctx, tree, hf_x509af_Certificate_PDU); + dissect_x509af_Certificate(FALSE, tvb, 0, &asn1_ctx, tree, hf_x509af_x509af_Certificate_PDU); } static void dissect_CertificatePair_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { asn1_ctx_t asn1_ctx; @@ -933,7 +933,7 @@ void proto_register_x509af(void) { /*--- Included file: packet-x509af-hfarr.c ---*/ #line 1 "packet-x509af-hfarr.c" - { &hf_x509af_Certificate_PDU, + { &hf_x509af_x509af_Certificate_PDU, { "Certificate", "x509af.Certificate", FT_NONE, BASE_NONE, NULL, 0, "x509af.Certificate", HFILL }}, @@ -1297,8 +1297,8 @@ void proto_reg_handoff_x509af(void) { /*--- Included file: packet-x509af-dis-tab.c ---*/ #line 1 "packet-x509af-dis-tab.c" - register_ber_oid_dissector("2.5.4.36", dissect_Certificate_PDU, proto_x509af, "id-at-userCertificate"); - register_ber_oid_dissector("2.5.4.37", dissect_Certificate_PDU, proto_x509af, "id-at-cAcertificate"); + register_ber_oid_dissector("2.5.4.36", dissect_x509af_Certificate_PDU, proto_x509af, "id-at-userCertificate"); + register_ber_oid_dissector("2.5.4.37", dissect_x509af_Certificate_PDU, proto_x509af, "id-at-cAcertificate"); register_ber_oid_dissector("2.5.4.38", dissect_CertificateList_PDU, proto_x509af, "id-at-authorityRevocationList"); register_ber_oid_dissector("2.5.4.39", dissect_CertificateList_PDU, proto_x509af, "id-at-certificateRevocationList"); register_ber_oid_dissector("2.5.4.40", dissect_CertificatePair_PDU, proto_x509af, "id-at-crossCertificatePair"); @@ -1341,8 +1341,8 @@ void proto_reg_handoff_x509af(void) { /* these will generally be encoded as ";binary" in LDAP */ - register_ldap_name_dissector("cACertificate", dissect_Certificate_PDU, proto_x509af); - register_ldap_name_dissector("userCertificate", dissect_Certificate_PDU, proto_x509af); + register_ldap_name_dissector("cACertificate", dissect_x509af_Certificate_PDU, proto_x509af); + 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); @@ -1352,7 +1352,7 @@ void proto_reg_handoff_x509af(void) { register_ldap_name_dissector("crossCertificatePair", dissect_CertificatePair_PDU, proto_x509af); - register_ber_syntax_dissector("Certificate", proto_x509af, dissect_Certificate_PDU); + 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); diff --git a/epan/dissectors/packet-x509af.h b/epan/dissectors/packet-x509af.h index 0d9ccd433b..a619d5ee06 100644 --- a/epan/dissectors/packet-x509af.h +++ b/epan/dissectors/packet-x509af.h @@ -61,6 +61,7 @@ int dissect_x509af_AttributeCertificateInfo(gboolean implicit_tag _U_, tvbuff_t int dissect_x509af_IssuerSerial(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_x509af_AttCertValidityPeriod(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); int dissect_x509af_AttributeCertificateAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); +void dissect_x509af_Certificate_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_); /*--- End of included file: packet-x509af-exp.h ---*/ #line 30 "packet-x509af-template.h" |