diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-11-17 14:41:36 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-12-07 14:39:53 +0100 |
| commit | 5e908d041f8a1c1b59f3544b89e63a50f2ba6521 (patch) | |
| tree | 57ff25e516b312a11fa69406b75c8d51da6ae5c9 | |
| parent | ea2ade1e2a7981d2e72f8149c9033982e4d53fcc (diff) | |
| download | mullvadvpn-5e908d041f8a1c1b59f3544b89e63a50f2ba6521.tar.xz mullvadvpn-5e908d041f8a1c1b59f3544b89e63a50f2ba6521.zip | |
Update wireguard dll path
| -rw-r--r-- | dist-assets/windows/installer.nsh | 2 | ||||
| -rw-r--r-- | gui/tasks/distribution.js | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/wireguard_nt.rs | 5 | ||||
| -rw-r--r-- | windows/driverlogic/src/wireguard.h | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 8ce3b5ac91..1f8d8823cd 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -67,7 +67,7 @@ SetOutPath "$TEMP" File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\wintun\wintun.dll" - File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\wireguard-nt\wireguard.dll" + File "${BUILD_RESOURCES_DIR}\binaries\x86_64-pc-windows-msvc\wireguard-nt\mullvad-wireguard.dll" File "${BUILD_RESOURCES_DIR}\..\windows\driverlogic\bin\x64-Release\driverlogic.exe" !macroend diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index 6f74d65eda..f677cc799b 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -114,7 +114,7 @@ const config = { { from: distAssets('binaries/x86_64-pc-windows-msvc/sslocal.exe'), to: '.' }, { from: root('build/lib/x86_64-pc-windows-msvc/libwg.dll'), to: '.' }, { from: distAssets('binaries/x86_64-pc-windows-msvc/wintun/wintun.dll'), to: '.' }, - { from: distAssets('binaries/x86_64-pc-windows-msvc/wireguard-nt/wireguard.dll'), to: '.' }, + { from: distAssets('binaries/x86_64-pc-windows-msvc/wireguard-nt/mullvad-wireguard.dll'), to: '.' }, ], }, diff --git a/talpid-core/src/tunnel/wireguard/wireguard_nt.rs b/talpid-core/src/tunnel/wireguard/wireguard_nt.rs index 3752fe8dba..dde1a991fd 100644 --- a/talpid-core/src/tunnel/wireguard/wireguard_nt.rs +++ b/talpid-core/src/tunnel/wireguard/wireguard_nt.rs @@ -112,7 +112,7 @@ pub type Result<T> = std::result::Result<T, Error>; #[error(no_from)] pub enum Error { /// Failed to load WireGuardNT - #[error(display = "Failed to load wireguard.dll")] + #[error(display = "Failed to load mullvad-wireguard.dll")] DllError(#[error(source)] io::Error), /// Failed to create tunnel interface @@ -603,7 +603,8 @@ unsafe impl Sync for WgNtDll {} impl WgNtDll { pub fn new(resource_dir: &Path) -> io::Result<Self> { - let wg_nt_dll = U16CString::from_os_str_truncate(resource_dir.join("wireguard.dll")); + let wg_nt_dll = + U16CString::from_os_str_truncate(resource_dir.join("mullvad-wireguard.dll")); let handle = unsafe { LoadLibraryExW( diff --git a/windows/driverlogic/src/wireguard.h b/windows/driverlogic/src/wireguard.h index ae3f7ee3d1..e99da56c05 100644 --- a/windows/driverlogic/src/wireguard.h +++ b/windows/driverlogic/src/wireguard.h @@ -10,7 +10,7 @@ public: WireGuardNtDll() : dllHandle(nullptr) { - auto path = GetProcessModulePath().replace_filename(L"wireguard.dll"); + auto path = GetProcessModulePath().replace_filename(L"mullvad-wireguard.dll"); dllHandle = LoadLibraryExW(path.c_str(), nullptr, LOAD_WITH_ALTERED_SEARCH_PATH); if (nullptr == dllHandle) |