diff options
| author | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-11-14 10:02:31 +0000 |
|---|---|---|
| committer | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-11-14 10:02:31 +0000 |
| commit | 167ac032bf154aa961046acda1a4c950a92f8bf6 (patch) | |
| tree | e8f6231cfc7a837d8fc9901a7a676180dce93bd1 /asn1/spnego | |
| parent | 90aab32112f01b232484bc9f84329a3d3de49d89 (diff) | |
- dissect_ber_object_identifier() returns value as tvb
- new dissect_ber_object_identifier_str() function
- BER dissectors adapted and regenerated
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16501 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/spnego')
| -rw-r--r-- | asn1/spnego/packet-spnego-template.c | 6 | ||||
| -rw-r--r-- | asn1/spnego/spnego.cnf | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c index 151eb43a12..59f7851668 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -73,7 +73,7 @@ static int hf_spnego_krb5_confounder = -1; #include "packet-spnego-hf.c" /* Global variables */ -gchar MechType_oid[MAX_OID_STR_LEN]; +static const char *MechType_oid; gssapi_oid_value *next_level_value; gboolean saw_mechanism = FALSE; @@ -163,7 +163,7 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *subtree; int offset = 0; guint16 token_id; - gchar oid[MAX_OID_STR_LEN]; + const char *oid; gssapi_oid_value *value; tvbuff_t *krb5_tvb; gint8 class; @@ -222,7 +222,7 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ /* Next, the OID */ - offset=dissect_ber_object_identifier(FALSE, pinfo, subtree, tvb, offset, hf_spnego_krb5_oid, oid); + offset=dissect_ber_object_identifier_str(FALSE, pinfo, subtree, tvb, offset, hf_spnego_krb5_oid, &oid); value = gssapi_lookup_oid_str(oid); diff --git a/asn1/spnego/spnego.cnf b/asn1/spnego/spnego.cnf index 1ebd727d5e..d39d09238a 100644 --- a/asn1/spnego/spnego.cnf +++ b/asn1/spnego/spnego.cnf @@ -17,7 +17,7 @@ NegTokenInit/mechListMIC negTokenInit_mechListMIC #.FN_PARS MechType - VAL_PTR = MechType_oid + FN_VARIANT = _str VAL_PTR = &MechType_oid #.FN_BODY MechType |