diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2024-03-18 15:04:18 +0100 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2024-03-18 15:04:18 +0100 |
| commit | 10aeac95d21dc37de586d711d28312b55e4dde85 (patch) | |
| tree | 3404871c2e4f13e4cdd524dd86e64f1d1bea6a9e | |
| parent | 113d3afd505130b8e46e44c0cd00cd9ddb8b520d (diff) | |
| parent | 23cf15d030908801f7f3e1fa9726793490da05cc (diff) | |
| download | mullvadvpn-10aeac95d21dc37de586d711d28312b55e4dde85.tar.xz mullvadvpn-10aeac95d21dc37de586d711d28312b55e4dde85.zip | |
Merge branch 'enable-setting-the-preshared-key-in-tunnelconfiguration-ios-527'
| -rw-r--r-- | ios/PacketTunnel/WireGuardAdapter/WgAdapter.swift | 1 | ||||
| -rw-r--r-- | ios/PacketTunnelCore/Actor/Protocols/TunnelAdapterProtocol.swift | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ios/PacketTunnel/WireGuardAdapter/WgAdapter.swift b/ios/PacketTunnel/WireGuardAdapter/WgAdapter.swift index 7ad9b6be9a..3392e585ee 100644 --- a/ios/PacketTunnel/WireGuardAdapter/WgAdapter.swift +++ b/ios/PacketTunnel/WireGuardAdapter/WgAdapter.swift @@ -113,6 +113,7 @@ private extension TunnelAdapterConfiguration { var peerConfig = PeerConfiguration(publicKey: peer.publicKey) peerConfig.endpoint = peer.endpoint.wgEndpoint peerConfig.allowedIPs = allowedIPs + peerConfig.preSharedKey = peer.preSharedKey peers.append(peerConfig) } diff --git a/ios/PacketTunnelCore/Actor/Protocols/TunnelAdapterProtocol.swift b/ios/PacketTunnelCore/Actor/Protocols/TunnelAdapterProtocol.swift index 0bbbbbf8a5..ea798075d2 100644 --- a/ios/PacketTunnelCore/Actor/Protocols/TunnelAdapterProtocol.swift +++ b/ios/PacketTunnelCore/Actor/Protocols/TunnelAdapterProtocol.swift @@ -34,4 +34,5 @@ public struct TunnelAdapterConfiguration { public struct TunnelPeer { public var endpoint: AnyIPEndpoint public var publicKey: PublicKey + public var preSharedKey: PreSharedKey? } |