update x509af to use machinegenerated _PDU() dissectors

svn path=/trunk/; revision=11990

2 files changed, 13 insertions, 84 deletions

diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c
index 4a01fd3458..cbd0a6e796 100644
--- a/asn1/x509af/packet-x509af-template.c
+++ b/asn1/x509af/packet-x509af-template.c
@@ -48,13 +48,6 @@ static int proto_x509af = -1;
 static int hf_x509af_algorithm_id = -1;
 static int hf_x509af_extension_id = -1;
 static int hf_x509af_critical = -1;               /* BOOLEAN */
-static int hf_x509af_id_at_userCertificate = -1;
-static int hf_x509af_id_at_cAcertificate = -1;
-static int hf_x509af_id_at_crossCertificatePair = -1;
-static int hf_x509af_id_at_authorityRevocationList = -1;
-static int hf_x509af_id_at_certificateRevocationList = -1;
-static int hf_x509af_id_at_attributeCertificate = -1;
-static int hf_x509af_id_at_attributeCertificateRevocationList = -1;
 #include "packet-x509af-hf.c"
 
 /* Initialize the subtree pointers */
@@ -138,81 +131,11 @@ dissect_x509af_AlgorithmIdentifier(gboolean implicit_tag, tvbuff_t *tvb, int off
 #include "packet-x509af-fn.c"
 
 
-static void
-dissect_x509af_userCertificate_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_x509af_Certificate(FALSE, tvb, 0, pinfo, tree, hf_x509af_id_at_userCertificate);
-}
-
-static void
-dissect_x509af_cAcertificate_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_x509af_Certificate(FALSE, tvb, 0, pinfo, tree, hf_x509af_id_at_cAcertificate);
-}
-
-static void
-dissect_x509af_crossCertificatePair_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_x509af_CertificatePair(FALSE, tvb, 0, pinfo, tree, hf_x509af_id_at_crossCertificatePair);
-}
-
-static void
-dissect_x509af_authorityRevocationList_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_x509af_CertificateList(FALSE, tvb, 0, pinfo, tree, hf_x509af_id_at_authorityRevocationList);
-}
-
-static void
-dissect_x509af_certificateRevocationList_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_x509af_CertificateList(FALSE, tvb, 0, pinfo, tree, hf_x509af_id_at_certificateRevocationList);
-}
-
-static void
-dissect_x509af_attributeCertificate_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_x509af_AttributeCertificate(FALSE, tvb, 0, pinfo, tree, hf_x509af_id_at_attributeCertificate);
-}
-
-static void
-dissect_x509af_attributeCertificateRevocationList_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
-	dissect_x509af_CertificateList(FALSE, tvb, 0, pinfo, tree, hf_x509af_id_at_attributeCertificateRevocationList);
-}
-
 /*--- proto_register_x509af ----------------------------------------------*/
 void proto_register_x509af(void) {
 
   /* List of fields */
   static hf_register_info hf[] = {
-    { &hf_x509af_id_at_attributeCertificateRevocationList,
-      { "attributeCertificateRevocationList", "x509af.id_at_attributeCertificateRevocationList",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "id-at-attributeCertificateRevocationList", HFILL }},
-    { &hf_x509af_id_at_attributeCertificate,
-      { "attributeCertificate", "x509af.id_at_attributeCertificate",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "id-at-attributeCertificate", HFILL }},
-    { &hf_x509af_id_at_authorityRevocationList,
-      { "authorityRevocationList", "x509af.id_at_authorityRevocationList",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "id-at-authorityRevocationList", HFILL }},
-    { &hf_x509af_id_at_certificateRevocationList,
-      { "certificateRevocationList", "x509af.id_at_certificateRevocationList",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "id-at-certificateRevocationList", HFILL }},
-    { &hf_x509af_id_at_crossCertificatePair,
-      { "crossCertificatePair", "x509af.id_at_crossCertificatePair",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "id-at-crossCertificatePair", HFILL }},
-    { &hf_x509af_id_at_userCertificate,
-      { "userCertificate", "x509af.id_at_userCertificate",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "id-at-userCertificate", HFILL }},
-    { &hf_x509af_id_at_cAcertificate,
-      { "cAcertificate", "x509af.id_at_cAcertificate",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "id-at-cAcertificate", HFILL }},
     { &hf_x509af_algorithm_id,
       { "Algorithm Id", "x509af.algorithm.id",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -245,13 +168,13 @@ void proto_register_x509af(void) {
 
 /*--- proto_reg_handoff_x509af -------------------------------------------*/
 void proto_reg_handoff_x509af(void) {
-	register_ber_oid_dissector("2.5.4.36", dissect_x509af_userCertificate_callback, proto_x509af, "id-at-userCertificate");
-	register_ber_oid_dissector("2.5.4.37", dissect_x509af_cAcertificate_callback, proto_x509af, "id-at-cAcertificate");
-	register_ber_oid_dissector("2.5.4.38", dissect_x509af_authorityRevocationList_callback, proto_x509af, "id-at-authorityRevocationList");
-	register_ber_oid_dissector("2.5.4.39", dissect_x509af_certificateRevocationList_callback, proto_x509af, "id-at-certificateRevocationList");
-	register_ber_oid_dissector("2.5.4.40", dissect_x509af_crossCertificatePair_callback, proto_x509af, "id-at-crossCertificatePair");
-	register_ber_oid_dissector("2.5.4.58", dissect_x509af_attributeCertificate_callback, proto_x509af, "id-at-attributeCertificate");
-	register_ber_oid_dissector("2.5.4.59", dissect_x509af_attributeCertificateRevocationList_callback, proto_x509af, "id-at-attributeCertificateRevocationList");
+	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.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");
+	register_ber_oid_dissector("2.5.4.58", dissect_AttributeCertificate_PDU, proto_x509af, "id-at-attributeCertificate");
+	register_ber_oid_dissector("2.5.4.59", dissect_CertificateList_PDU, proto_x509af, "id-at-attributeCertificateRevocationList");
 
 	/*XXX these should really go to a better place but since that
 	  I have not that ITU standard, ill put it here for the time
diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf
index 51e0749877..b55639b10b 100644
--- a/asn1/x509af/x509af.cnf
+++ b/asn1/x509af/x509af.cnf
@@ -23,6 +23,12 @@ CertificateList
 CertificateSerialNumber

 CertificationPath

 

+#.PDU

+AttributeCertificate

+Certificate

+CertificateList

+CertificatePair

+

 #.NO_EMIT

 

 AlgorithmIdentifier