diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-12-15 10:08:03 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-01-11 14:19:37 +0100 |
| commit | 23a554c36ce1ba92b5d9ca9df2363184b0d7d271 (patch) | |
| tree | 35cf1beec953ae192c87695b7cb6c7c8f8b300fc | |
| parent | 523b1a24249b2f6c8bc84a674025a7ae3ea29bdc (diff) | |
| download | mullvadvpn-23a554c36ce1ba92b5d9ca9df2363184b0d7d271.tar.xz mullvadvpn-23a554c36ce1ba92b5d9ca9df2363184b0d7d271.zip | |
Remove SHA-2 hotfix
| -rw-r--r-- | dist-assets/windows/installer.nsh | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 1f8d8823cd..bf9d0f5428 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -22,11 +22,6 @@ !define MULLVAD_GENERAL_ERROR 0 !define MULLVAD_SUCCESS 1 -# Return codes for KB2921916 check -!define PATCH_ERROR 0 -!define PATCH_PRESENT 1 -!define PATCH_MISSING 2 - # Return codes from driverlogic !define DL_GENERAL_SUCCESS 0 !define DL_GENERAL_ERROR 1 @@ -90,81 +85,6 @@ !define ExtractMullvadSetup '!insertmacro "ExtractMullvadSetup"' # -# InstallWin7Hotfix -# -# Installs KB2921916. Fixes the "untrusted publisher" issue on Windows 7. -# Returns: 0 in $R0 on success. Otherwise, a non-zero value is returned. -# -!macro InstallWin7Hotfix - Push $0 - Push $1 - - log::Log "InstallWin7Hotfix()" - - osinfo::HasWindows7Sha2Fix - Pop $0 - Pop $1 - - ${If} $0 == ${PATCH_PRESENT} - log::Log "KB2921916 is already installed or superseded" - Goto InstallWin7Hotfix_return_success - ${EndIf} - - ${If} $0 == ${PATCH_ERROR} - log::LogWithDetails "Detection of KB2921916 failed" $1 - MessageBox MB_OK "Detection of KB2921916 failed" - Goto InstallWin7Hotfix_return_abort - ${EndIf} - - MessageBox MB_ICONINFORMATION|MB_YESNO "Windows hotfix KB2921916 must be installed for this app to work. Continue?" IDNO InstallWin7Hotfix_return_abort - - log::Log "Extracting KB2921916" - - SetOutPath "$TEMP" - File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\Windows6.1-KB2921916-x64.msu" - - log::Log "Installing KB2921916" - - nsExec::ExecToStack '"$SYSDIR\wusa.exe" "$TEMP\Windows6.1-KB2921916-x64.msu" /quiet /norestart' - Pop $0 - Pop $1 - - ${If} $0 != 0 - ${If} $0 == 3010 - SetRebootFlag true - ${Else} - StrCpy $R0 "Failed to install the hotfix: error $0" - log::Log $R0 - MessageBox MB_OK "Failed to install the hotfix." - Goto InstallWin7Hotfix_return_abort - ${EndIf} - ${EndIf} - - InstallWin7Hotfix_return_success: - - Push 0 - Pop $R0 - - log::Log "InstallWin7Hotfix() completed successfully" - - Goto InstallWin7Hotfix_return - - InstallWin7Hotfix_return_abort: - - Push 1 - Pop $R0 - - log::Log "InstallWin7Hotfix() failed" - - InstallWin7Hotfix_return: - - Pop $1 - Pop $0 - -!macroend -!define InstallWin7Hotfix '!insertmacro "InstallWin7Hotfix"' - -# # ExtractSplitTunnelDriver # # Extract split tunnel driver and associated files into $TEMP\mullvad-split-tunnel @@ -970,13 +890,6 @@ File "${BUILD_RESOURCES_DIR}\..\windows\driverlogic\bin\x64-Release\driverlogic.exe" ${RemoveAbandonedWintunAdapter} - ${If} ${AtMostWin7} - ${InstallWin7Hotfix} - ${If} $R0 != 0 - Goto customInstall_abort_installation - ${EndIf} - ${EndIf} - ${ExtractSplitTunnelDriver} ${InstallSplitTunnelDriver} |