diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2006-02-07 10:26:20 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2006-02-07 10:26:20 +0000 |
| commit | 83068a9b9d80617a3c478a512eaed169140a1734 (patch) | |
| tree | 7f32c1c588df22a5e2cf4519f49b504be95c4b80 | |
| parent | c24e4dd59752042d0b751b4b188d3e829e067453 (diff) | |
Paolo Abeni:
>There is still an issue into the HAVE_LIBGNUTLS macro definition. I'm
>fixing it and cleaning a bit the windows side configuration. I hope to
>post soon the fix.
The attached patch should fix the issue. I missed to modify the
config.win32 file and I misstyped a few macros name.
svn path=/trunk/; revision=17200
| -rw-r--r-- | config.h.win32 | 3 | ||||
| -rw-r--r-- | config.nmake | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssl.c | 6 | ||||
| -rw-r--r-- | gtk/Makefile.nmake | 2 |
5 files changed, 13 insertions, 5 deletions
diff --git a/config.h.win32 b/config.h.win32 index 9bda22e3bf..173466bc70 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -193,6 +193,9 @@ /* Define to use the Nettle library */ @HAVE_NETTLE@ +/* Define to use the gnutls library*/ +@HAVE_GNUTLS@ + #ifndef WIN32 #define WIN32 1 #endif diff --git a/config.nmake b/config.nmake index 2ba6f91d74..018ee4c75e 100644 --- a/config.nmake +++ b/config.nmake @@ -419,9 +419,9 @@ LIBETHEREAL_CONFIG= !IFDEF GNUTLS_DIR GNUTLS_PATH=$(GNUTLS_DIR) GNUTLS_CFLAGS=/I$(GNUTLS_DIR) -GNUTLS_LIBS=$(GNUTLS_DIR)\gnutls.lib +GNUTLS_LIBS=$(GNUTLS_DIR)\gnutls.lib user32.lib # Nmake uses carets to escape special characters -GNUTLS_CONFIG=^#define HAVE_GNUTLS 1 +GNUTLS_CONFIG=^#define HAVE_LIBGNUTLS 1 !else GNUTLS_CFLAGS= GNUTLS_LIBS= diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 9b6cb3c9ee..393fd6cc4f 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -27,9 +27,8 @@ #include <epan/gnuc_format_check.h> #ifdef HAVE_LIBGNUTLS - #ifdef _WIN32 -#include <gcrypt_conf.h> +#include <winposixtype.h> #endif #include <stdio.h> diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index ba5c040057..f3c10cdabb 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -403,13 +403,19 @@ static void ssl_parse(void) ssl_debug_printf("ssl_init found host entry %s\n", addr); port = strchr(addr, ':'); if (!port) + { + ssl_debug_printf("ssl_init entry malformed can't find port in %s\n", addr); break; + } *port = 0; port++; filename = strchr(port,':'); if (!filename) + { + ssl_debug_printf("ssl_init entry malformed can't find filename in %s\n", port); break; + } *filename=0; filename++; diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake index 8b2d49795e..f7039d6ddf 100644 --- a/gtk/Makefile.nmake +++ b/gtk/Makefile.nmake @@ -7,7 +7,7 @@ include ..\config.nmake ############### no need to modify below this line ######### -CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) \ +CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \ /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ /I$(PCAP_DIR)\include /I$(NET_SNMP_DIR)\include \ |