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 /asn1/x509af | |
| 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 'asn1/x509af')
| -rw-r--r-- | asn1/x509af/x509af.cnf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf index 6f9a78a755..f3ea5574e2 100644 --- a/asn1/x509af/x509af.cnf +++ b/asn1/x509af/x509af.cnf @@ -82,17 +82,17 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate offset=call_ber_oid_callback(algorithm_id, tvb, offset, actx->pinfo, tree); #.FN_PARS Extension/extnId - FN_VARIANT = _str HF_INDEX = hf_x509af_extension_id VAL_PTR = (const char**)&actx->private_data + FN_VARIANT = _str HF_INDEX = hf_x509af_extension_id VAL_PTR = &actx->external.direct_reference #.FN_BODY Extension/extnId const char *name; %(DEFAULT_BODY)s - 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); } #.FN_BODY Extension/extnValue @@ -103,7 +103,7 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate /* 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); #.FN_BODY SubjectName |