aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-x509if.h
diff options
context:
space:
mode:
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2011-04-12 20:39:48 +0000
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2011-04-12 20:39:48 +0000
commitc491c382637b3d6155f443e3450b61b5557d43b4 (patch)
tree5635709d1446638e6c63e1971bcf4bcc34761c92 /epan/dissectors/packet-x509if.h
parenteeb8eee7a77eac77957e6557c5c9a2c5c8c57595 (diff)
Add x509if_frame_end() which is passed to register_frame_end_routine()
and which resets our global variables. Remove a boolean which was used to track a char *; just check if the pointer is NULL instead. Fixes bugs 5754 and 5793, hopefully without breaking anything. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36608 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-x509if.h')
-rw-r--r--epan/dissectors/packet-x509if.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-x509if.h b/epan/dissectors/packet-x509if.h
index aed6c004d0..2c67466998 100644
--- a/epan/dissectors/packet-x509if.h
+++ b/epan/dissectors/packet-x509if.h
@@ -5,7 +5,7 @@
/* Input file: packet-x509if-template.h */
-#line 1 "packet-x509if-template.h"
+#line 1 "../../asn1/x509if/packet-x509if-template.h"
/* packet-x509if.h
* Routines for X.509 Information Framework packet dissection
* Ronnie Sahlberg 2004
@@ -36,7 +36,7 @@
/*--- Included file: packet-x509if-exp.h ---*/
-#line 1 "packet-x509if-exp.h"
+#line 1 "../../asn1/x509if/packet-x509if-exp.h"
extern const value_string x509if_Name_vals[];
extern const value_string x509if_Refinement_vals[];
extern const value_string x509if_AttributeUsage_vals[];
@@ -83,7 +83,7 @@ int dissect_x509if_Mapping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
int dissect_x509if_MRSubstitution(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
/*--- End of included file: packet-x509if-exp.h ---*/
-#line 30 "packet-x509if-template.h"
+#line 30 "../../asn1/x509if/packet-x509if-template.h"
extern const char * x509if_get_last_dn(void);