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>

3 files changed, 22 insertions, 18 deletions

diff --git a/asn1/ocsp/ocsp.cnf b/asn1/ocsp/ocsp.cnf
index 757ac53645..002f515d00 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 f122dda90b..095febdf5b 100644
--- a/asn1/ocsp/packet-ocsp-template.c
+++ b/asn1/ocsp/packet-ocsp-template.c
@@ -50,9 +50,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"
 
 
@@ -105,7 +102,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"
diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c
index 322a5794a7..93fc6b9a93 100644
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.c
@@ -139,9 +139,6 @@ static gint ett_ocsp_CrlID = -1;
 /*--- End of included file: packet-ocsp-ett.c ---*/
 #line 52 "../../asn1/ocsp/packet-ocsp-template.c"
 
-static const char *responseType_id;
-
-
 
 /*--- Included file: packet-ocsp-fn.c ---*/
 #line 1 "../../asn1/ocsp/packet-ocsp-fn.c"
@@ -306,7 +303,12 @@ dissect_ocsp_OCSPResponseStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 static int
 dissect_ocsp_T_responseType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_ocsp_responseType_id, &responseType_id);
+#line 40 "../../asn1/ocsp/ocsp.cnf"
+  offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_ocsp_responseType_id, &actx->external.direct_reference);
+
+  actx->external.direct_ref_present = (actx->external.direct_reference != NULL) ? TRUE : FALSE;
+
+
 
   return offset;
 }
@@ -315,7 +317,7 @@ dissect_ocsp_T_responseType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 static int
 dissect_ocsp_T_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 43 "../../asn1/ocsp/ocsp.cnf"
+#line 44 "../../asn1/ocsp/ocsp.cnf"
   gint8 appclass;
   gboolean pc, ind;
   gint32 tag;
@@ -323,7 +325,9 @@ dissect_ocsp_T_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
   /* 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);
+  }
 
 
 
@@ -671,7 +675,7 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre
 
 
 /*--- End of included file: packet-ocsp-fn.c ---*/
-#line 57 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 54 "../../asn1/ocsp/packet-ocsp-template.c"
 
 
 static int
@@ -723,7 +727,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 }},
 
@@ -939,7 +943,7 @@ void proto_register_ocsp(void) {
         "GeneralizedTime", HFILL }},
 
 /*--- End of included file: packet-ocsp-hfarr.c ---*/
-#line 112 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 109 "../../asn1/ocsp/packet-ocsp-template.c"
   };
 
   /* List of subtrees */
@@ -969,7 +973,7 @@ void proto_register_ocsp(void) {
     &ett_ocsp_CrlID,
 
 /*--- End of included file: packet-ocsp-ettarr.c ---*/
-#line 118 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 115 "../../asn1/ocsp/packet-ocsp-template.c"
   };
 
   /* Register protocol */
@@ -1005,6 +1009,6 @@ void proto_reg_handoff_ocsp(void) {
 
 
 /*--- End of included file: packet-ocsp-dis-tab.c ---*/
-#line 141 "../../asn1/ocsp/packet-ocsp-template.c"
+#line 138 "../../asn1/ocsp/packet-ocsp-template.c"
 }