Add a lot of missing attribute dissectors

svn path=/trunk/; revision=11509

3 files changed, 67 insertions, 6 deletions

diff --git a/asn1/x509af/AuthenticationFramework.asn b/asn1/x509af/AuthenticationFramework.asn
index ad4a90ece9..20617d8ccb 100755
--- a/asn1/x509af/AuthenticationFramework.asn
+++ b/asn1/x509af/AuthenticationFramework.asn
@@ -252,17 +252,17 @@ AttributeCertificateAssertion ::= SEQUENCE {
 

 id-at-userCertificate OBJECT IDENTIFIER ::= {id-at 36}

 

---id-at-cAcertificate OBJECT IDENTIFIER ::= {id-at 37}

+id-at-cAcertificate OBJECT IDENTIFIER ::= {id-at 37}

 

---id-at-authorityRevocationList OBJECT IDENTIFIER ::= {id-at 38}

+id-at-authorityRevocationList OBJECT IDENTIFIER ::= {id-at 38}

 

---id-at-certificateRevocationList OBJECT IDENTIFIER ::= {id-at 39}

+id-at-certificateRevocationList OBJECT IDENTIFIER ::= {id-at 39}

 

---id-at-crossCertificatePair OBJECT IDENTIFIER ::= {id-at 40}

+id-at-crossCertificatePair OBJECT IDENTIFIER ::= {id-at 40}

 

---id-at-attributeCertificate OBJECT IDENTIFIER ::= {id-at 58}

+id-at-attributeCertificate OBJECT IDENTIFIER ::= {id-at 58}

 

---id-at-attributeCertificateRevocationList OBJECT IDENTIFIER ::= {id-at 59}

+id-at-attributeCertificateRevocationList OBJECT IDENTIFIER ::= {id-at 59}

 

 --id-mr-attributeCertificateMatch OBJECT IDENTIFIER ::= {id-mr 42}

 

diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c
index 9d06a57d7d..eb652de4e7 100644
--- a/asn1/x509af/packet-x509af-template.c
+++ b/asn1/x509af/packet-x509af-template.c
@@ -50,6 +50,11 @@ 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 */
@@ -145,11 +150,61 @@ dissect_x509af_cAcertificate_callback(tvbuff_t *tvb, packet_info *pinfo, proto_t
 	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,
@@ -192,5 +247,10 @@ void proto_register_x509af(void) {
 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");
 }
 
diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf
index 4006a0e7db..a05d2bb8f7 100644
--- a/asn1/x509af/x509af.cnf
+++ b/asn1/x509af/x509af.cnf
@@ -15,6 +15,7 @@ SelectedAttributeTypes x509sat
 #.EXPORTS

 

 Certificate

+Certificates

 CertificateList

 CertificateSerialNumber

 AttributeCertificate