Merge branch 'enable-setting-the-preshared-key-in-tunnelconfiguration…

…-ios-527'
mullvad · Mar 18, 2024 · 10aeac9 · 10aeac9
2 parents 113d3af + 23cf15d
commit 10aeac9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git 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
@@ -34,4 +34,5 @@ public struct TunnelAdapterConfiguration {
 public struct TunnelPeer {
     public var endpoint: AnyIPEndpoint
     public var publicKey: PublicKey
+    public var preSharedKey: PreSharedKey?
 }