diff options
| author | David Lönnhager <david.l@mullvad.net> | 2019-11-05 18:08:32 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2019-11-19 15:46:01 +0100 |
| commit | f86f97f4a871dfd6f14958b9e8c1c0ce09c3bf3a (patch) | |
| tree | 00a4820b1e42dc66e38a0230c4489857e8b2098b | |
| parent | 352b5e86f7c2cf9f827be60a79939214e7edbda8 (diff) | |
| download | mullvadvpn-f86f97f4a871dfd6f14958b9e8c1c0ce09c3bf3a.tar.xz mullvadvpn-f86f97f4a871dfd6f14958b9e8c1c0ce09c3bf3a.zip | |
Update TAP driver
| -rw-r--r-- | dist-assets/windows/installer.nsh | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 56cb1269ba..7842da28c5 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -87,12 +87,15 @@ !macro ExtractDriver SetOutPath "$TEMP\driver" - File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\driver\*" - ${If} ${IsWin7} - File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\driver\ndis5\*" - ${Else} + ${If} ${AtLeastWin10} File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\driver\ndis6\*" + File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\driver\ndis6\win10\*" + ${ElseIf} ${AtLeastWin8} + File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\driver\ndis6\*" + File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\driver\ndis6\win8\*" + ${Else} + File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\driver\ndis5\*" ${EndIf} !macroend @@ -294,19 +297,20 @@ InstallDriver_install_driver: - # - # 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"' + ${IfNot} ${AtLeastWin10} + # + # Silently approve the certificate before installing the driver + # + log::Log "Adding OpenVPN certificate to the certificate store" - Pop $0 - Pop $1 + nsExec::ExecToStack '"$SYSDIR\certutil.exe" -f -addstore TrustedPublisher "$TEMP\driver\driver.cer"' + Pop $0 + Pop $1 - ${If} $0 != 0 - StrCpy $R0 "Failed to add trusted publisher certificate: error $0" - log::LogWithDetails $R0 $1 + ${If} $0 != 0 + StrCpy $R0 "Failed to add trusted publisher certificate: error $0" + log::LogWithDetails $R0 $1 + ${EndIf} ${EndIf} # |