HTTPS In More Places, update some URLs.

Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8
Reviewed-on: https://code.wireshark.org/review/34096
Reviewed-by: Guy Harris <guy@alum.mit.edu>

6 files changed, 16 insertions, 16 deletions

diff --git a/packaging/nsis/GetWindowsVersion.nsh b/packaging/nsis/GetWindowsVersion.nsh
index a0106ed015..d0201298f7 100644
--- a/packaging/nsis/GetWindowsVersion.nsh
+++ b/packaging/nsis/GetWindowsVersion.nsh
@@ -1,6 +1,6 @@
 ; GetWindowsVersion 4.1.1 (2015-06-22) - alternate script with server versions
 ;
-; http://nsis.sourceforge.net/Get_Windows_version
+; https://nsis.sourceforge.io/Get_Windows_version
 ;
 ; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/
 ; Update by Joost Verburg
diff --git a/packaging/nsis/USBPcapPage.ini b/packaging/nsis/USBPcapPage.ini
index 64d62df392..c934da8c3a 100644
--- a/packaging/nsis/USBPcapPage.ini
+++ b/packaging/nsis/USBPcapPage.ini
@@ -74,4 +74,4 @@ Right=290
 Top=127
 Bottom=135
 Text=Learn more about USBPcap
-State=http://desowin.org/usbpcap/
+State=https://desowin.org/usbpcap/
diff --git a/packaging/nsis/common.nsh b/packaging/nsis/common.nsh
index 95d6a2d79e..9952754355 100644
--- a/packaging/nsis/common.nsh
+++ b/packaging/nsis/common.nsh
@@ -71,7 +71,7 @@ UpdateIcons.quit_${UPDATEICONS_UNIQUE}:
     Pop $R0
 
 ; Force the icon cache to refresh
-; http://superuser.com/questions/499078/refresh-icon-cache-without-rebooting
+; https://superuser.com/questions/499078/refresh-icon-cache-without-rebooting
 IfFileExists "$SYSDIR\ie4uinit.exe" 0 +2
 Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache'
 
@@ -122,7 +122,7 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache'
 
 !macro IsWiresharkRunning
 ; See if Wireshark is running
-; http://nsis.sourceforge.net/Check_whether_your_application_is_running
+; https://nsis.sourceforge.io/Check_whether_your_application_is_running
 ${Do}
 
     System::Call 'kernel32::OpenMutex(i 0x100000, b 0, t "Global\${PROGRAM_NAME}-is-running-{9CA78EEA-EA4D-4490-9240-FC01FCEF464B}") i .R0'
diff --git a/packaging/nsis/servicelib.nsh b/packaging/nsis/servicelib.nsh
index 2e68a572ca..55f5116aa0 100644
--- a/packaging/nsis/servicelib.nsh
+++ b/packaging/nsis/servicelib.nsh
@@ -1,4 +1,4 @@
-; from http://nsis.sourceforge.net/wiki/NSIS_Service_Lib
+; from https://nsis.sourceforge.io/mediawiki/index.php?title=NSIS_Service_Lib&oldid=4726
 ; un. functions disabled to prevent a NSIS warning
 ;
 ; NSIS SERVICE LIBRARY - servicelib.nsh
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi
index d7770d404e..69e5c9ec71 100644
--- a/packaging/nsis/uninstall.nsi
+++ b/packaging/nsis/uninstall.nsi
@@ -3,7 +3,7 @@
 ;
 
 ; Create an installer that only writes an uninstaller.
-; http://nsis.sourceforge.net/Signing_an_Uninstaller
+; https://nsis.sourceforge.io/Signing_an_Uninstaller
 
 !include "common.nsh"
 !include 'LogicLib.nsh'
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 8280483afe..474a1ef918 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -17,7 +17,7 @@ SetCompressorDictSize 64 ; MB
 
 ${StrRep}
 
-; See http://nsis.sourceforge.net/Check_if_a_file_exists_at_compile_time for documentation
+; See https://nsis.sourceforge.io/Check_if_a_file_exists_at_compile_time for documentation
 !macro !defineifexist _VAR_NAME _FILE_NAME
   !tempfile _TEMPFILE
   !ifdef NSIS_WIN32_MAKENSIS
