diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-01-19 23:28:05 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-01-20 09:19:57 +0000 |
| commit | 47648e0528f091a6c7525d9d880f85a0a5fa42d0 (patch) | |
| tree | b8f8ed1574c62d3ecaa93f00f0b3f29fa8937306 /epan/dissectors | |
| parent | 0dbe79c53fe40cd388bd84eac452cb48d204ef13 (diff) | |
X509AF: reset algorithm_id global variable when closing a file
Change-Id: I59a6e5e482f4f11ab446e9839cc7a0c67742dab3
Reviewed-on: https://code.wireshark.org/review/13424
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-x509af.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index d9ab5a1e69..a02bc98ca4 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -979,6 +979,12 @@ dissect_pkix_crl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi return dissect_x509af_CertificateList(FALSE, tvb, 0, &asn1_ctx, tree, -1); } +static void +x509af_cleanup_protocol(void) +{ + algorithm_id = NULL; +} + /*--- proto_register_x509af ----------------------------------------------*/ void proto_register_x509af(void) { @@ -1293,7 +1299,7 @@ void proto_register_x509af(void) { "INTEGER", HFILL }}, /*--- End of included file: packet-x509af-hfarr.c ---*/ -#line 114 "../../asn1/x509af/packet-x509af-template.c" +#line 120 "../../asn1/x509af/packet-x509af-template.c" }; /* List of subtrees */ @@ -1336,7 +1342,7 @@ void proto_register_x509af(void) { &ett_x509af_DSS_Params, /*--- End of included file: packet-x509af-ettarr.c ---*/ -#line 120 "../../asn1/x509af/packet-x509af-template.c" +#line 126 "../../asn1/x509af/packet-x509af-template.c" }; /* Register protocol */ @@ -1346,6 +1352,7 @@ void proto_register_x509af(void) { proto_register_field_array(proto_x509af, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); + register_cleanup_routine(&x509af_cleanup_protocol); register_ber_syntax_dissector("Certificate", proto_x509af, dissect_x509af_Certificate_PDU); register_ber_syntax_dissector("CertificateList", proto_x509af, dissect_CertificateList_PDU); @@ -1379,7 +1386,7 @@ void proto_reg_handoff_x509af(void) { /*--- End of included file: packet-x509af-dis-tab.c ---*/ -#line 148 "../../asn1/x509af/packet-x509af-template.c" +#line 155 "../../asn1/x509af/packet-x509af-template.c" /*XXX these should really go to a better place but since I have not that ITU standard, I'll put it here for the time |