aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/x411
diff options
context:
space:
mode:
authorGraeme Lunt <graeme.lunt@smhs.co.uk>2007-03-23 16:38:52 +0000
committerGraeme Lunt <graeme.lunt@smhs.co.uk>2007-03-23 16:38:52 +0000
commit53eff34d66ce8c4566b38e02b9160f0ec0c1eb74 (patch)
treeca0c042d513ed658cb86767a6f33d0ce41c1119f /asn1/x411
parentbede68648b3903d64e0334188ee0ab0a0f590e33 (diff)
Support for X.411 "additional information" field.
svn path=/trunk/; revision=21148
Diffstat (limited to 'asn1/x411')
-rw-r--r--asn1/x411/packet-x411-template.c2
-rw-r--r--asn1/x411/x411.cnf14
2 files changed, 15 insertions, 1 deletions
diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c
index 07795f53ac..29d1a5d61a 100644
--- a/asn1/x411/packet-x411-template.c
+++ b/asn1/x411/packet-x411-template.c
@@ -77,6 +77,7 @@ call_x411_oid_callback(char *base_oid, tvbuff_t *tvb, int offset, packet_info *p
static gint ett_x411 = -1;
static gint ett_x411_content_unknown = -1;
static gint ett_x411_bilateral_information = -1;
+static gint ett_x411_additional_information = -1;
#include "packet-x411-ett.c"
#include "packet-x411-fn.c"
@@ -214,6 +215,7 @@ void proto_register_x411(void) {
&ett_x411,
&ett_x411_content_unknown,
&ett_x411_bilateral_information,
+ &ett_x411_additional_information,
#include "packet-x411-ettarr.c"
};
diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf
index f649b593c4..4f3000c8b1 100644
--- a/asn1/x411/x411.cnf
+++ b/asn1/x411/x411.cnf
@@ -227,7 +227,19 @@ ORName B "2.16.840.1.101.2.1.5.47" "id-at-aLExemptedAddressProcessor"
ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses"
#.FN_BODY AdditionalInformation
-/*XXX not implemented yet */
+ proto_item *item = NULL;
+ int loffset = 0;
+ guint32 len = 0;
+
+ /* work out the length */
+ loffset = dissect_ber_identifier(pinfo, tree, tvb, offset, NULL, NULL, NULL);
+ (void) dissect_ber_length(pinfo, tree, tvb, loffset, &len, NULL);
+
+ item = proto_tree_add_item(tree, hf_index, tvb, offset, len, FALSE);
+ tree = proto_item_add_subtree(item, ett_x411_additional_information);
+ proto_item_append_text(tree, " (The use of this field is \"strongly deprecated\".)");
+
+ offset = dissect_unknown_ber(pinfo, tvb, offset, tree);
#.FN_BODY RegistrationTypes/extensions/_item
/*XXX not implemented yet */