osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Add GNUTLS to the Windows build. 

In packet-ssl.c, move ssl_set_debug() up a bit so that we can debug key
file parsing.

svn path=/trunk/; revision=18850
This commit is contained in:
Gerald Combs 2006-08-07 19:52:18 +00:00
parent 463d895a53
commit 0213f60e4b
6 changed files with 176 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.nmake
View File

@ -519,6 +519,10 @@ setup: verify_tools
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
. lua5_1_vc6.zip
!ENDIF
!IFDEF GNUTLS_DIR
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
. gnutls-1.5.0.zip
!ENDIF
!IFDEF GTK2_DIR
!IF "$(GTK2_INST_VERSION)" == "2.8"
@$(SH) tools\win32-setup.sh --download "$(WIRESHARK_LIBS)" \
@ -681,6 +685,14 @@ install-required-deps:
xcopy $(KFW_DIR)\bin\comerr32.dll . /d
xcopy $(KFW_DIR)\bin\krb5_32.dll . /d
!ENDIF
!IFDEF GNUTLS_DIR
xcopy $(GNUTLS_DIR)\bin\libgcrypt-11.dll . /d
xcopy $(GNUTLS_DIR)\bin\libgnutls-14.dll . /d
xcopy $(GNUTLS_DIR)\bin\libgnutls-extra-14.dll . /d
xcopy $(GNUTLS_DIR)\bin\libgnutls-openssl-14.dll . /d
xcopy $(GNUTLS_DIR)\bin\libgpg-error-0.dll . /d
xcopy $(GNUTLS_DIR)\bin\libtasn1-3.dll . /d
!ENDIF
clean-deps:
rm -f *.dll

6
config.nmake
View File

@ -82,7 +82,7 @@ GTK2_DIR=$(WIRESHARK_LIBS)\gtk2
# If you have gnutls set this to the pathname where the lib and include files
# are stored.
# This enable ssl decryption
#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-win32-msvc\gnutls
GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.5.0
# Declare the version of your gtk2 and pango. (MAJOR + MINOR Version number
# but without MICRO version number)
@ -448,8 +448,8 @@ LIBWIRESHARK_CONFIG=
!IFDEF GNUTLS_DIR
GNUTLS_PATH=$(GNUTLS_DIR)
GNUTLS_CFLAGS=/I$(GNUTLS_DIR)
GNUTLS_LIBS=$(GNUTLS_DIR)\gnutls.lib user32.lib
GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include
GNUTLS_LIBS=$(GNUTLS_DIR)\bin\libgnutls-14.lib $(GNUTLS_DIR)\bin\libgcrypt-11.lib
# Nmake uses carets to escape special characters
GNUTLS_CONFIG=^#define HAVE_LIBGNUTLS 1
!else

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

@ -241,6 +241,8 @@ ssl_init(void)
static void
ssl_parse(void)
{
ssl_set_debug(ssl_debug_file_name);
if (ssl_key_hash)
{
g_hash_table_foreach(ssl_key_hash, ssl_private_key_free, NULL);
@ -261,8 +263,6 @@ ssl_parse(void)
ssl_parse_key_list(ssl_keys_list,ssl_key_hash,ssl_associations,ssl_handle,TRUE);
}
ssl_set_debug(ssl_debug_file_name);
/* [re] add ssl dissection to defaults ports */
ssl_association_add(ssl_associations, ssl_handle, 443, "http", TRUE);
ssl_association_add(ssl_associations, ssl_handle, 636, "ldap", TRUE);

3
packaging/nsis/Makefile.nmake
View File

@ -145,6 +145,9 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake
!IF "$(KFW_DIR)" != ""
/DKFW_DIR=$(KFW_DIR) \
!ENDIF
!IF "$(GNUTLS_DIR)" != ""
/DGNUTLS_DIR=$(GNUTLS_DIR) \
!ENDIF
!IF "$(PCRE_DIR)" != ""
/DPCRE_DIR=$(PCRE_DIR) \
!ENDIF

8
packaging/nsis/wireshark.nsi
View File

@ -326,6 +326,14 @@ File "${PCRE_DIR}\man\cat3\pcrepattern.3.txt"
File "${KFW_DIR}\bin\comerr32.dll"
File "${KFW_DIR}\bin\krb5_32.dll"
!endif
!ifdef GNUTLS_DIR
File "${GNUTLS_DIR}\bin\libgcrypt-11.dll"
File "${GNUTLS_DIR}\bin\libgnutls-14.dll"
File "${GNUTLS_DIR}\bin\libgnutls-extra-14.dll"
File "${GNUTLS_DIR}\bin\libgnutls-openssl-14.dll"
File "${GNUTLS_DIR}\bin\libgpg-error-0.dll"
File "${GNUTLS_DIR}\bin\libtasn1-3.dll"
!endif
File "..\..\FAQ"
File "..\..\README"
File "..\..\README.win32"

2
tools/win32-setup.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2006-08-07/packages"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2006-08-08/packages"
err_exit () {
echo ""