Add support for decoding DES3/CBC/MD5 keys. Make it disabled by default.

Whitespace cleanup.

svn path=/trunk/; revision=12304

Makefile.nmake

@@ -206,6 +206,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_NETTLE@/$(NETTLE_CONFIG)/" \
 	    -e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \
 	    -e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \
 	    -e "s/@HAVE_PCAP_FINDALLDEVS@/$(PCAP_FINDALLDEVS_CONFIG)/" \

config.h.win32

@@ -179,6 +179,12 @@
 /* Define to use the PCRE library */
 @HAVE_PCRE@
 
+/* Define to use the Nettle library */
+@HAVE_NETTLE@
+#ifdef HAVE_LIBNETTLE
+#define HAVE_KERBEROS 1
+#endif
+
 #ifndef WIN32
 #define WIN32			1
 #endif

config.nmake

@@ -122,6 +122,15 @@ ADNS_DIR=$(ETHEREAL_LIBS)\adns-1.0-win32-03
 #
 PCRE_DIR=$(ETHEREAL_LIBS)\pcre-4.4
 
+#
+# If you have the Nettle encryption library, set this to the pathname
+# of the directory in which the nettle package has been extracted.
+#
+# If you don't have Nettle, comment this line out, so that NETTLE_DIR
+# isn't defined.
+#
+# NETTLE_DIR=$(ETHEREAL_LIBS)\nettle-1.10
+
 #
 # Set ICONV_DIR to the pathname of the directory in which the
 # ICONV include files and library resides.
@@ -319,6 +328,17 @@ PCRE_LIBS=
 PCRE_CONFIG=
 !ENDIF
 
+!IFDEF NETTLE_DIR
+NETTLE_CFLAGS=/I$(NETTLE_DIR)
+NETTLE_LIBS=$(NETTLE_DIR)\libnettle.lib
+# Nmake uses carets to escape special characters
+NETTLE_CONFIG=^#define HAVE_LIBNETTLE 1
+!else
+NETTLE_CFLAGS=
+NETTLE_LIBS=
+NETTLE_CONFIG=
+!ENDIF
+
 !IFDEF ENABLE_LIBETHEREAL
 LIBETHEREAL_CONFIG=^#define HAVE_LIBETHEREALDLL 1
 !ELSE

epan/Makefile.nmake

@@ -21,6 +21,7 @@ libethereal_LIBS = \
 	$(GLIB_LIBS)	\
 	$(ADNS_LIBS) \
 	$(PCRE_LIBS) \
+	$(NETTLE_LIBS) \
 	$(ZLIB_LIBS) \
 	$(NET_SNMP_DIR)\win32\lib\netsnmp.lib \
 	ftypes\ftypes.lib \

epan/dissectors/Makefile.nmake

@@ -11,7 +11,8 @@ include Makefile.common
 
 CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) \
 	/I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \
-	$(PCRE_CFLAGS) /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+	$(PCRE_CFLAGS) $(NETTLE_CFLAGS) \
+	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL