From 666b6801915722a48055f8dbf3811ad2463dbf3e Mon Sep 17 00:00:00 2001 From: Bug Magnet Date: Tue, 3 Sep 2024 08:57:28 +0200 Subject: [PATCH] Clarify todo comments --- .../PacketTunnelProvider+TCPConnection.swift | 2 +- ios/MullvadVPN/TunnelManager/TunnelState+UI.swift | 2 +- ios/MullvadVPN/TunnelManager/TunnelState.swift | 3 +-- ios/PacketTunnelCore/Actor/ObservedState+Extensions.swift | 1 - ios/PacketTunnelCore/Actor/PacketTunnelActorCommand.swift | 5 ++--- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ios/MullvadRustRuntime/PacketTunnelProvider+TCPConnection.swift b/ios/MullvadRustRuntime/PacketTunnelProvider+TCPConnection.swift index dcb7a6c52148..e19750d4dcae 100644 --- a/ios/MullvadRustRuntime/PacketTunnelProvider+TCPConnection.swift +++ b/ios/MullvadRustRuntime/PacketTunnelProvider+TCPConnection.swift @@ -78,7 +78,7 @@ func tcpConnectionReceive( } } -/// End sequence of a quantum-secure pre shared key exchange. +/// End sequence of an ephemeral peer exchange. /// /// This FFI function is called by Rust when an ephemeral peer negotiation succeeded or failed. /// When both the `rawPresharedKey` and the `rawEphemeralKey` are raw pointers to 32 bytes data arrays, diff --git a/ios/MullvadVPN/TunnelManager/TunnelState+UI.swift b/ios/MullvadVPN/TunnelManager/TunnelState+UI.swift index 9c3dfe4a7152..90dde124ca76 100644 --- a/ios/MullvadVPN/TunnelManager/TunnelState+UI.swift +++ b/ios/MullvadVPN/TunnelManager/TunnelState+UI.swift @@ -49,7 +49,7 @@ extension TunnelState { ) } - // TODO: How to Handle Daita here ? + // TODO: Handle Daita here in an upcoming PR for the UI case .negotiatingEphemeralPeer: NSLocalizedString( "TUNNEL_STATE_NEGOTIATING_KEY", diff --git a/ios/MullvadVPN/TunnelManager/TunnelState.swift b/ios/MullvadVPN/TunnelManager/TunnelState.swift index ccb0a821ef80..9127b2d29ec6 100644 --- a/ios/MullvadVPN/TunnelManager/TunnelState.swift +++ b/ios/MullvadVPN/TunnelManager/TunnelState.swift @@ -52,7 +52,6 @@ enum TunnelState: Equatable, CustomStringConvertible { /// Connecting the tunnel. case connecting(SelectedRelays?, isPostQuantum: Bool) - // TODO: Add information here to support Daita ??? /// Negotiating an ephemeral peer either for post-quantum resistance or Daita case negotiatingEphemeralPeer(SelectedRelays, PrivateKey) @@ -113,7 +112,7 @@ enum TunnelState: Equatable, CustomStringConvertible { case let .error(blockedStateReason): "error state: \(blockedStateReason)" case let .negotiatingEphemeralPeer(tunnelRelays, _): - // TODO: Handle Daita and PQ here + // TODO: Handle Daita and PQ here in an upcoming PR for the UI """ negotiating key with exit relay: \(tunnelRelays.exit.hostname)\ \(tunnelRelays.entry.flatMap { " via \($0.hostname)" } ?? "") diff --git a/ios/PacketTunnelCore/Actor/ObservedState+Extensions.swift b/ios/PacketTunnelCore/Actor/ObservedState+Extensions.swift index b6d358f3dc55..f809fa0d9fc7 100644 --- a/ios/PacketTunnelCore/Actor/ObservedState+Extensions.swift +++ b/ios/PacketTunnelCore/Actor/ObservedState+Extensions.swift @@ -16,7 +16,6 @@ extension ObservedState { "Connected" case .connecting: "Connecting" - // TODO: Handle Daita here ? case .negotiatingEphemeralPeer: "Negotiating Post Quantum Secure Key" case .reconnecting: diff --git a/ios/PacketTunnelCore/Actor/PacketTunnelActorCommand.swift b/ios/PacketTunnelCore/Actor/PacketTunnelActorCommand.swift index 0fb8acaba5d8..b677986d041b 100644 --- a/ios/PacketTunnelCore/Actor/PacketTunnelActorCommand.swift +++ b/ios/PacketTunnelCore/Actor/PacketTunnelActorCommand.swift @@ -73,11 +73,10 @@ extension PacketTunnelActor { return "networkReachability" case .switchKey: return "switchKey" - // TODO: Handle Daita here ??? case .ephemeralPeerNegotiationStateChanged: - return "postQuantumNegotiationStateChanged" + return "ephemeralPeerNegotiationStateChanged" case .notifyEphemeralPeerNegotiated: - return "notifyPostQuantumKeyExchanged" + return "notifyEphemeralPeerNegotiated" } } }