diff options
| author | Dario Lombardo <lomato@gmail.com> | 2021-03-23 16:41:54 +0100 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-03-25 09:38:10 +0000 |
| commit | ea929d6401351916e0abca7429979eee9c47d3f2 (patch) | |
| tree | 522492a802e608e8049fa5a3586477053002bce0 /epan/secrets.c | |
| parent | e6df13076281a704e9dd1aa8c2afe3e7dce015e3 (diff) | |
wsutils: add local implementation of g_memdup2.
g_memdup() was deprecated and replaced with g_memdup2() in GLib 2.68,
we provide our own copy of g_memdup2() for older GLib versions.
Diffstat (limited to 'epan/secrets.c')
| -rw-r--r-- | epan/secrets.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/secrets.c b/epan/secrets.c index 200f032df6..13717d7761 100644 --- a/epan/secrets.c +++ b/epan/secrets.c @@ -16,6 +16,7 @@ #include "secrets.h" #include <wiretap/wtap.h> +#include <wsutil/glib-compat.h> #include <string.h> #ifdef HAVE_LIBGNUTLS @@ -135,7 +136,7 @@ privkey_hash_table_new(void) static void rsa_privkey_add(const cert_key_id_t *key_id, gnutls_privkey_t pkey) { - void *ht_key = g_memdup(key_id->key_id, sizeof(cert_key_id_t)); + void *ht_key = g_memdup2(key_id->key_id, sizeof(cert_key_id_t)); const guint32 *dw = (const guint32 *)key_id->key_id; g_hash_table_insert(rsa_privkeys, ht_key, pkey); g_debug("Adding RSA private, Key ID %08x%08x%08x%08x%08x", g_htonl(dw[0]), @@ -639,7 +640,7 @@ secrets_rsa_decrypt(const cert_key_id_t *key_id, const guint8 *encr, int encr_le ret = gnutls_privkey_decrypt_data(pkey, 0, &ciphertext, &plain); if (ret == 0) { - *out = (guint8 *)g_memdup(plain.data, plain.size); + *out = (guint8 *)g_memdup2(plain.data, plain.size); *out_len = plain.size; gnutls_free(plain.data); } |