@@ -105,7 +105,7 @@ Page custom DisplayUSBPcapPage
   ;Things that need to be extracted on first (keep these lines before any File command!)
   ;Only useful for BZIP2 compression
 
-  ; Old Modern 1 UI: http://nsis.sourceforge.net/Docs/Modern%20UI/Readme.html
+  ; Old Modern 1 UI: https://nsis.sourceforge.io/Docs/Modern%20UI/Readme.html
   ; To do: Upgrade to the Modern 2 UI:
   ;ReserveFile "AdditionalTasksPage.ini"
   ReserveFile "NpcapPage.ini"
@@ -113,8 +113,8 @@ Page custom DisplayUSBPcapPage
   ReserveFile /plugin InstallOptions.dll
 
   ; Modern UI 2 / nsDialog pages.
-  ; http://nsis.sourceforge.net/Docs/Modern%20UI%202/Readme.html
-  ; http://nsis.sourceforge.net/Docs/nsDialogs/Readme.html
+  ; https://nsis.sourceforge.io/Docs/Modern%20UI%202/Readme.html
+  ; https://nsis.sourceforge.io/Docs/nsDialogs/Readme.html
   !ifdef QT_DIR
   !include "AdditionalTasksPage.nsdinc"
   !endif
@@ -195,7 +195,7 @@ ShowInstDetails show
 ; ============================================================================
 
 Var EXTENSION
-; https://msdn.microsoft.com/en-us/library/windows/desktop/cc144148.aspx
+; https://docs.microsoft.com/en-us/windows/win32/shell/fa-file-types
 Function Associate
   Push $R0
   !insertmacro PushFileExtensions
@@ -317,7 +317,7 @@ lbl_winversion_supported:
   StrCpy $QUICK_LAUNCH_STATE ${BST_CHECKED}
   StrCpy $FILE_ASSOCIATE_STATE ${BST_CHECKED}
 
-  ; Copied from http://nsis.sourceforge.net/Auto-uninstall_old_before_installing_new
+  ; Copied from https://nsis.sourceforge.io/Auto-uninstall_old_before_installing_new
   ReadRegStr $OLD_UNINSTALLER HKLM \
     "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PROGRAM_NAME}" \
     "UninstallString"
@@ -842,9 +842,9 @@ File "${STAGING_DIR}\wimaxasncp\dictionary.dtd"
 SetOutPath $INSTDIR
 
 ; Write the uninstall keys for Windows
-; http://nsis.sourceforge.net/Add_uninstall_information_to_Add/Remove_Programs
-; https://msdn.microsoft.com/en-us/library/ms954376.aspx
-; https://msdn.microsoft.com/en-us/library/windows/desktop/aa372105.aspx
+; https://nsis.sourceforge.io/Add_uninstall_information_to_Add/Remove_Programs
+; https://docs.microsoft.com/en-us/previous-versions/ms954376(v=msdn.10)
+; https://docs.microsoft.com/en-us/windows/win32/msi/uninstall-registry-key
 !define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PROGRAM_NAME}"
 
 WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "Comments" "${DISPLAY_NAME}"
@@ -867,7 +867,7 @@ WriteRegDWORD HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "VersionMinor" ${VERSION_MI
 WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "UninstallString" '"$INSTDIR\${UNINSTALLER_NAME}"'
 WriteRegStr HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "QuietUninstallString" '"$INSTDIR\${UNINSTALLER_NAME}" /S'
 
-; To quote "http://download.microsoft.com/download/0/4/6/046bbd36-0812-4c22-a870-41911c6487a6/WindowsUserExperience.pdf"
+; To quote https://web.archive.org/web/20150911221413/http://download.microsoft.com/download/0/4/6/046bbd36-0812-4c22-a870-41911c6487a6/WindowsUserExperience.pdf:
 ; "Do not include Readme, Help, or Uninstall entries on the Programs menu."
 Delete "$SMPROGRAMS\${PROGRAM_NAME}\Wireshark Web Site.lnk"