Remove unneeded parameter

mullvad · Aug 23, 2024 · 62b3c6d · 62b3c6d
1 parent 7bd2a79
commit 62b3c6d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/ios/MullvadRustRuntime/EphemeralPeerExchangeActor.swift b/ios/MullvadRustRuntime/EphemeralPeerExchangeActor.swift
@@ -1,5 +1,5 @@
 //
-//  PostQuantumKeyExchangeActor.swift
+//  EphemeralPeerExchangeActor.swift
 //  PacketTunnel
 //
 //  Created by Marco Nikic on 2024-04-12.

diff --git a/ios/MullvadRustRuntime/include/mullvad_rust_runtime.h b/ios/MullvadRustRuntime/include/mullvad_rust_runtime.h
@@ -105,8 +105,7 @@ extern void swift_nw_tcp_connection_read(const void *connection, const void *sen
  */
 extern void swift_ephemeral_peer_ready(const void *raw_packet_tunnel,
                                        const uint8_t *raw_preshared_key,
-                                       const uint8_t *raw_ephemeral_private_key,
-                                       bool daita_enabled);
+                                       const uint8_t *raw_ephemeral_private_key);
 
 /**
  * # Safety

diff --git a/ios/PacketTunnelCoreTests/MultiHopEphemeralPeerExchangerTests.swift b/ios/PacketTunnelCoreTests/MultiHopEphemeralPeerExchangerTests.swift
@@ -134,7 +134,7 @@ final class MultiHopEphemeralPeerExchangerTests: XCTestCase {
         )
     }
 
-    //TODO: Write more tests
+    // TODO: Write more tests
     func testEphemeralPeerExchangeSuccessWhenDaitaNegotiationStarts() throws {
         let unexpectedNegotiationFailure = expectation(description: "Negotiation failed.")
         unexpectedNegotiationFailure.isInverted = true

diff --git a/mullvad-ios/src/post_quantum_proxy/ios_runtime.rs b/mullvad-ios/src/post_quantum_proxy/ios_runtime.rs
@@ -139,7 +139,6 @@ impl IOSRuntime {
                         self.packet_tunnel.packet_tunnel,
                         ptr::null(),
                         ptr::null(),
-                        self.enable_daita,
                     );
                     return;
                 }
@@ -167,16 +166,14 @@ impl IOSRuntime {
                                 let preshared_key_bytes = preshared_key.as_bytes();
                                 swift_ephemeral_peer_ready(self.packet_tunnel.packet_tunnel,
                                     preshared_key_bytes.as_ptr(),
-                                    self.ephemeral_key.as_ptr(),
-                                    self.enable_daita);
+                                    self.ephemeral_key.as_ptr());
                             },
                             None => {
                                 // Daita peer was requested, but without enabling post quantum keys
                                 unsafe {
                                     swift_ephemeral_peer_ready(self.packet_tunnel.packet_tunnel,
                                         ptr::null(),
-                                        self.ephemeral_key.as_ptr(),
-                                    self.enable_daita);
+                                        self.ephemeral_key.as_ptr());
                                 }
                             }
                         }
@@ -186,8 +183,7 @@ impl IOSRuntime {
                         unsafe {
                             swift_ephemeral_peer_ready(self.packet_tunnel.packet_tunnel,
                                 ptr::null(),
-                                ptr::null(),
-                                self.enable_daita);
+                                ptr::null());
                         }
                     }
                 }
@@ -200,8 +196,7 @@ impl IOSRuntime {
                         shutdown_handle.shutdown();
                         unsafe { swift_ephemeral_peer_ready(self.packet_tunnel.packet_tunnel,
                             ptr::null(),
-                            ptr::null(),
-                            self.enable_daita); }
+                            ptr::null()); }
             }
         }
     }

diff --git a/mullvad-ios/src/post_quantum_proxy/ios_tcp_connection.rs b/mullvad-ios/src/post_quantum_proxy/ios_tcp_connection.rs
@@ -39,7 +39,6 @@ extern "C" {
         raw_packet_tunnel: *const c_void,
         raw_preshared_key: *const u8,
         raw_ephemeral_private_key: *const u8,
-        daita_enabled: bool,
     );
 }