rebase from main

Author: buggmagnet

ios/MullvadVPN/View controllers/Preferences/PreferencesDataSource.swift

@@ -166,12 +166,6 @@ final class PreferencesDataSource: UITableViewDiffableDataSource<
         }
         #endif
 
-        let quantumResistanceItem: Item = switch viewModel.quantumResistance {
-        case .automatic: .quantumResistanceAutomatic
-        case .off: .quantumResistanceOff
-        case .on: .quantumResistanceOn
-        }
-
         let obfuscationPortItem: Item = .wireGuardObfuscationPort(viewModel.obfuscationPort.portValue)
 
         #if DEBUG

ios/PacketTunnel/WireGuardAdapter/WgAdapter.swift

@@ -47,7 +47,7 @@ struct WgAdapter: TunnelAdapterProtocol {
     }
 
     func startPostQuantumKeyExchange(configuration: TunnelAdapterConfiguration) async throws {
-        let wgConfig = configuration.asWgPQConfig
+        let wgConfig = configuration.asWgConfig
         do {
             try await adapter.update(tunnelConfiguration: wgConfig)
         } catch WireGuardAdapterError.invalidState {
@@ -138,31 +138,6 @@ private extension TunnelAdapterConfiguration {
             peers: peers
         )
     }
-
-    var asWgPQConfig: TunnelConfiguration {
-        var interfaceConfig = InterfaceConfiguration(privateKey: privateKey)
-        interfaceConfig.addresses = interfaceAddresses
-        interfaceConfig.dns = dns.map { DNSServer(address: $0) }
-        interfaceConfig.listenPort = 0
-
-        var peers: [PeerConfiguration] = []
-        if let peer {
-            var peerConfig = PeerConfiguration(publicKey: peer.publicKey)
-            peerConfig.endpoint = peer.endpoint.wgEndpoint
-            // TODO: change this to 10.64.0.1/32
-            // TODO: What about the IPv6 address here ?
-            peerConfig.allowedIPs = [
-                IPAddressRange(from: "10.64.0.1/32")!,
-            ]
-            peers.append(peerConfig)
-        }
-
-        return TunnelConfiguration(
-            name: nil,
-            interface: interfaceConfig,
-            peers: peers
-        )
-    }
 }
 
 private extension AnyIPEndpoint {

ios/PacketTunnelCore/Actor/PacketTunnelActor.swift

@@ -160,7 +160,9 @@ extension PacketTunnelActor {
                 // Generate the configuration for PQ key exchange
                 let postQuantumConfiguration = ConfigurationBuilder(
                     privateKey: settings.privateKey,
-                    interfaceAddresses: settings.interfaceAddresses
+                    interfaceAddresses: settings.interfaceAddresses, allowedIPs: [
+                        IPAddressRange(from: "10.64.0.1/32")!,
+                    ]
                 )
                 let tunnelAdapterConfiguration = try postQuantumConfiguration.makeConfiguration()