Upgrade to KFW 3.2.2.

svn path=/trunk/; revision=28684

Makefile.nmake

@@ -779,7 +779,7 @@ process_libs:
 !ENDIF
 !IFDEF KFW_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		. kfw-2.6.5-ws1.zip
+		. kfw-3.2.2-ws1.zip
 !ENDIF
 !IFDEF PCAP_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -898,7 +898,7 @@ clean_setup:
     rm -r -f $(WIRESHARK_LIBS)/gtk+
     rm -r -f $(WIRESHARK_LIBS)/gtk-wimp
     rm -r -f $(WIRESHARK_LIBS)/kfw-2.5
-    rm -r -f $(WIRESHARK_LIBS)/kfw-2.6.5-ws1
+    rm -r -f $(WIRESHARK_LIBS)/kfw-3.2.2-ws1
     rm -r -f $(WIRESHARK_LIBS)/libiconv-1.9.1.bin.woe32
     rm -r -f $(WIRESHARK_LIBS)/lua5.1
     rm -r -f $(WIRESHARK_LIBS)/lua5.1.4
@@ -1083,6 +1083,7 @@ install-all: install-generated-files
 !IFDEF KFW_DIR
 	xcopy $(KFW_DIR)\bin\comerr32.dll $(INSTALL_DIR) /d
 	xcopy $(KFW_DIR)\bin\krb5_32.dll $(INSTALL_DIR) /d
+	xcopy $(KFW_DIR)\bin\k5sprt32.dll $(INSTALL_DIR) /d
 !ENDIF
 !IFDEF GNUTLS_DIR
 	xcopy $(GNUTLS_DIR)\bin\libgcrypt-11.dll $(INSTALL_DIR) /d

config.nmake

@@ -263,7 +263,7 @@ GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.4-1
 # If you don't have KFW, comment this line out, so that KFW_DIR
 # isn't defined.
 #
-KFW_DIR=$(WIRESHARK_LIBS)\kfw-2.6.5-ws1
+KFW_DIR=$(WIRESHARK_LIBS)\kfw-3.2.2-ws1
 
 #
 # Optional: the Nettle library enables ??? decryption.
@@ -489,7 +489,7 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
 # If you don't have KFW, comment this line out, so that KFW_DIR
 # isn't defined.
 #
-#KFW_DIR=$(WIRESHARK_LIBS)\kfw-2.6.5-ws1
+#KFW_DIR=$(WIRESHARK_LIBS)\kfw-3.2.2-ws1
 
 #
 # Optional: the Nettle library enables ??? decryption.

packaging/nsis/wireshark.nsi

@@ -388,6 +388,7 @@ File "${PCRE_DIR}\man\cat3\pcrepattern.3.txt"
 !ifdef KFW_DIR
 File "${KFW_DIR}\bin\comerr32.dll"
 File "${KFW_DIR}\bin\krb5_32.dll"
+File "${KFW_DIR}\bin\k5sprt32.dll"
 !endif
 !ifdef GNUTLS_DIR
 File "${GNUTLS_DIR}\bin\libgcrypt-11.dll"