osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Jörg Mayer 2006-02-07 10:26:20 +00:00
parent c24e4dd597
commit 83068a9b9d
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.h.win32
View File

@ -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

4
config.nmake
View File

@ -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=

3
epan/dissectors/packet-ssl-utils.h
View File

@ -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>

6
epan/dissectors/packet-ssl.c
View File

@ -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++;

2
gtk/Makefile.nmake
View File

@ -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 \