diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-01-21 15:06:07 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-01-31 16:24:48 +0100 |
| commit | ddf28d3a7599ebeed20a4b425630aa4a8bf7e9b4 (patch) | |
| tree | 4b5ed546d2d685ebf20dfe674a45a6813ca8b5c6 | |
| parent | 459d73b0dec7067387e6fffc55a3c0242ec1a6b2 (diff) | |
| download | mullvadvpn-ddf28d3a7599ebeed20a4b425630aa4a8bf7e9b4.tar.xz mullvadvpn-ddf28d3a7599ebeed20a4b425630aa4a8bf7e9b4.zip | |
Properly migrate to branded TAP driver, and simplify installer logic
| -rw-r--r-- | dist-assets/windows/installer.nsh | 50 |
1 files changed, 6 insertions, 44 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 9cfbf30aa5..4c04ebb74e 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -24,12 +24,6 @@ !define MULLVAD_GENERAL_ERROR 0 !define MULLVAD_SUCCESS 1 -# Return codes from driverlogic::EstablishBaseline -!define EB_GENERAL_ERROR 0 -!define EB_NO_TAP_ADAPTERS_PRESENT 1 -!define EB_SOME_TAP_ADAPTERS_PRESENT 2 -!define EB_MULLVAD_ADAPTER_PRESENT 3 - # Return codes from driverlogic::RemoveMullvadTap !define RMT_GENERAL_ERROR 0 !define RMT_NO_REMAINING_ADAPTERS 1 @@ -231,7 +225,6 @@ # !macro InstallDriver - Var /GLOBAL InstallDriver_BaselineStatus Var /GLOBAL InstallDriver_TapName log::Log "InstallDriver()" @@ -256,27 +249,9 @@ ${RemoveOldIdTap} # - # Reinstall the TAP driver if it is already installed. Updating may cause issues. + # Silently approve the certificate before installing the driver # - log::Log "Calling on plugin to enumerate network adapters" - driverlogic::EstablishBaseline - - Pop $0 - Pop $1 - - Push $0 - Pop $InstallDriver_BaselineStatus - - ${If} $0 == ${EB_GENERAL_ERROR} - StrCpy $R0 "Failed to enumerate network adapters: $1" - log::Log $R0 - Goto InstallDriver_return - ${EndIf} - ${IfNot} ${AtLeastWin10} - # - # Silently approve the certificate before installing the driver - # log::Log "Adding OpenVPN certificate to the certificate store" nsExec::ExecToStack '"$SYSDIR\certutil.exe" -f -addstore TrustedPublisher "$TEMP\driver\driver.cer"' @@ -289,18 +264,7 @@ ${EndIf} ${EndIf} - IntCmp $InstallDriver_BaselineStatus ${EB_NO_TAP_ADAPTERS_PRESENT} InstallDriver_install_driver - - log::Log "Removing existing TAP driver" - ${RemoveTap} - - InstallDriver_install_driver: - - # - # Install driver and create a virtual adapter. - # If the driver is already installed, this just creates another virtual adapter. - # - log::Log "Creating new virtual adapter (this also installs the TAP driver, as necessary)" + log::Log "Creating new virtual adapter" nsExec::ExecToStack '"$TEMP\driver\tapinstall.exe" install "$TEMP\driver\OemVista.inf" ${TAP_HARDWARE_ID}' Pop $0 @@ -346,8 +310,6 @@ ${EndIf} ${EndIf} - InstallDriver_return_success: - log::Log "InstallDriver() completed successfully" Push 0 @@ -885,16 +847,16 @@ ${RemoveCLIFromEnvironPath} + # Remove the TAP adapter + ${ExtractDriver} + ${RemoveTap} + # If not ran silently ${If} $FullUninstall == 1 # Remove Wintun ${ExtractWintun} ${RemoveWintun} - # Remove the TAP adapter - ${ExtractDriver} - ${RemoveTap} - ${RemoveLogsAndCache} MessageBox MB_ICONQUESTION|MB_YESNO "Would you like to remove settings files as well?" IDNO customRemoveFiles_after_remove_settings ${RemoveSettings} |