Remove dead code

mullvad · Mar 26, 2024 · 9de0959 · 9de0959
1 parent 20c8fae
commit 9de0959
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 81 deletions.
diff --git a/ios/MullvadPostQuantum/PacketTunnelProvider+TCPConnection.swift b/ios/MullvadPostQuantum/PacketTunnelProvider+TCPConnection.swift
@@ -63,7 +63,7 @@ func receivePostQuantumKey(rawPacketTunnel: UnsafeMutableRawPointer, rawPreshare
     }
 
     let presharedKey = Data(bytes: rawPresharedKey, count: 32)
-       if let key = PreSharedKey(rawValue: presharedKey) {
+    if let key = PreSharedKey(rawValue: presharedKey) {
         postQuantumKeyReceiver.receivePostQuantumKey(key)
     }
 }
diff --git a/ios/MullvadPostQuantum/talpid-tunnel-config-client/include/talpid_tunnel_config_client.h b/ios/MullvadPostQuantum/talpid-tunnel-config-client/include/talpid_tunnel_config_client.h
@@ -18,6 +18,8 @@ void handle_recv(const uint8_t *data, uintptr_t data_len, const void *sender);
 /**
  * Entry point for exchanging post quantum keys on iOS.
  * The TCP connection must be created to go through the tunnel.
+ * # Safety
+ * This function is safe to call
  */
 const void *negotiate_post_quantum_key(const uint8_t *public_key,
                                        const uint8_t *ephemeral_public_key,

diff --git a/ios/MullvadTypes/Protocols/PostQuantumKeyReceiving.swift b/ios/MullvadTypes/Protocols/PostQuantumKeyReceiving.swift
@@ -16,12 +16,3 @@ public protocol PostQuantumKeyReceiving {
 public enum PostQuantumKeyReceivingError: Error {
     case invalidKey
 }
-
-public extension PostQuantumKeyReceiving {
-    func receivePostQuantumKey(_ keyData: Data) throws {
-        guard let key = PreSharedKey(rawValue: keyData) else {
-            throw PostQuantumKeyReceivingError.invalidKey
-        }
-        receivePostQuantumKey(key)
-    }
-}
diff --git a/ios/PacketTunnel/PacketTunnelProvider/PacketTunnelProvider.swift b/ios/PacketTunnel/PacketTunnelProvider/PacketTunnelProvider.swift
@@ -119,77 +119,6 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
         }
     }
 
-    // MARK: - Uncomment the next three functions to test Post Quantum Key exchange
-
-//    override func startTunnel(options: [String: NSObject]? = nil) async throws {
-//        let startOptions = parseStartOptions(options ?? [:])
-//
-//        startObservingActorState()
-//
-//        try await startPostQuantumKeyExchange()
-//    }
-//
-//    func selectGothenburgRelay() throws -> MullvadEndpoint {
-//        let constraints = RelayConstraints(
-//            locations: .only(UserSelectedRelays(locations: [.city("se", "got")]))
-//        )
-//        let relay = try relaySelector.selectRelay(with: constraints, connectionAttemptFailureCount: 0)
-//        return relay.endpoint
-//    }
-//
-//    var pqTCPConnection: NWTCPConnection?
-//
-//    func startPostQuantumKeyExchange() async throws {
-//        let settingsReader = SettingsReader()
-//        let settings: Settings = try settingsReader.read()
-//        let privateKey = settings.privateKey
-//        let postQuantumSharedKey = PrivateKey() // This will become the new private key of the device
-//
-//        let IPv4Gateway = IPv4Address("10.64.0.1")!
-//        let gothenburgRelay = try selectGothenburgRelay()
-//
-//        let configurationBuilder = ConfigurationBuilder(
-//            privateKey: settings.privateKey,
-//            interfaceAddresses: settings.interfaceAddresses,
-//            dns: settings.dnsServers,
-//            endpoint: gothenburgRelay,
-//            allowedIPs: [
-//                IPAddressRange(from: "10.64.0.1/8")!,
-//            ]
-//        )
-//
-//        try await adapter.start(configuration: configurationBuilder.makeConfiguration())
-//
-//        let negotiator = PostQuantumKeyNegotiatior()
-//        let gatewayEndpoint = NWHostEndpoint(hostname: "10.64.0.1", port: "1337")
-//
-//        pqTCPConnection = createTCPConnectionThroughTunnel(
-//            to: gatewayEndpoint,
-//            enableTLS: false,
-//            tlsParameters: nil,
-//            delegate: nil
-//        )
-//        guard let pqTCPConnection else { return }
-//
-//        // This will work as long as there is a detached, top-level task here.
-//        // It might be due to the async runtime environment for `override func startTunnel(options: [String: NSObject]? = nil) async throws`
-//        // There is a strong chance that the function's async availability was not properly declared by Apple.
-//        Task.detached {
-//            for await isViable in pqTCPConnection.viability where isViable == true {
-//                negotiator.negotiateKey(
-//                    gatewayIP: IPv4Gateway,
-//                    devicePublicKey: privateKey.publicKey,
-//                    presharedKey: postQuantumSharedKey.publicKey,
-//                    packetTunnel: self,
-//                    tcpConnection: self.pqTCPConnection!
-//                )
-//                break
-//            }
-//        }
-//    }
-
-    // MARK: - End testing Post Quantum key exchange
-
     override func stopTunnel(with reason: NEProviderStopReason) async {
         providerLogger.debug("stopTunnel: \(reason)")