diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-11-05 14:30:13 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-11-05 14:30:13 +0000 |
| commit | e327e26bd01c407a42f12c7d9e22d541ee75058c (patch) | |
| tree | df50b6d5f705e00367eaa5da1be2611c741399da | |
| parent | ba4c812427b929ed86546c21cab9abad59bd85ff (diff) | |
| download | wireshark-e327e26bd01c407a42f12c7d9e22d541ee75058c.tar.gz | |
Back out Revision 45866 - This patch will print the information if an invalid string was entered. It would be better to have a button to click on in the UAT dialog to show valid values, but I don't know how I could do that with the UAT system. So I'm simply printing it now in the error dialog, which should be good enough.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7949
And add missing patch to epan.c
svn path=/trunk-1.8/; revision=45927
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 2 | ||||
| -rw-r--r-- | epan/epan.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 8910942d22..40a245542a 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -3969,7 +3969,7 @@ ssldecrypt_uat_fld_protocol_chk_cb(void* r _U_, const char* p, unsigned len _U_, } if (!find_dissector(p)) { - *err = ep_strdup_printf("Could not find dissector for: '%s'\nValid dissectors are:\n%s", p, ssl_association_info()); + *err = ep_strdup_printf("Could not find dissector for: '%s'", p); return FALSE; } diff --git a/epan/epan.c b/epan/epan.c index 538026007f..a17367a156 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -103,10 +103,14 @@ epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_da guids_init(); except_init(); +#ifdef HAVE_LIBGCRYPT + /* initialize libgcrypt (beware, it won't be thread-safe) */ + gcry_check_version(NULL); + gcry_control (GCRYCTL_DISABLE_SECMEM, 0); + gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); +#endif #ifdef HAVE_LIBGNUTLS gnutls_global_init(); -#elif defined(HAVE_LIBGCRYPT) - gcry_check_version(NULL); #endif tap_init(); prefs_init(); |