remove functions register_ber_oid_name() and get_ber_oid_name() from packet-ber.c...

[obnox/wireshark/wip.git] / asn1 / x509af / x509af.cnf

diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf
index 37a4d6d46d9066bc4c258c0b30ce7a51884ab63f..e8842d6c8b4ff40e42ea9ebcd300359f08de0f08 100644 (file)
--- a/asn1/x509af/x509af.cnf
+++ b/asn1/x509af/x509af.cnf
@@ -3,26 +3,33 @@
 
 # $Id$
 
-#.MODULE_IMPORT
-InformationFramework x509if
-CertificateExtensions x509ce
-SelectedAttributeTypes x509sat
-
-#.INCLUDE ../x509ce/x509ce_exp.cnf
+#.INCLUDE ../x509ce/x509ce-exp.cnf
 #.INCLUDE ../x509if/x509if-exp.cnf
-#.INCLUDE ../x509sat/x509sat_exp.cnf
+#.INCLUDE ../x509sat/x509sat-exp.cnf
 
 #.EXPORTS
+ACPathData
 AlgorithmIdentifier
+AttCertValidityPeriod
 AttributeCertificate
 AttributeCertificateAssertion
+AttributeCertificateInfo
 AttributeCertificationPath
 Certificate
 Certificates
 CertificateList
+CertificatePair
 CertificateSerialNumber
 CertificationPath
+CrossCertificates
+Extension
+Extensions
+ForwardCertificationPath
+IssuerSerial
 SubjectPublicKeyInfo
+Time
+Validity
+Version
 
 #.PDU
 
@@ -35,6 +42,7 @@ CertificatePair      B "2.5.4.40" "id-at-crossCertificatePair"
 AttributeCertificate B "2.5.4.58" "id-at-attributeCertificate"
 CertificateList      B "2.5.4.59" "id-at-attributeCertificateRevocationList"
 
+DSS-Params          B "1.2.840.10040.4.1" "id-dsa"
 #.NO_EMIT
 
 #.TYPE_RENAME
@@ -54,24 +62,53 @@ IssuerSerial/issuer                 issuerName
 CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate                revokedUserCertificate
 #.END
 
+#.FN_PARS AlgorithmIdentifier/algorithmId
+  FN_VARIANT = _str  HF_INDEX = hf_x509af_algorithm_id  VAL_PTR = &algorithm_id
+
 #.FN_BODY AlgorithmIdentifier/algorithmId
-  offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
-                                 hf_x509af_algorithm_id, algorithm_id);
+  const char *name;
+
+  %(DEFAULT_BODY)s
+
+  if(algorithm_id) {
+    name = get_oid_str_name(algorithm_id);
+
+    proto_item_append_text(tree, " (%%s)", name ? name : algorithm_id); 
+  }
 
 #.FN_BODY AlgorithmIdentifier/parameters
   offset=call_ber_oid_callback(algorithm_id, tvb, offset, pinfo, tree);
 
+#.FN_PARS Extension/extnId
+  FN_VARIANT = _str  HF_INDEX = hf_x509af_extension_id  VAL_PTR = &extension_id
+
 #.FN_BODY Extension/extnId
-  offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
-                                 hf_x509af_extension_id, extension_id);
+  const char *name;
+
+  %(DEFAULT_BODY)s
+
+  if(extension_id) {
+    name = get_oid_str_name(extension_id);
+
+    proto_item_append_text(tree, " (%%s)", name ? name : extension_id);
+  }
 
 #.FN_BODY Extension/extnValue
-  guint8 class;
+  gint8 class;
   gboolean pc, ind;
-  guint32 tag;
+  gint32 tag;
   guint32 len;
   /* skip past the T and L  */
   offset = dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
   offset = dissect_ber_length(pinfo, tree, tvb, offset, &len, &ind);
   offset=call_ber_oid_callback(extension_id, tvb, offset, pinfo, tree);
 
+#.FN_BODY SubjectName
+
+  const char* str;
+  %(DEFAULT_BODY)s
+
+  str = x509if_get_last_dn();
+  proto_item_append_text(proto_item_get_parent(tree), " (%%s)", str?str:"");
+
+#.END