diff options
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rw-r--r-- | config.h.win32 | 6 | ||||
| -rw-r--r-- | config.nmake | 18 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 1 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.nmake | 1 |
5 files changed, 27 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 48d6aa79f6..797f33b9f4 100644 --- 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 f1d86a7d8b..72a2b2b48e 100644 --- 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 b67a502a11..f1dd30b0af 100644 --- 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 3f77558732..37005fa2d2 100644 --- 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 57b4c26cc1..e9c9f278cf 100644 --- 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 |