config and makefile magic we need when we integrate kerberos for windows with the...

disabled for now

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18838 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.nmake b/Makefile.nmake
index 48d6aa79f6fe29b4446d3802dcfb1935d12c08eb..797f33b9f4ce23f1489be0d61dcd7a9eb583aaab 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -222,6 +222,7 @@ config.h    : config.h.win32 config.nmake
        sed -e s/@VERSION@/$(VERSION)/ \
            -e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \
            -e "s/@HAVE_PCRE@/$(PCRE_CONFIG)/" \
+           -e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \
            -e "s/@HAVE_NETTLE@/$(NETTLE_CONFIG)/" \
            -e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \
            -e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \

diff --git a/config.h.win32 b/config.h.win32
index f1d86a7d8bdf8aedaac82a0de158bf503747faf7..72a2b2b48e5fb2d2a01f97fd2a50e0f63729762b 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -199,6 +199,12 @@
 /* Define to use the gnutls library */
 @HAVE_GNUTLS@
 
+/* Define to use mit kerberos for decryption of kerberos/sasl/dcerpc */
+@HAVE_KFW@
+#ifdef HAVE_MIT_KERBEROS
+#define HAVE_KERBEROS
+#endif
+
 /* Define to use Lua */
 @HAVE_LUA@
 @HAVE_LUA_5_1@

diff --git a/config.nmake b/config.nmake
index b67a502a119ca738f2c5e5b3629ecd30224a9cc6..f1dd30b0afeb20586cb6af295af5b51640a3c0ac 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -152,6 +152,12 @@ ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05
 #
 PCRE_DIR=$(WIRESHARK_LIBS)\pcre-6.4
 
+# If you have kerberos for windows (mit),
+# set this pathname to the directory where the kfw package has been
+# extracted
+# to enable kerberos/sasl/dcerpc decryption support
+# KFW_DIR=$(WIRESHARK_LIBS)\kfw-2.5
+
 #
 # If you have the Nettle encryption library, set this to the pathname
 # of the directory in which the nettle package has been extracted.
@@ -399,6 +405,18 @@ ADNS_LIBS=
 ADNS_CONFIG=
 !ENDIF
 
+!IFDEF KFW_DIR
+KFW_PATH=$(KFW_DIR)\bin
+KFW_CFLAGS=/I$(KFW_DIR)\inc
+KFW_LIBS=$(KFW_DIR)\lib\krb5_32.lib
+# Nmake uses carets to escape special characters
+KFW_CONFIG=^#define HAVE_MIT_KERBEROS 1
+!else
+KFW_CFLAGS=
+KFW_LIBS=
+KFW_CONFIG=
+!ENDIF
+
 !IFDEF PCRE_DIR
 PCRE_PATH=$(PCRE_DIR)\bin
 PCRE_CFLAGS=/I$(PCRE_DIR)\include

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 3f775587329dc5b4f289f6ddcb00113289bf20df..37005fa2d2e57970a336311bef798325dbcbe83e 100644 (file)
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -21,6 +21,7 @@ libwireshark_LIBS = \
        $(GLIB_LIBS)    \
        $(ADNS_LIBS) \
        $(PCRE_LIBS) \
+       $(KFW_LIBS) \
        $(NETTLE_LIBS) \
        $(ZLIB_LIBS) \
        $(GNUTLS_LIBS) \

diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake
index 57b4c26cc1120c4183566f26aa4c6acf53d4df65..e9c9f278cf27ff84c21cdc72f985bce63283abca 100644 (file)
--- a/epan/dissectors/Makefile.nmake
+++ b/epan/dissectors/Makefile.nmake
@@ -12,6 +12,7 @@ include Makefile.common
 CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) \
        /I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \
        $(PCRE_CFLAGS) $(GNUTLS_CFLAGS) $(NETTLE_CFLAGS) \
+       $(KFW_CFLAGS) \
        /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL