aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/pkix1explicit/pkix1explicit.cnf
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2007-10-07 16:02:04 +0000
committerAnders Broman <anders.broman@ericsson.com>2007-10-07 16:02:04 +0000
commit0de04bfc2439ac38efa23590dadd54e4a2ad7b90 (patch)
tree4e88e1cd2000c2c065904438d581b04467e140e3 /asn1/pkix1explicit/pkix1explicit.cnf
parentdd122682775a7e1a59bdbf668f8a39db6f8cef89 (diff)
From Martin Peylo:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1888 There are new versions of CMP (v2) in RFC4210 and CRMF (v2) in RFC4211. The right to exist of CRMF is bound to CMP so I don't split that into two bug reports. I'll upload the new (slightly handmassaged) ASN.1 files for both protocols, along with patches for the respective cnf files, where I also added new #.REGISTER statements. Additionally I had to export some definitions from pkix1explicit (Attribute, Time, UniqueIdentifier and Version) and from pkix1implicit (KeyIdentifier). I'll also upload a patch for that. I uploaded a CMPv2 sample (with errors in the protocol!) to the wiki. svn path=/trunk/; revision=23082
Diffstat (limited to 'asn1/pkix1explicit/pkix1explicit.cnf')
-rw-r--r--asn1/pkix1explicit/pkix1explicit.cnf10
1 files changed, 10 insertions, 0 deletions
diff --git a/asn1/pkix1explicit/pkix1explicit.cnf b/asn1/pkix1explicit/pkix1explicit.cnf
index 0e50f5955e..aefafed833 100644
--- a/asn1/pkix1explicit/pkix1explicit.cnf
+++ b/asn1/pkix1explicit/pkix1explicit.cnf
@@ -6,6 +6,7 @@
#.MODULE_IMPORT
#.EXPORTS
+Attribute
AttributeTypeAndValue
CertificateSerialNumber
DirectoryString
@@ -15,6 +16,9 @@ RelativeDistinguishedName
RDNSequence
TeletexDomainDefinedAttribute
TerminalType
+Version
+Time
+UniqueIdentifier
#.REGISTER
DirectoryString B "1.3.6.1.5.5.7.2.1" "id-qt-cps"
@@ -31,6 +35,12 @@ DomainParameters B "1.2.840.10046.2.1" "dhpublicnumber"
#.FN_BODY DirectoryString
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
+#.FN_PARS Attribute/values
+ FN_VARIANT = _str HF_INDEX = hf_pkix1explicit_object_identifier_id VAL_PTR = &object_identifier_id
+
+#.FN_BODY Attribute/values/_item
+ offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
+
#.FN_PARS AttributeTypeAndValue/value
FN_VARIANT = _str HF_INDEX = hf_pkix1explicit_object_identifier_id VAL_PTR = &object_identifier_id