diff options
Diffstat (limited to 'epan/epan.c')
| -rw-r--r-- | epan/epan.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/epan/epan.c b/epan/epan.c index ffb4bddecf..e5f2bf4867 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -90,7 +90,7 @@ epan_get_version(void) { return VERSION; } -#if defined(HAVE_LIBGCRYPT) && defined(_WIN32) +#if defined(_WIN32) // Libgcrypt prints all log messages to stderr by default. This is noisier // than we would like on Windows. In particular slow_gatherer tends to print // "NOTE: you should run 'diskperf -y' to enable the disk statistics" @@ -119,7 +119,7 @@ quiet_gcrypt_logger (void *dummy _U_, int level, const char *format, va_list arg } g_logv(NULL, log_level, format, args); } -#endif // HAVE_LIBGCRYPT && _WIN32 +#endif // _WIN32 /* * Register all the plugin types that are part of libwireshark, namely @@ -155,15 +155,14 @@ epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_da addr_resolv_init(); except_init(); -#ifdef HAVE_LIBGCRYPT /* initialize libgcrypt (beware, it won't be thread-safe) */ + gcry_check_version(NULL); -#if defined(HAVE_LIBGCRYPT) && defined(_WIN32) +#if defined(_WIN32) gcry_set_log_handler (quiet_gcrypt_logger, NULL); #endif gcry_control (GCRYCTL_DISABLE_SECMEM, 0); gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); -#endif #ifdef HAVE_LIBGNUTLS gnutls_global_init(); #endif @@ -596,11 +595,7 @@ epan_get_compiled_version_info(GString *str) /* Gcrypt */ g_string_append(str, ", "); -#ifdef HAVE_LIBGCRYPT g_string_append(str, "with Gcrypt " GCRYPT_VERSION); -#else - g_string_append(str, "without Gcrypt"); -#endif /* HAVE_LIBGCRYPT */ /* Kerberos */ /* XXX - I don't see how to get the version number, at least for KfW */ @@ -654,11 +649,7 @@ epan_get_compiled_version_info(GString *str) * Get runtime information for libraries used by libwireshark. */ void -epan_get_runtime_version_info(GString *str -#if !defined(HAVE_LIBGNUTLS) && !defined(HAVE_LIBGCRYPT) -_U_ -#endif -) +epan_get_runtime_version_info(GString *str) { /* GnuTLS */ #ifdef HAVE_LIBGNUTLS @@ -666,9 +657,7 @@ _U_ #endif /* HAVE_LIBGNUTLS */ /* Gcrypt */ -#ifdef HAVE_LIBGCRYPT g_string_append_printf(str, ", with Gcrypt %s", gcry_check_version(NULL)); -#endif /* HAVE_LIBGCRYPT */ } /* |