diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-17 14:11:29 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-19 02:52:11 +0000 |
| commit | e333e4c90f0aca41b0a56cef22fd80d0b0e73e14 (patch) | |
| tree | 0d90a0e8561d6e4cf1361d56629e649af655d40d /asn1/pkcs12 | |
| parent | 59155d1d1c40a979d5f5040e4df35ee72dadbb9c (diff) | |
Convert OID APIs to use wmem.
There are a few oid functions that are only called in oids_test.c. I'll presume the APIs are used in proprietary dissectors rather than just remove them.
Change-Id: I4595e00f93bf9ab8cf2493fe0432b91960f55a3f
Reviewed-on: https://code.wireshark.org/review/6592
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'asn1/pkcs12')
| -rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 543a86e6db..63d09b04fa 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -86,7 +86,7 @@ static void append_oid(proto_tree *tree, const char *oid) { const char *name = NULL; - name = oid_resolved_from_string(oid); + name = oid_resolved_from_string(wmem_packet_scope(), oid); proto_item_append_text(tree, " (%s)", name ? name : oid); } @@ -369,7 +369,7 @@ int PBE_decrypt_data(const char *object_identifier_id_param, tvbuff_t *encrypted tvb_set_free_cb(clear_tvb, g_free); name = g_string_new(""); - oidname = oid_resolved_from_string(object_identifier_id_param); + oidname = oid_resolved_from_string(wmem_packet_scope(), object_identifier_id_param); g_string_printf(name, "Decrypted %s", oidname ? oidname : object_identifier_id_param); /* add it as a new source */ |