diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-05-01 20:54:31 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-05-01 20:54:31 +0000 |
| commit | b787f03df35e6ea3112014227b3078affa1768b3 (patch) | |
| tree | e4bbc68759a801777337eb9bb2399f03cf274073 /asn1/crmf | |
| parent | bf579224ae30b015206d602d976998c8bbab06f3 (diff) | |
Remove some global variables in favor of private_data member of asn1_ctx_t. Bug 7060 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7060). This should (mostly) passify the bug, but it appears like this could be done with a lot more ASN.1 dissectors.
svn path=/trunk/; revision=49117
Diffstat (limited to 'asn1/crmf')
| -rw-r--r-- | asn1/crmf/crmf.cnf | 4 | ||||
| -rw-r--r-- | asn1/crmf/packet-crmf-template.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/asn1/crmf/crmf.cnf b/asn1/crmf/crmf.cnf index f5abc415dc..9bf6bfc9a5 100644 --- a/asn1/crmf/crmf.cnf +++ b/asn1/crmf/crmf.cnf @@ -68,10 +68,10 @@ PrivateKeyInfo/version privkey_version EncKeyWithID/privateKey enckeywid_privkey #.FN_PARS AttributeTypeAndValue/type - FN_VARIANT = _str HF_INDEX = hf_crmf_type_oid VAL_PTR = &object_identifier_id + FN_VARIANT = _str HF_INDEX = hf_crmf_type_oid VAL_PTR = (const char**)&actx->private_data #.FN_BODY AttributeTypeAndValue/value - offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); + offset=call_ber_oid_callback((const char*)actx->private_data, tvb, offset, actx->pinfo, tree); #.END diff --git a/asn1/crmf/packet-crmf-template.c b/asn1/crmf/packet-crmf-template.c index 70c0f8d10b..ed1d31181e 100644 --- a/asn1/crmf/packet-crmf-template.c +++ b/asn1/crmf/packet-crmf-template.c @@ -47,9 +47,6 @@ static int hf_crmf_type_oid = -1; /* Initialize the subtree pointers */ #include "packet-crmf-ett.c" - -static const char *object_identifier_id; - #include "packet-crmf-fn.c" |