added the userCertificate and cAcertificate attributes

svn path=/trunk/; revision=11508

2 files changed, 25 insertions, 2 deletions

diff --git a/asn1/x509af/AuthenticationFramework.asn b/asn1/x509af/AuthenticationFramework.asn
index 49f3d72a2b..ad4a90ece9 100755
--- a/asn1/x509af/AuthenticationFramework.asn
+++ b/asn1/x509af/AuthenticationFramework.asn
@@ -246,12 +246,11 @@ AttributeCertificateAssertion ::= SEQUENCE {
 --  information object classes 

 --ALGORITHM ::= TYPE-IDENTIFIER

 

-

 --  object identifier assignments 

 --id-at-userPassword OBJECT IDENTIFIER ::=

 --  {id-at 35}

 

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

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

 

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

 

diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c
index 80bfad6484..9d06a57d7d 100644
--- a/asn1/x509af/packet-x509af-template.c
+++ b/asn1/x509af/packet-x509af-template.c
@@ -48,6 +48,8 @@ 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;
 #include "packet-x509af-hf.c"
 
 /* Initialize the subtree pointers */
@@ -131,11 +133,31 @@ 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);
+}
+
 /*--- proto_register_x509af ----------------------------------------------*/
 void proto_register_x509af(void) {
 
   /* List of fields */
   static hf_register_info hf[] = {
+    { &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,
@@ -168,5 +190,7 @@ 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");
 }