Compile sshdump and ciscodump for Windows

Use libSSH 0.7.2 compiled with MinGW(32|64) and linked with zlib and gcrypt support

Change-Id: I7c17d1ba3dd1890e2f83c119f5ea851834807e43
Reviewed-on: https://code.wireshark.org/review/12117
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

4 files changed, 19 insertions, 17 deletions

diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt
index 3f1ad9416d..dec5cb5dbc 100644
--- a/packaging/nsis/CMakeLists.txt
+++ b/packaging/nsis/CMakeLists.txt
@@ -132,7 +132,7 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.nsh" "${_config_nsh_contents}")
 set(_all_manifest "${CMAKE_CURRENT_BINARY_DIR}/all-manifest.nsh")
 set(_all_manifest_contents "# Files required for all sections. Generated by CMake.\n")
 foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL}
-		${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LUA_DLL} ${SMI_DLL}
+		${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LUA_DLL} ${SMI_DLL} ${LIBSSH_DLL}
 		${WINSPARKLE_DLL} ${ZLIB_DLL}
 	)
 	set(_all_manifest_contents "${_all_manifest_contents}File \"\${STAGING_DIR}\\${_dll}\"\n")
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index d3edf9a413..63a6d1add7 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -22,12 +22,14 @@ DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/libwsutil.dll ../../c
 DOC=../../doc/ws.css				\
 	../../doc/androiddump.html		\
 	../../doc/capinfos.html			\
+	../../doc/ciscodump.html			\
 	../../doc/dumpcap.html			\
 	../../doc/editcap.html			\
 	../../doc/extcap.html			\
 	../../doc/mergecap.html			\
 	../../doc/randpktdump.html		\
 	../../doc/rawshark.html			\
+	../../doc/sshdump.html			\
 	../../doc/text2pcap.html		\
 	../../doc/tshark.html			\
 	../../doc/wireshark-filter.html		\
@@ -37,9 +39,6 @@ DOC=../../doc/ws.css				\
 	$(STAGING_DIR)/README.txt		\
 	$(STAGING_DIR)/README.windows.txt
 
-#WIP: uncomment and add to the above when sshdump on windows will be ready to go
-#../../doc/sshdump.html
-
 GPL=../../COPYING
 HELP=$(STAGING_DIR)/help/capture_filters.txt \
 	$(STAGING_DIR)/help/capturing.txt \
@@ -176,6 +175,9 @@ all-manifest.nsh: Makefile.nmake ..\..\config.nmake
 	@echo # SMI >> $@
 	@echo File "$(STAGING_DIR)\libsmi-2.dll" >> $@
 !ENDIF
+!IFDEF LIBSSH_DIR
+	@echo File "$(STAGING_DIR)\libssh.dll" >> $@
+!ENDIF
 !IFDEF WINSPARKLE_DIR
 	@echo # WinSparkle >> $@
 	@echo File "$(STAGING_DIR)\WinSparkle.dll" >> $@
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi
index 5365f1d637..0d87165130 100755
--- a/packaging/nsis/uninstall.nsi
+++ b/packaging/nsis/uninstall.nsi
@@ -126,8 +126,8 @@ SetShellVarContext all
 
 Push "${EXECUTABLE_MARKER}"
 Push "androiddump"
-;WIP: uncomment when sshdump on windows will be ready to go
-;Push "sshdump"
+Push "ciscodump"
+Push "sshdump"
 Push "dumpcap"
 Push "${PROGRAM_NAME}"
 Push "tshark"
@@ -180,9 +180,9 @@ Delete "$INSTDIR\etc\gtk-2.0\*.*"
 Delete "$INSTDIR\etc\gtk-3.0\*.*"
 Delete "$INSTDIR\etc\pango\*.*"
 Delete "$INSTDIR\extcap\androiddump.*"
-;WIP: uncomment when sshdump on windows will be ready to go
-;Delete "$INSTDIR\extcap\sshdump.*"
 Delete "$INSTDIR\extcap\randpktdump.*"
+Delete "$INSTDIR\extcap\sshdump.*"
+Delete "$INSTDIR\extcap\ciscodump.*"
 Delete "$INSTDIR\help\*.*"
 Delete "$INSTDIR\iconengines\*.*"
 Delete "$INSTDIR\imageformats\*.*"
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index cd001dfe5f..fbce431d70 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -1059,14 +1059,15 @@ SetOutPath $INSTDIR\extcap
 File "${STAGING_DIR}\extcap\androiddump.exe"
 SectionEnd
 
-;WIP: uncomment this section when sshdump on windows will be ready to go
-;Section /o "Sshdump" SecSshdumpinfos
+Section /o "SSHdump" SecSSHdumpinfos
 ;-------------------------------------------
-;SetOutPath $INSTDIR
-;File "${STAGING_DIR}\sshdump.html"
-;SetOutPath $INSTDIR\extcap
-;File "${STAGING_DIR}\extcap\sshdump.exe"
-;SectionEnd
+SetOutPath $INSTDIR
+File "${STAGING_DIR}\sshdump.html"
+File "${STAGING_DIR}\ciscodump.html"
+SetOutPath $INSTDIR\extcap
+File "${STAGING_DIR}\extcap\sshdump.exe"
+File "${STAGING_DIR}\extcap\ciscodump.exe"
+SectionEnd
 
 Section /o "Randpktdump" SecRandpktdumpinfos
 ;-------------------------------------------
@@ -1122,8 +1123,7 @@ SectionEnd
 
   !insertmacro MUI_DESCRIPTION_TEXT ${SecToolsGroup} "Additional command line based tools."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecAndroiddumpinfos} "Provide capture interfaces from Android devices"
-;WIP: uncomment this section when sshdump on windows will be ready to go
-;!insertmacro MUI_DESCRIPTION_TEXT ${SecSshdumpinfos} "Provide remote capture through SSH"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSSHdumpinfos} "Provide remote capture through SSH"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecRandpktdumpinfos} "Provide random packet generator"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecEditCap} "Copy packets to a new file, optionally trimmming packets, omitting them, or saving to a different format."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecText2Pcap} "Read an ASCII hex dump and write the data into a libpcap-style capture file."