summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBug Magnet <marco.nikic@mullvad.net>2025-05-09 11:11:17 +0200
committerBug Magnet <marco.nikic@mullvad.net>2025-05-09 11:11:17 +0200
commit8b8f2df0a6b5ab8c2fdbe4935997a5ebc45eb4ab (patch)
treecb799ba5123fda159dab70e37dc3376100fefae2
parent210a00556578aeadda44c60c5b1402db11e65447 (diff)
parent311585dd4ee7d0c38bd938c1fa0db89f53404b35 (diff)
downloadmullvadvpn-8b8f2df0a6b5ab8c2fdbe4935997a5ebc45eb4ab.tar.xz
mullvadvpn-8b8f2df0a6b5ab8c2fdbe4935997a5ebc45eb4ab.zip
Merge branch 'IOS-1189-_silgen_name-to-_cdecl'
-rw-r--r--ios/MullvadRustRuntime/EphemeralPeerReceiver.swift4
-rw-r--r--ios/MullvadRustRuntime/MullvadApiCompletion.swift2
2 files changed, 3 insertions, 3 deletions
diff --git a/ios/MullvadRustRuntime/EphemeralPeerReceiver.swift b/ios/MullvadRustRuntime/EphemeralPeerReceiver.swift
index f27c0b60dd..db2ba1e92a 100644
--- a/ios/MullvadRustRuntime/EphemeralPeerReceiver.swift
+++ b/ios/MullvadRustRuntime/EphemeralPeerReceiver.swift
@@ -25,12 +25,12 @@ import WireGuardKitTypes
/// - rawPresharedKey: A raw pointer to the quantum-secure pre shared key
/// - rawEphemeralKey: A raw pointer to the ephemeral private key of the device
/// - rawDaitaParameters: A raw pointer to negotiated DAITA parameters
-@_silgen_name("swift_ephemeral_peer_ready")
+@_cdecl("swift_ephemeral_peer_ready")
func receivePostQuantumKey(
rawEphemeralPeerReceiver: UnsafeMutableRawPointer?,
rawPresharedKey: UnsafeMutableRawPointer?,
rawEphemeralKey: UnsafeMutableRawPointer?,
- rawDaitaParameters: UnsafePointer<DaitaV2Parameters>?
+ rawDaitaParameters: UnsafeRawPointer?
) {
guard let rawEphemeralPeerReceiver else { return }
let ephemeralPeerReceiver = Unmanaged<EphemeralPeerReceiver>.fromOpaque(rawEphemeralPeerReceiver)
diff --git a/ios/MullvadRustRuntime/MullvadApiCompletion.swift b/ios/MullvadRustRuntime/MullvadApiCompletion.swift
index ca61c6791f..5fc16e1d34 100644
--- a/ios/MullvadRustRuntime/MullvadApiCompletion.swift
+++ b/ios/MullvadRustRuntime/MullvadApiCompletion.swift
@@ -6,7 +6,7 @@
// Copyright © 2025 Mullvad VPN AB. All rights reserved.
//
-@_silgen_name("mullvad_api_completion_finish")
+@_cdecl("mullvad_api_completion_finish")
func mullvadApiCompletionFinish(
response: SwiftMullvadApiResponse,
completionCookie: UnsafeMutableRawPointer