diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2014-04-25 12:10:06 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-04-25 15:30:06 +0000 |
| commit | 7435881cea4024474c876844c1a1bb41a5ec3d3b (patch) | |
| tree | c2b288979183b17521c0515e5d18c53d9f6bc29a /epan/dissectors/packet-ssl-utils.c | |
| parent | 182fd1719b24368777a6e740d1f5b4a6b9bc6441 (diff) | |
Revert back to emem due to UAT use
Partially reverts "Convert SSL and TCP dissectors to wmem (with the
exception of UAT)." (960a461c8a54460db372968854f6280f9c48a41d).
ssl_load_pkcs12 is called in UAT context via
ssldecrypt_uat_fld_password_chk_cb and ssl_parse_key_list (dtls/ssl).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10038
Change-Id: I22220fd128b17e273c5ed572a83edbfb8261bda9
Reviewed-on: https://code.wireshark.org/review/1344
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index f3b76c1177..7d455d433c 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -3504,7 +3504,7 @@ ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd, const char** err) { ret = gnutls_pkcs12_init(&ssl_p12); if (ret < 0) { - *err = wmem_strdup_printf(wmem_file_scope(), "gnutls_pkcs12_init(&st_p12) - %s", gnutls_strerror(ret)); + *err = se_strdup_printf("gnutls_pkcs12_init(&st_p12) - %s", gnutls_strerror(ret)); ssl_debug_printf("%s\n", *err); g_free(private_key); g_free(data.data); @@ -3514,12 +3514,12 @@ ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd, const char** err) { /* load PKCS#12 in DER or PEM format */ ret = gnutls_pkcs12_import(ssl_p12, &data, GNUTLS_X509_FMT_DER, 0); if (ret < 0) { - *err = wmem_strdup_printf(wmem_file_scope(), "could not load PKCS#12 in DER format: %s", gnutls_strerror(ret)); + *err = se_strdup_printf("could not load PKCS#12 in DER format: %s", gnutls_strerror(ret)); ssl_debug_printf("%s\n", *err); ret = gnutls_pkcs12_import(ssl_p12, &data, GNUTLS_X509_FMT_PEM, 0); if (ret < 0) { - *err = wmem_strdup_printf(wmem_file_scope(), "could not load PKCS#12 in PEM format: %s", gnutls_strerror(ret)); + *err = se_strdup_printf("could not load PKCS#12 in PEM format: %s", gnutls_strerror(ret)); ssl_debug_printf("%s\n", *err); } else { *err = NULL; @@ -3566,7 +3566,7 @@ ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd, const char** err) { ret = gnutls_x509_crt_init(&ssl_cert); if (ret < 0) { - *err = wmem_strdup_printf(wmem_file_scope(), "gnutls_x509_crt_init(&ssl_cert) - %s", gnutls_strerror(ret)); + *err = se_strdup_printf("gnutls_x509_crt_init(&ssl_cert) - %s", gnutls_strerror(ret)); ssl_debug_printf("%s\n", *err); g_free(private_key); return 0; @@ -3574,7 +3574,7 @@ ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd, const char** err) { ret = gnutls_x509_crt_import(ssl_cert, &data, GNUTLS_X509_FMT_DER); if (ret < 0) { - *err = wmem_strdup_printf(wmem_file_scope(), "gnutls_x509_crt_import(ssl_cert, &data, GNUTLS_X509_FMT_DER) - %s", gnutls_strerror(ret)); + *err = se_strdup_printf("gnutls_x509_crt_import(ssl_cert, &data, GNUTLS_X509_FMT_DER) - %s", gnutls_strerror(ret)); ssl_debug_printf("%s\n", *err); g_free(private_key); return 0; @@ -3600,7 +3600,7 @@ ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd, const char** err) { ret = gnutls_x509_privkey_init(&ssl_pkey); if (ret < 0) { - *err = wmem_strdup_printf(wmem_file_scope(), "gnutls_x509_privkey_init(&ssl_pkey) - %s", gnutls_strerror(ret)); + *err = se_strdup_printf("gnutls_x509_privkey_init(&ssl_pkey) - %s", gnutls_strerror(ret)); ssl_debug_printf("%s\n", *err); g_free(private_key); return 0; @@ -3608,7 +3608,7 @@ ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd, const char** err) { ret = gnutls_x509_privkey_import_pkcs8(ssl_pkey, &data, GNUTLS_X509_FMT_DER, cert_passwd, (bag_type==GNUTLS_BAG_PKCS8_KEY) ? GNUTLS_PKCS_PLAIN : 0); if (ret < 0) { - *err = wmem_strdup_printf(wmem_file_scope(), "Can not decrypt private key - %s", gnutls_strerror(ret)); + *err = se_strdup_printf("Can not decrypt private key - %s", gnutls_strerror(ret)); ssl_debug_printf("%s\n", *err); g_free(private_key); return 0; |