diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-10-11 08:28:57 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-10-11 08:28:57 +0000 |
| commit | d88e1202a58046700441d50041a71681e65e6467 (patch) | |
| tree | b2158fc87481133092061f2ecc8e4c3b88cb5059 /epan/epan.c | |
| parent | dda0e941618c2a51ff8754f8ee9408695865683f (diff) | |
From Bartosz Brachaczek:
Make the SSL dissector work with GnuTLS compiled with nettle.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6869
#BACKPORT
svn path=/trunk/; revision=45465
Diffstat (limited to 'epan/epan.c')
| -rw-r--r-- | epan/epan.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/epan.c b/epan/epan.c index 64974774e3..6437bad237 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -90,10 +90,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(); |