diff options
author | Michael Mann <mmann78@netscape.net> | 2013-06-22 15:08:18 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-06-22 15:08:18 +0000 |
commit | 87eb22f4648fd5283d2c91c2046c0aa90b7b469b (patch) | |
tree | 1d6d97e8c07b207f43a34ad48ee0e5b8b8e962c9 /epan/dissectors/packet-x509af.c | |
parent | 707e2ce4098a65abde3dc2e89c970cd580937a4c (diff) |
More proper fix (per advice of bug 8515 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8515)) of global variables complained about in bug 7060 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7060). Not sure if algorithm_id of x509af dissector could also be a actx->external.direct_reference, so left it alone.
svn path=/trunk/; revision=50113
Diffstat (limited to 'epan/dissectors/packet-x509af.c')
-rw-r--r-- | epan/dissectors/packet-x509af.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index ee50706b89..01c08f6c88 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -373,13 +373,13 @@ dissect_x509af_T_extnId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset #line 88 "../../asn1/x509af/x509af.cnf" const char *name; - offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_extension_id, (const char**)&actx->private_data); + offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_extension_id, &actx->external.direct_reference); - if(actx->private_data) { - name = oid_resolved_from_string((const char*)actx->private_data); + if(actx->external.direct_reference) { + name = oid_resolved_from_string(actx->external.direct_reference); - proto_item_append_text(tree, " (%s)", name ? name : (const char *)actx->private_data); + proto_item_append_text(tree, " (%s)", name ? name : actx->external.direct_reference); } @@ -408,7 +408,7 @@ dissect_x509af_T_extnValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off /* skip past the T and L */ offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &ber_class, &pc, &tag); offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind); - offset=call_ber_oid_callback((const char*)actx->private_data, tvb, offset, actx->pinfo, tree); + offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree); |