From Richard Brodie via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5800 :

Fix compilation if we HAVE_LIBGNUTLS but we do not HAVE_LIBGCRYPT.  (The
former can be built using libnettle instead of the latter.)

svn path=/trunk/; revision=37102

diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 4489ba6db67750eb7d5b5af509b9fda401963ff8..fd936daa2503640dbfe155685587c07efca920af 100644 (file)
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -946,7 +946,7 @@ ssl_data_set(StringInfo* str, const guchar* data, guint len)
     str->data_len = len;
 }
 
-#ifdef HAVE_LIBGNUTLS
+#if defined(HAVE_LIBGNUTLS) && defined(HAVE_LIBGCRYPT)
 
 static gint ver_major, ver_minor, ver_patch;
 
@@ -2747,7 +2747,7 @@ ssl_lib_init(void)
     sscanf(str, "%d.%d.%d", &ver_major, &ver_minor, &ver_patch);
 }
 
-#else /* HAVE_LIBGNUTLS */
+#else /* defined(HAVE_LIBGNUTLS) && defined(HAVE_LIBGCRYPT) */
 /* no libgnutl: dummy operation to keep interface consistent*/
 void
 ssl_lib_init(void)