diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-09-06 12:21:24 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-09-06 13:27:14 +0000 |
| commit | c12624840ac422ed968fe5df600cd8fdb14683d1 (patch) | |
| tree | e41ad58c2ad8a3a5461f967065d5944e096a65b4 /asn1 | |
| parent | 3d2bcf5e96a1e63a71ffa01dcd34fa187ef502d0 (diff) | |
| download | wireshark-c12624840ac422ed968fe5df600cd8fdb14683d1.tar.gz | |
OCSP: get rid of an evil global variable
Bug: 11505
Change-Id: I87cc676426dceed05a9a95bb515c4fb2535ac9c5
Reviewed-on: https://code.wireshark.org/review/10400
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit 09e92f004abc040584dbb0bec4598b34ee7a900f)
Conflicts:
epan/dissectors/packet-ocsp.c
Reviewed-on: https://code.wireshark.org/review/10402
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/ocsp/ocsp.cnf | 9 | ||||
| -rw-r--r-- | asn1/ocsp/packet-ocsp-template.c | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/asn1/ocsp/ocsp.cnf b/asn1/ocsp/ocsp.cnf index 5b6831a298..551b4583cc 100644 --- a/asn1/ocsp/ocsp.cnf +++ b/asn1/ocsp/ocsp.cnf @@ -36,8 +36,9 @@ Version #.FIELD_RENAME -#.FN_PARS ResponseBytes/responseType - FN_VARIANT = _str HF_INDEX = hf_ocsp_responseType_id VAL_PTR = &responseType_id +#.FN_BODY ResponseBytes/responseType FN_VARIANT = _str HF_INDEX = hf_ocsp_responseType_id VAL_PTR = &actx->external.direct_reference +%(DEFAULT_BODY)s + actx->external.direct_ref_present = (actx->external.direct_reference != NULL) ? TRUE : FALSE; #.FN_BODY ResponseBytes/response gint8 appclass; @@ -47,6 +48,8 @@ Version /* skip past the T and L */ offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &appclass, &pc, &tag); offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind); - offset=call_ber_oid_callback(responseType_id, tvb, offset, actx->pinfo, tree, NULL); + if (actx->external.direct_ref_present) { + offset = call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); + } #.END diff --git a/asn1/ocsp/packet-ocsp-template.c b/asn1/ocsp/packet-ocsp-template.c index 843cacdf5f..be438b0139 100644 --- a/asn1/ocsp/packet-ocsp-template.c +++ b/asn1/ocsp/packet-ocsp-template.c @@ -51,9 +51,6 @@ static int hf_ocsp_responseType_id = -1; static gint ett_ocsp = -1; #include "packet-ocsp-ett.c" -static const char *responseType_id; - - #include "packet-ocsp-fn.c" @@ -106,7 +103,7 @@ void proto_register_ocsp(void) { /* List of fields */ static hf_register_info hf[] = { { &hf_ocsp_responseType_id, - { "ResponseType Id", "x509af.responseType.id", + { "ResponseType Id", "ocsp.responseType.id", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, #include "packet-ocsp-hfarr.c" |