diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-05-15 05:49:43 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-05-15 05:49:43 +0000 |
| commit | f08cd1e5e38ba78b85caef62ad0a4de83c750494 (patch) | |
| tree | 26b227bd3fdd4303f46b9d2121e3393034b631cf /asn1/spnego | |
| parent | 792e51d00a0d0720d443d27c313b7c3fb24394fe (diff) | |
actx in the rest of dissect_ber..()l
svn path=/trunk/; revision=21773
Diffstat (limited to 'asn1/spnego')
| -rw-r--r-- | asn1/spnego/packet-spnego-template.c | 4 | ||||
| -rw-r--r-- | asn1/spnego/spnego.cnf | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c index 4e52960d75..4a86547418 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -172,6 +172,8 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean pc, ind = 0; gint32 tag; guint32 len; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); item = proto_tree_add_item(tree, hf_spnego_krb5, tvb, offset, -1, FALSE); @@ -224,7 +226,7 @@ dissect_spnego_krb5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ /* Next, the OID */ - offset=dissect_ber_object_identifier_str(FALSE, pinfo, subtree, tvb, offset, hf_spnego_krb5_oid, &oid); + offset=dissect_ber_object_identifier_str(FALSE, &asn1_ctx, 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 b6c0f9ab7a..563f9d17a8 100644 --- a/asn1/spnego/spnego.cnf +++ b/asn1/spnego/spnego.cnf @@ -158,7 +158,7 @@ NegTokenInit/mechListMIC negTokenInit_mechListMIC * which is what it's supposed to be; that'll cause the * right error report if it's not an octet string, either. */ - offset = dissect_ber_octet_string(FALSE, actx->pinfo, tree, tvb, offset, + offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_spnego_mechListMIC, &mechListMIC_tvb); /* |