From 547077a808171f5ce7be449ed0fc7a3c1abe634e Mon Sep 17 00:00:00 2001 From: Andrej Mihajlov Date: Wed, 2 Dec 2020 16:10:44 +0100 Subject: [PATCH] WireGuardApp: integrate WireGuardKit sources directly Signed-off-by: Andrej Mihajlov --- Sources/Shared/Logging/Logger.swift | 1 - .../NETunnelProviderProtocol+Extension.swift | 1 - .../TunnelConfiguration+WgQuickConfig.swift | 1 - Sources/WireGuardApp/Tunnel/MockTunnels.swift | 1 - .../TunnelConfiguration+UapiConfig.swift | 1 - .../WireGuardApp/Tunnel/TunnelsManager.swift | 1 - Sources/WireGuardApp/UI/TunnelImporter.swift | 1 - Sources/WireGuardApp/UI/TunnelViewModel.swift | 1 - .../ViewController/QRScanViewController.swift | 1 - .../SettingsTableViewController.swift | 3 +- .../TunnelDetailTableViewController.swift | 1 - .../TunnelEditTableViewController.swift | 1 - .../TunnelsListTableViewController.swift | 1 - .../WireGuardApp/UI/macOS/AppDelegate.swift | 1 - .../macOS/ParseError+WireGuardAppError.swift | 1 - .../TunnelDetailTableViewController.swift | 1 - .../TunnelEditViewController.swift | 1 - .../WireGuardApp/WireGuard-Bridging-Header.h | 2 + .../WireGuardApp/ZipArchive/ZipExporter.swift | 1 - .../WireGuardApp/ZipArchive/ZipImporter.swift | 1 - .../PacketTunnelSettingsGenerator.swift | 3 + Sources/WireGuardKit/PrivateKey.swift | 3 + Sources/WireGuardKit/WireGuardAdapter.swift | 3 + .../PacketTunnelProvider.swift | 1 - ...ireGuardNetworkExtension-Bridging-Header.h | 1 + WireGuard.xcodeproj/project.pbxproj | 223 ++++++++++++++---- .../xcshareddata/swiftpm/Package.resolved | 16 -- 27 files changed, 188 insertions(+), 85 deletions(-) delete mode 100644 WireGuard.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/Sources/Shared/Logging/Logger.swift b/Sources/Shared/Logging/Logger.swift index f80be3c..bf7b96e 100644 --- a/Sources/Shared/Logging/Logger.swift +++ b/Sources/Shared/Logging/Logger.swift @@ -3,7 +3,6 @@ import Foundation import os.log -import WireGuardKit public class Logger { enum LoggerError: Error { diff --git a/Sources/Shared/Model/NETunnelProviderProtocol+Extension.swift b/Sources/Shared/Model/NETunnelProviderProtocol+Extension.swift index c75e9c5..7828d81 100644 --- a/Sources/Shared/Model/NETunnelProviderProtocol+Extension.swift +++ b/Sources/Shared/Model/NETunnelProviderProtocol+Extension.swift @@ -2,7 +2,6 @@ // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. import NetworkExtension -import WireGuardKit enum PacketTunnelProviderError: String, Error { case savedProtocolConfigurationIsInvalid diff --git a/Sources/Shared/Model/TunnelConfiguration+WgQuickConfig.swift b/Sources/Shared/Model/TunnelConfiguration+WgQuickConfig.swift index 7fd65d6..6902708 100644 --- a/Sources/Shared/Model/TunnelConfiguration+WgQuickConfig.swift +++ b/Sources/Shared/Model/TunnelConfiguration+WgQuickConfig.swift @@ -2,7 +2,6 @@ // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. import Foundation -import WireGuardKit extension TunnelConfiguration { diff --git a/Sources/WireGuardApp/Tunnel/MockTunnels.swift b/Sources/WireGuardApp/Tunnel/MockTunnels.swift index 1ffa99c..e8937f4 100644 --- a/Sources/WireGuardApp/Tunnel/MockTunnels.swift +++ b/Sources/WireGuardApp/Tunnel/MockTunnels.swift @@ -2,7 +2,6 @@ // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. import NetworkExtension -import WireGuardKit // Creates mock tunnels for the iOS Simulator. diff --git a/Sources/WireGuardApp/Tunnel/TunnelConfiguration+UapiConfig.swift b/Sources/WireGuardApp/Tunnel/TunnelConfiguration+UapiConfig.swift index fcd6a31..6e786c0 100644 --- a/Sources/WireGuardApp/Tunnel/TunnelConfiguration+UapiConfig.swift +++ b/Sources/WireGuardApp/Tunnel/TunnelConfiguration+UapiConfig.swift @@ -2,7 +2,6 @@ // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. import Foundation -import WireGuardKit extension TunnelConfiguration { convenience init(fromUapiConfig uapiConfig: String, basedOn base: TunnelConfiguration? = nil) throws { diff --git a/Sources/WireGuardApp/Tunnel/TunnelsManager.swift b/Sources/WireGuardApp/Tunnel/TunnelsManager.swift index 73c7f34..26402b6 100644 --- a/Sources/WireGuardApp/Tunnel/TunnelsManager.swift +++ b/Sources/WireGuardApp/Tunnel/TunnelsManager.swift @@ -4,7 +4,6 @@ import Foundation import NetworkExtension import os.log -import WireGuardKit protocol TunnelsManagerListDelegate: class { func tunnelAdded(at index: Int) diff --git a/Sources/WireGuardApp/UI/TunnelImporter.swift b/Sources/WireGuardApp/UI/TunnelImporter.swift index 3846382..46f2c92 100644 --- a/Sources/WireGuardApp/UI/TunnelImporter.swift +++ b/Sources/WireGuardApp/UI/TunnelImporter.swift @@ -2,7 +2,6 @@ // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. import Foundation -import WireGuardKit class TunnelImporter { static func importFromFile(urls: [URL], into tunnelsManager: TunnelsManager, sourceVC: AnyObject?, errorPresenterType: ErrorPresenterProtocol.Type, completionHandler: (() -> Void)? = nil) { diff --git a/Sources/WireGuardApp/UI/TunnelViewModel.swift b/Sources/WireGuardApp/UI/TunnelViewModel.swift index 3215b70..11dc4dc 100644 --- a/Sources/WireGuardApp/UI/TunnelViewModel.swift +++ b/Sources/WireGuardApp/UI/TunnelViewModel.swift @@ -2,7 +2,6 @@ // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. import Foundation -import WireGuardKit class TunnelViewModel { diff --git a/Sources/WireGuardApp/UI/iOS/ViewController/QRScanViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/QRScanViewController.swift index 041421f..9d04dfa 100644 --- a/Sources/WireGuardApp/UI/iOS/ViewController/QRScanViewController.swift +++ b/Sources/WireGuardApp/UI/iOS/ViewController/QRScanViewController.swift @@ -3,7 +3,6 @@ import AVFoundation import UIKit -import WireGuardKit protocol QRScanViewControllerDelegate: class { func addScannedQRCode(tunnelConfiguration: TunnelConfiguration, qrScanViewController: QRScanViewController, completionHandler: (() -> Void)?) diff --git a/Sources/WireGuardApp/UI/iOS/ViewController/SettingsTableViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/SettingsTableViewController.swift index d2c6f0c..2872569 100644 --- a/Sources/WireGuardApp/UI/iOS/ViewController/SettingsTableViewController.swift +++ b/Sources/WireGuardApp/UI/iOS/ViewController/SettingsTableViewController.swift @@ -3,7 +3,6 @@ import UIKit import os.log -import WireGuardKit class SettingsTableViewController: UITableViewController { @@ -153,7 +152,7 @@ extension SettingsTableViewController { } cell.value = appVersion } else if field == .goBackendVersion { - cell.value = getWireGuardVersion() + cell.value = wireGuardVersion } return cell } else if field == .exportZipArchive { diff --git a/Sources/WireGuardApp/UI/iOS/ViewController/TunnelDetailTableViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/TunnelDetailTableViewController.swift index d3008c2..62f9563 100644 --- a/Sources/WireGuardApp/UI/iOS/ViewController/TunnelDetailTableViewController.swift +++ b/Sources/WireGuardApp/UI/iOS/ViewController/TunnelDetailTableViewController.swift @@ -2,7 +2,6 @@ // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. import UIKit -import WireGuardKit class TunnelDetailTableViewController: UITableViewController { diff --git a/Sources/WireGuardApp/UI/iOS/ViewController/TunnelEditTableViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/TunnelEditTableViewController.swift index ecad2f6..e58cec5 100644 --- a/Sources/WireGuardApp/UI/iOS/ViewController/TunnelEditTableViewController.swift +++ b/Sources/WireGuardApp/UI/iOS/ViewController/TunnelEditTableViewController.swift @@ -2,7 +2,6 @@ // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. import UIKit -import WireGuardKit protocol TunnelEditTableViewControllerDelegate: class { func tunnelSaved(tunnel: TunnelContainer) diff --git a/Sources/WireGuardApp/UI/iOS/ViewController/TunnelsListTableViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/TunnelsListTableViewController.swift index 885e8c9..5132329 100644 --- a/Sources/WireGuardApp/UI/iOS/ViewController/TunnelsListTableViewController.swift +++ b/Sources/WireGuardApp/UI/iOS/ViewController/TunnelsListTableViewController.swift @@ -4,7 +4,6 @@ import UIKit import MobileCoreServices import UserNotifications -import WireGuardKit class TunnelsListTableViewController: UIViewController { diff --git a/Sources/WireGuardApp/UI/macOS/AppDelegate.swift b/Sources/WireGuardApp/UI/macOS/AppDelegate.swift index 6e3783a..6bbf972 100644 --- a/Sources/WireGuardApp/UI/macOS/AppDelegate.swift +++ b/Sources/WireGuardApp/UI/macOS/AppDelegate.swift @@ -3,7 +3,6 @@ import Cocoa import ServiceManagement -import WireGuardKit @NSApplicationMain class AppDelegate: NSObject, NSApplicationDelegate { diff --git a/Sources/WireGuardApp/UI/macOS/ParseError+WireGuardAppError.swift b/Sources/WireGuardApp/UI/macOS/ParseError+WireGuardAppError.swift index 8622510..6afbadb 100644 --- a/Sources/WireGuardApp/UI/macOS/ParseError+WireGuardAppError.swift +++ b/Sources/WireGuardApp/UI/macOS/ParseError+WireGuardAppError.swift @@ -2,7 +2,6 @@ // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. import Cocoa -import WireGuardKit // We have this in a separate file because we don't want the network extension // code to see WireGuardAppError and tr(). Also, this extension is used only on macOS. diff --git a/Sources/WireGuardApp/UI/macOS/ViewController/TunnelDetailTableViewController.swift b/Sources/WireGuardApp/UI/macOS/ViewController/TunnelDetailTableViewController.swift index 80b759e..5ce3dc7 100644 --- a/Sources/WireGuardApp/UI/macOS/ViewController/TunnelDetailTableViewController.swift +++ b/Sources/WireGuardApp/UI/macOS/ViewController/TunnelDetailTableViewController.swift @@ -2,7 +2,6 @@ // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. import Cocoa -import WireGuardKit class TunnelDetailTableViewController: NSViewController { diff --git a/Sources/WireGuardApp/UI/macOS/ViewController/TunnelEditViewController.swift b/Sources/WireGuardApp/UI/macOS/ViewController/TunnelEditViewController.swift index 97eaf8f..104b42d 100644 --- a/Sources/WireGuardApp/UI/macOS/ViewController/TunnelEditViewController.swift +++ b/Sources/WireGuardApp/UI/macOS/ViewController/TunnelEditViewController.swift @@ -2,7 +2,6 @@ // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. import Cocoa -import WireGuardKit protocol TunnelEditViewControllerDelegate: class { func tunnelSaved(tunnel: TunnelContainer) diff --git a/Sources/WireGuardApp/WireGuard-Bridging-Header.h b/Sources/WireGuardApp/WireGuard-Bridging-Header.h index 955412e..25b5230 100644 --- a/Sources/WireGuardApp/WireGuard-Bridging-Header.h +++ b/Sources/WireGuardApp/WireGuard-Bridging-Header.h @@ -1,3 +1,5 @@ +#include "key.h" + #include "unzip.h" #include "zip.h" #include "ringlogger.h" diff --git a/Sources/WireGuardApp/ZipArchive/ZipExporter.swift b/Sources/WireGuardApp/ZipArchive/ZipExporter.swift index fe3d984..3a87928 100644 --- a/Sources/WireGuardApp/ZipArchive/ZipExporter.swift +++ b/Sources/WireGuardApp/ZipArchive/ZipExporter.swift @@ -2,7 +2,6 @@ // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. import Foundation -import WireGuardKit enum ZipExporterError: WireGuardAppError { case noTunnelsToExport diff --git a/Sources/WireGuardApp/ZipArchive/ZipImporter.swift b/Sources/WireGuardApp/ZipArchive/ZipImporter.swift index c988e94..499181a 100644 --- a/Sources/WireGuardApp/ZipArchive/ZipImporter.swift +++ b/Sources/WireGuardApp/ZipArchive/ZipImporter.swift @@ -2,7 +2,6 @@ // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. import Foundation -import WireGuardKit class ZipImporter { static func importConfigFiles(from url: URL, completion: @escaping (Result<[TunnelConfiguration?], ZipArchiveError>) -> Void) { diff --git a/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift b/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift index e4fead3..1dd1e66 100644 --- a/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift +++ b/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift @@ -4,7 +4,10 @@ import Foundation import Network import NetworkExtension + +#if SWIFT_PACKAGE import WireGuardKitC +#endif class PacketTunnelSettingsGenerator { let tunnelConfiguration: TunnelConfiguration diff --git a/Sources/WireGuardKit/PrivateKey.swift b/Sources/WireGuardKit/PrivateKey.swift index 545cdbc..b224f19 100644 --- a/Sources/WireGuardKit/PrivateKey.swift +++ b/Sources/WireGuardKit/PrivateKey.swift @@ -2,7 +2,10 @@ // Copyright © 2018-2019 WireGuard LLC. All Rights Reserved. import Foundation + +#if SWIFT_PACKAGE import WireGuardKitC +#endif /// The class describing a private key used by WireGuard. public class PrivateKey: BaseKey { diff --git a/Sources/WireGuardKit/WireGuardAdapter.swift b/Sources/WireGuardKit/WireGuardAdapter.swift index ef644bd..2cb236f 100644 --- a/Sources/WireGuardKit/WireGuardAdapter.swift +++ b/Sources/WireGuardKit/WireGuardAdapter.swift @@ -3,7 +3,10 @@ import Foundation import NetworkExtension + +#if SWIFT_PACKAGE import WireGuardKitGo +#endif public enum WireGuardAdapterError: Error { /// Failure to locate tunnel file descriptor. diff --git a/Sources/WireGuardNetworkExtension/PacketTunnelProvider.swift b/Sources/WireGuardNetworkExtension/PacketTunnelProvider.swift index f88d117..8d8bf64 100644 --- a/Sources/WireGuardNetworkExtension/PacketTunnelProvider.swift +++ b/Sources/WireGuardNetworkExtension/PacketTunnelProvider.swift @@ -3,7 +3,6 @@ import Foundation import NetworkExtension -import WireGuardKit import os class PacketTunnelProvider: NEPacketTunnelProvider { diff --git a/Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h b/Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h index 9e087d4..51ce01f 100644 --- a/Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h +++ b/Sources/WireGuardNetworkExtension/WireGuardNetworkExtension-Bridging-Header.h @@ -1 +1,2 @@ +//#include "../WireGuardKitC/WireGuardKitC.h" #include "ringlogger.h" diff --git a/WireGuard.xcodeproj/project.pbxproj b/WireGuard.xcodeproj/project.pbxproj index 7b885b9..d3060a1 100644 --- a/WireGuard.xcodeproj/project.pbxproj +++ b/WireGuard.xcodeproj/project.pbxproj @@ -3,16 +3,72 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ - 5892BF8F255581F6000E678D /* WireGuardKit in Frameworks */ = {isa = PBXBuildFile; productRef = 5892BF8E255581F6000E678D /* WireGuardKit */; }; + 585B105A2577E293004F691E /* InterfaceConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10462577E293004F691E /* InterfaceConfiguration.swift */; }; + 585B105B2577E293004F691E /* InterfaceConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10462577E293004F691E /* InterfaceConfiguration.swift */; }; + 585B105C2577E293004F691E /* InterfaceConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10462577E293004F691E /* InterfaceConfiguration.swift */; }; + 585B105D2577E293004F691E /* InterfaceConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10462577E293004F691E /* InterfaceConfiguration.swift */; }; + 585B105E2577E293004F691E /* PeerConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10472577E293004F691E /* PeerConfiguration.swift */; }; + 585B105F2577E293004F691E /* PeerConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10472577E293004F691E /* PeerConfiguration.swift */; }; + 585B10602577E293004F691E /* PeerConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10472577E293004F691E /* PeerConfiguration.swift */; }; + 585B10612577E293004F691E /* PeerConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10472577E293004F691E /* PeerConfiguration.swift */; }; + 585B10622577E293004F691E /* DNSServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10482577E293004F691E /* DNSServer.swift */; }; + 585B10632577E293004F691E /* DNSServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10482577E293004F691E /* DNSServer.swift */; }; + 585B10642577E294004F691E /* DNSServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10482577E293004F691E /* DNSServer.swift */; }; + 585B10652577E294004F691E /* DNSServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10482577E293004F691E /* DNSServer.swift */; }; + 585B10662577E294004F691E /* TunnelConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10492577E293004F691E /* TunnelConfiguration.swift */; }; + 585B10672577E294004F691E /* TunnelConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10492577E293004F691E /* TunnelConfiguration.swift */; }; + 585B10682577E294004F691E /* TunnelConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10492577E293004F691E /* TunnelConfiguration.swift */; }; + 585B10692577E294004F691E /* TunnelConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10492577E293004F691E /* TunnelConfiguration.swift */; }; + 585B106A2577E294004F691E /* WireGuardKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104A2577E293004F691E /* WireGuardKit.swift */; }; + 585B106B2577E294004F691E /* WireGuardKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104A2577E293004F691E /* WireGuardKit.swift */; }; + 585B106C2577E294004F691E /* WireGuardKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104A2577E293004F691E /* WireGuardKit.swift */; }; + 585B106D2577E294004F691E /* WireGuardKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104A2577E293004F691E /* WireGuardKit.swift */; }; + 585B106E2577E294004F691E /* WireGuardAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104B2577E293004F691E /* WireGuardAdapter.swift */; }; + 585B106F2577E294004F691E /* WireGuardAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104B2577E293004F691E /* WireGuardAdapter.swift */; }; + 585B10702577E294004F691E /* WireGuardAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104B2577E293004F691E /* WireGuardAdapter.swift */; }; + 585B10712577E294004F691E /* WireGuardAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104B2577E293004F691E /* WireGuardAdapter.swift */; }; + 585B10722577E294004F691E /* Array+ConcurrentMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104C2577E293004F691E /* Array+ConcurrentMap.swift */; }; + 585B10732577E294004F691E /* Array+ConcurrentMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104C2577E293004F691E /* Array+ConcurrentMap.swift */; }; + 585B10742577E294004F691E /* Array+ConcurrentMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104C2577E293004F691E /* Array+ConcurrentMap.swift */; }; + 585B10752577E294004F691E /* Array+ConcurrentMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104C2577E293004F691E /* Array+ConcurrentMap.swift */; }; + 585B10762577E294004F691E /* DNSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104D2577E293004F691E /* DNSResolver.swift */; }; + 585B10772577E294004F691E /* DNSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104D2577E293004F691E /* DNSResolver.swift */; }; + 585B10782577E294004F691E /* DNSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104D2577E293004F691E /* DNSResolver.swift */; }; + 585B10792577E294004F691E /* DNSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104D2577E293004F691E /* DNSResolver.swift */; }; + 585B107A2577E294004F691E /* IPAddress+AddrInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104E2577E293004F691E /* IPAddress+AddrInfo.swift */; }; + 585B107B2577E294004F691E /* IPAddress+AddrInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104E2577E293004F691E /* IPAddress+AddrInfo.swift */; }; + 585B107C2577E294004F691E /* IPAddress+AddrInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104E2577E293004F691E /* IPAddress+AddrInfo.swift */; }; + 585B107D2577E294004F691E /* IPAddress+AddrInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104E2577E293004F691E /* IPAddress+AddrInfo.swift */; }; + 585B107E2577E294004F691E /* PrivateKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104F2577E293004F691E /* PrivateKey.swift */; }; + 585B107F2577E294004F691E /* PrivateKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104F2577E293004F691E /* PrivateKey.swift */; }; + 585B10802577E294004F691E /* PrivateKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104F2577E293004F691E /* PrivateKey.swift */; }; + 585B10812577E294004F691E /* PrivateKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B104F2577E293004F691E /* PrivateKey.swift */; }; + 585B10822577E294004F691E /* PacketTunnelSettingsGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10502577E293004F691E /* PacketTunnelSettingsGenerator.swift */; }; + 585B10832577E294004F691E /* PacketTunnelSettingsGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10502577E293004F691E /* PacketTunnelSettingsGenerator.swift */; }; + 585B10842577E294004F691E /* PacketTunnelSettingsGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10502577E293004F691E /* PacketTunnelSettingsGenerator.swift */; }; + 585B10852577E294004F691E /* PacketTunnelSettingsGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10502577E293004F691E /* PacketTunnelSettingsGenerator.swift */; }; + 585B10862577E294004F691E /* IPAddressRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10512577E293004F691E /* IPAddressRange.swift */; }; + 585B10872577E294004F691E /* IPAddressRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10512577E293004F691E /* IPAddressRange.swift */; }; + 585B10882577E294004F691E /* IPAddressRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10512577E293004F691E /* IPAddressRange.swift */; }; + 585B10892577E294004F691E /* IPAddressRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10512577E293004F691E /* IPAddressRange.swift */; }; + 585B108A2577E294004F691E /* Endpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10522577E293004F691E /* Endpoint.swift */; }; + 585B108B2577E294004F691E /* Endpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10522577E293004F691E /* Endpoint.swift */; }; + 585B108C2577E294004F691E /* Endpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10522577E293004F691E /* Endpoint.swift */; }; + 585B108D2577E294004F691E /* Endpoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 585B10522577E293004F691E /* Endpoint.swift */; }; + 585B108E2577E294004F691E /* x25519.c in Sources */ = {isa = PBXBuildFile; fileRef = 585B10562577E293004F691E /* x25519.c */; }; + 585B108F2577E294004F691E /* x25519.c in Sources */ = {isa = PBXBuildFile; fileRef = 585B10562577E293004F691E /* x25519.c */; }; + 585B10902577E294004F691E /* x25519.c in Sources */ = {isa = PBXBuildFile; fileRef = 585B10562577E293004F691E /* x25519.c */; }; + 585B10912577E294004F691E /* x25519.c in Sources */ = {isa = PBXBuildFile; fileRef = 585B10562577E293004F691E /* x25519.c */; }; + 585B10922577E294004F691E /* key.c in Sources */ = {isa = PBXBuildFile; fileRef = 585B10572577E293004F691E /* key.c */; }; + 585B10932577E294004F691E /* key.c in Sources */ = {isa = PBXBuildFile; fileRef = 585B10572577E293004F691E /* key.c */; }; + 585B10942577E294004F691E /* key.c in Sources */ = {isa = PBXBuildFile; fileRef = 585B10572577E293004F691E /* key.c */; }; + 585B10952577E294004F691E /* key.c in Sources */ = {isa = PBXBuildFile; fileRef = 585B10572577E293004F691E /* key.c */; }; 5892BFA025558288000E678D /* PacketTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5892BF9F25558288000E678D /* PacketTunnelProvider.swift */; }; 5892BFA125558288000E678D /* PacketTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5892BF9F25558288000E678D /* PacketTunnelProvider.swift */; }; - 5892BFDB25593F79000E678D /* WireGuardKit in Frameworks */ = {isa = PBXBuildFile; productRef = 5892BFDA25593F79000E678D /* WireGuardKit */; }; - 5892BFDD25593F80000E678D /* WireGuardKit in Frameworks */ = {isa = PBXBuildFile; productRef = 5892BFDC25593F80000E678D /* WireGuardKit */; }; - 5892BFF325594742000E678D /* WireGuardKit in Frameworks */ = {isa = PBXBuildFile; productRef = 5892BFF225594742000E678D /* WireGuardKit */; }; 5F45417D21C1B23600994C13 /* UITableViewCell+Reuse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45417C21C1B23600994C13 /* UITableViewCell+Reuse.swift */; }; 5F45418C21C2D48200994C13 /* TunnelEditKeyValueCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45418B21C2D48200994C13 /* TunnelEditKeyValueCell.swift */; }; 5F45419021C2D53800994C13 /* SwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F45418F21C2D53800994C13 /* SwitchCell.swift */; }; @@ -236,6 +292,24 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 585B10462577E293004F691E /* InterfaceConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InterfaceConfiguration.swift; sourceTree = ""; }; + 585B10472577E293004F691E /* PeerConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeerConfiguration.swift; sourceTree = ""; }; + 585B10482577E293004F691E /* DNSServer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DNSServer.swift; sourceTree = ""; }; + 585B10492577E293004F691E /* TunnelConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TunnelConfiguration.swift; sourceTree = ""; }; + 585B104A2577E293004F691E /* WireGuardKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WireGuardKit.swift; sourceTree = ""; }; + 585B104B2577E293004F691E /* WireGuardAdapter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WireGuardAdapter.swift; sourceTree = ""; }; + 585B104C2577E293004F691E /* Array+ConcurrentMap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+ConcurrentMap.swift"; sourceTree = ""; }; + 585B104D2577E293004F691E /* DNSResolver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DNSResolver.swift; sourceTree = ""; }; + 585B104E2577E293004F691E /* IPAddress+AddrInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "IPAddress+AddrInfo.swift"; sourceTree = ""; }; + 585B104F2577E293004F691E /* PrivateKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PrivateKey.swift; sourceTree = ""; }; + 585B10502577E293004F691E /* PacketTunnelSettingsGenerator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PacketTunnelSettingsGenerator.swift; sourceTree = ""; }; + 585B10512577E293004F691E /* IPAddressRange.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IPAddressRange.swift; sourceTree = ""; }; + 585B10522577E293004F691E /* Endpoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Endpoint.swift; sourceTree = ""; }; + 585B10542577E293004F691E /* WireGuardKitC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WireGuardKitC.h; sourceTree = ""; }; + 585B10552577E293004F691E /* key.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = key.h; sourceTree = ""; }; + 585B10562577E293004F691E /* x25519.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x25519.c; sourceTree = ""; }; + 585B10572577E293004F691E /* key.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = key.c; sourceTree = ""; }; + 585B10592577E293004F691E /* x25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x25519.h; sourceTree = ""; }; 5892BF9F25558288000E678D /* PacketTunnelProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PacketTunnelProvider.swift; sourceTree = ""; }; 5F45417C21C1B23600994C13 /* UITableViewCell+Reuse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableViewCell+Reuse.swift"; sourceTree = ""; }; 5F45418B21C2D48200994C13 /* TunnelEditKeyValueCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelEditKeyValueCell.swift; sourceTree = ""; }; @@ -365,7 +439,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5892BFF325594742000E678D /* WireGuardKit in Frameworks */, 6B5CA6B1220DE4E900F126CF /* NetworkExtension.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -374,7 +447,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5892BFDD25593F80000E678D /* WireGuardKit in Frameworks */, 6FB1BDDA21D5170800A991BF /* NetworkExtension.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -383,7 +455,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5892BFDB25593F79000E678D /* WireGuardKit in Frameworks */, 6B5CA6B2220DE4F400F126CF /* NetworkExtension.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -392,7 +463,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5892BF8F255581F6000E678D /* WireGuardKit in Frameworks */, 6B653B86220DE2960050E69C /* NetworkExtension.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -400,6 +470,40 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 585B10452577E293004F691E /* WireGuardKit */ = { + isa = PBXGroup; + children = ( + 585B104C2577E293004F691E /* Array+ConcurrentMap.swift */, + 585B104D2577E293004F691E /* DNSResolver.swift */, + 585B10482577E293004F691E /* DNSServer.swift */, + 585B10522577E293004F691E /* Endpoint.swift */, + 585B10462577E293004F691E /* InterfaceConfiguration.swift */, + 585B104E2577E293004F691E /* IPAddress+AddrInfo.swift */, + 585B10512577E293004F691E /* IPAddressRange.swift */, + 585B10502577E293004F691E /* PacketTunnelSettingsGenerator.swift */, + 585B10472577E293004F691E /* PeerConfiguration.swift */, + 585B104F2577E293004F691E /* PrivateKey.swift */, + 585B10492577E293004F691E /* TunnelConfiguration.swift */, + 585B104B2577E293004F691E /* WireGuardAdapter.swift */, + 585B104A2577E293004F691E /* WireGuardKit.swift */, + ); + name = WireGuardKit; + path = Sources/WireGuardKit; + sourceTree = ""; + }; + 585B10532577E293004F691E /* WireGuardKitC */ = { + isa = PBXGroup; + children = ( + 585B10572577E293004F691E /* key.c */, + 585B10552577E293004F691E /* key.h */, + 585B10542577E293004F691E /* WireGuardKitC.h */, + 585B10562577E293004F691E /* x25519.c */, + 585B10592577E293004F691E /* x25519.h */, + ); + name = WireGuardKitC; + path = Sources/WireGuardKitC; + sourceTree = ""; + }; 5F4541A721C44F5B00994C13 /* View */ = { isa = PBXGroup; children = ( @@ -653,6 +757,8 @@ 6F5D0C432183B4A4000F85AD /* Shared */, 6FF4AC16211EC46F002C96EB /* WireGuardApp */, 6F5D0C1B218352EF000F85AD /* WireGuardNetworkExtension */, + 585B10452577E293004F691E /* WireGuardKit */, + 585B10532577E293004F691E /* WireGuardKitC */, 6FF4AC15211EC46F002C96EB /* Products */, 6FF4AC452120B9E0002C96EB /* Frameworks */, ); @@ -746,7 +852,6 @@ ); name = WireGuardNetworkExtensioniOS; packageProductDependencies = ( - 5892BFF225594742000E678D /* WireGuardKit */, ); productName = WireGuardNetworkExtension; productReference = 6F5D0C1A218352EF000F85AD /* WireGuardNetworkExtension.appex */; @@ -787,7 +892,6 @@ ); name = WireGuardmacOS; packageProductDependencies = ( - 5892BFDC25593F80000E678D /* WireGuardKit */, ); productName = WireGuardmacOS; productReference = 6FB1BD5D21D2607A00A991BF /* WireGuard.app */; @@ -809,7 +913,6 @@ ); name = WireGuardNetworkExtensionmacOS; packageProductDependencies = ( - 5892BFDA25593F79000E678D /* WireGuardKit */, ); productName = WireGuardNetworkExtension; productReference = 6FB1BD9121D4BFE600A991BF /* WireGuardNetworkExtension.appex */; @@ -833,7 +936,6 @@ ); name = WireGuardiOS; packageProductDependencies = ( - 5892BF8E255581F6000E678D /* WireGuardKit */, ); productName = WireGuard; productReference = 6FF4AC14211EC46F002C96EB /* WireGuard.app */; @@ -918,7 +1020,6 @@ ); mainGroup = 6FF4AC0B211EC46F002C96EB; packageReferences = ( - 5892BF8D255581F6000E678D /* XCRemoteSwiftPackageReference "wireguard-apple" */, ); productRefGroup = 6FF4AC15211EC46F002C96EB /* Products */; projectDirPath = ""; @@ -1093,14 +1194,29 @@ buildActionMask = 2147483647; files = ( 6FF3527021C240160008484E /* ringlogger.c in Sources */, + 585B106F2577E294004F691E /* WireGuardAdapter.swift in Sources */, 6FF3527121C240160008484E /* Logger.swift in Sources */, 6F5A2B4621AFDED40081EDD8 /* FileManager+Extension.swift in Sources */, + 585B10772577E294004F691E /* DNSResolver.swift in Sources */, + 585B10872577E294004F691E /* IPAddressRange.swift in Sources */, + 585B106B2577E294004F691E /* WireGuardKit.swift in Sources */, 6FFA5DA021958ECC0001E2F7 /* ErrorNotifier.swift in Sources */, 5F9696B121CD7128008063FE /* TunnelConfiguration+WgQuickConfig.swift in Sources */, + 585B10832577E294004F691E /* PacketTunnelSettingsGenerator.swift in Sources */, + 585B105F2577E293004F691E /* PeerConfiguration.swift in Sources */, + 585B107F2577E294004F691E /* PrivateKey.swift in Sources */, + 585B10672577E294004F691E /* TunnelConfiguration.swift in Sources */, + 585B108F2577E294004F691E /* x25519.c in Sources */, 6B5C5E28220A48D30024272E /* Keychain.swift in Sources */, + 585B10932577E294004F691E /* key.c in Sources */, + 585B105B2577E293004F691E /* InterfaceConfiguration.swift in Sources */, + 585B107B2577E294004F691E /* IPAddress+AddrInfo.swift in Sources */, 6FFA5D96219446380001E2F7 /* NETunnelProviderProtocol+Extension.swift in Sources */, 5F9696AE21CD6F72008063FE /* String+ArrayConversion.swift in Sources */, + 585B10632577E293004F691E /* DNSServer.swift in Sources */, 5892BFA025558288000E678D /* PacketTunnelProvider.swift in Sources */, + 585B108B2577E294004F691E /* Endpoint.swift in Sources */, + 585B10732577E294004F691E /* Array+ConcurrentMap.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1124,6 +1240,10 @@ 6FB1BDD021D50F5300A991BF /* TunnelErrors.swift in Sources */, 6FB1BDD121D50F5300A991BF /* ZipImporter.swift in Sources */, 6FB1BDD221D50F5300A991BF /* ZipExporter.swift in Sources */, + 585B10782577E294004F691E /* DNSResolver.swift in Sources */, + 585B10642577E294004F691E /* DNSServer.swift in Sources */, + 585B108C2577E294004F691E /* Endpoint.swift in Sources */, + 585B10742577E294004F691E /* Array+ConcurrentMap.swift in Sources */, 6FBA104621D7EBFA0051C35F /* TunnelsListTableViewController.swift in Sources */, 6FB1BDD321D50F5300A991BF /* ZipArchive.swift in Sources */, 6FB1BDD421D50F5300A991BF /* ioapi.c in Sources */, @@ -1140,13 +1260,19 @@ 6F4DD16E21DBEA0700690EAE /* ManageTunnelsRootViewController.swift in Sources */, 6F4DD16C21DA558F00690EAE /* NSTableView+Reuse.swift in Sources */, 6FB1BDD821D50F5300A991BF /* WireGuardResult.swift in Sources */, + 585B10902577E294004F691E /* x25519.c in Sources */, 6B707D8621F918D4000A8F73 /* TunnelConfiguration+UapiConfig.swift in Sources */, + 585B10842577E294004F691E /* PacketTunnelSettingsGenerator.swift in Sources */, 6FB1BDD921D50F5300A991BF /* LocalizationHelper.swift in Sources */, + 585B10602577E293004F691E /* PeerConfiguration.swift in Sources */, 6F89E17C21F090CC00C97BB9 /* TunnelsTracker.swift in Sources */, 6B62E460220A6FA900EF34A6 /* PrivateDataConfirmation.swift in Sources */, + 585B107C2577E294004F691E /* IPAddress+AddrInfo.swift in Sources */, 6FCD99B121E0EDA900BA4C82 /* TunnelEditViewController.swift in Sources */, + 585B106C2577E294004F691E /* WireGuardKit.swift in Sources */, 6FB17946222FD5960018AE71 /* OnDemandWiFiControls.swift in Sources */, 6FB1BDBB21D50F0200A991BF /* Localizable.strings in Sources */, + 585B10882577E294004F691E /* IPAddressRange.swift in Sources */, 6FB1BDBC21D50F0200A991BF /* ringlogger.c in Sources */, 6FB1BDBD21D50F0200A991BF /* ringlogger.h in Sources */, 6FBA103F21D6B6FF0051C35F /* TunnelImporter.swift in Sources */, @@ -1166,14 +1292,19 @@ 6F1075642258AE9800D78929 /* DeleteTunnelsConfirmationAlert.swift in Sources */, 6FBA101821D656000051C35F /* StatusMenu.swift in Sources */, 6F613D9B21DE33B8004B217A /* KeyValueRow.swift in Sources */, + 585B10802577E294004F691E /* PrivateKey.swift in Sources */, 6FB1BDC121D50F0200A991BF /* String+ArrayConversion.swift in Sources */, 5F52D0BB21E3781B00283CEA /* ConfTextView.swift in Sources */, 6FBA104021D6B7040051C35F /* ErrorPresenterProtocol.swift in Sources */, 6FCD99AA21E0E14700BA4C82 /* ButtonedDetailViewController.swift in Sources */, 6FBA104321D6BC250051C35F /* ErrorPresenter.swift in Sources */, 6F2449E8226587B90047B9E9 /* MacAppStoreUpdateDetector.swift in Sources */, + 585B105C2577E293004F691E /* InterfaceConfiguration.swift in Sources */, 6F907C9D224663A2003CED21 /* LogViewHelper.swift in Sources */, + 585B10702577E294004F691E /* WireGuardAdapter.swift in Sources */, 6FB1BDC921D50F0300A991BF /* FileManager+Extension.swift in Sources */, + 585B10942577E294004F691E /* key.c in Sources */, + 585B10682577E294004F691E /* TunnelConfiguration.swift in Sources */, 6FB1BD6021D2607A00A991BF /* AppDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1183,14 +1314,29 @@ buildActionMask = 2147483647; files = ( 6FB1BDB321D4F55700A991BF /* ErrorNotifier.swift in Sources */, + 585B10712577E294004F691E /* WireGuardAdapter.swift in Sources */, 6FB1BDA221D4F53300A991BF /* ringlogger.c in Sources */, 6B5C5E2A220A48D30024272E /* Keychain.swift in Sources */, + 585B10792577E294004F691E /* DNSResolver.swift in Sources */, + 585B10892577E294004F691E /* IPAddressRange.swift in Sources */, + 585B106D2577E294004F691E /* WireGuardKit.swift in Sources */, 6FB1BDA421D4F53300A991BF /* Logger.swift in Sources */, 6FB1BDA521D4F53300A991BF /* TunnelConfiguration+WgQuickConfig.swift in Sources */, + 585B10852577E294004F691E /* PacketTunnelSettingsGenerator.swift in Sources */, + 585B10612577E293004F691E /* PeerConfiguration.swift in Sources */, + 585B10812577E294004F691E /* PrivateKey.swift in Sources */, + 585B10692577E294004F691E /* TunnelConfiguration.swift in Sources */, + 585B10912577E294004F691E /* x25519.c in Sources */, 6FB1BDA621D4F53300A991BF /* NETunnelProviderProtocol+Extension.swift in Sources */, + 585B10952577E294004F691E /* key.c in Sources */, + 585B105D2577E293004F691E /* InterfaceConfiguration.swift in Sources */, + 585B107D2577E294004F691E /* IPAddress+AddrInfo.swift in Sources */, 6FB1BDA721D4F53300A991BF /* String+ArrayConversion.swift in Sources */, 5892BFA125558288000E678D /* PacketTunnelProvider.swift in Sources */, + 585B10652577E294004F691E /* DNSServer.swift in Sources */, 6FB1BDAF21D4F53300A991BF /* FileManager+Extension.swift in Sources */, + 585B108D2577E294004F691E /* Endpoint.swift in Sources */, + 585B10752577E294004F691E /* Array+ConcurrentMap.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1199,17 +1345,24 @@ buildActionMask = 2147483647; files = ( 6FE1765A21C90E87002690EA /* LocalizationHelper.swift in Sources */, + 585B106E2577E294004F691E /* WireGuardAdapter.swift in Sources */, + 585B10762577E294004F691E /* DNSResolver.swift in Sources */, 6F29A94722787B1600DC6A6B /* QuickActionItem.swift in Sources */, + 585B105A2577E293004F691E /* InterfaceConfiguration.swift in Sources */, 6FF3527221C2616C0008484E /* ringlogger.c in Sources */, 6F0F44CB222D55FD00B0FF04 /* EditableTextCell.swift in Sources */, + 585B105E2577E293004F691E /* PeerConfiguration.swift in Sources */, 6FF3527321C2616C0008484E /* Logger.swift in Sources */, 6F7774E421718281006A79B3 /* TunnelsListTableViewController.swift in Sources */, + 585B108E2577E294004F691E /* x25519.c in Sources */, 6F7774EF21722D97006A79B3 /* TunnelsManager.swift in Sources */, 5F45417D21C1B23600994C13 /* UITableViewCell+Reuse.swift in Sources */, 5F45419221C2D55800994C13 /* CheckmarkCell.swift in Sources */, 6FE254FF219C60290028284D /* ZipExporter.swift in Sources */, 6F8F0D7122258153000E8335 /* ActivateOnDemandViewModel.swift in Sources */, 6F8F0D7722267C57000E8335 /* SSIDOptionEditTableViewController.swift in Sources */, + 585B10722577E294004F691E /* Array+ConcurrentMap.swift in Sources */, + 585B10622577E293004F691E /* DNSServer.swift in Sources */, 6FDEF7E62185EFB200D8FBF6 /* QRScanViewController.swift in Sources */, 6FDB6D18224CC05A00EE4BC3 /* LogViewController.swift in Sources */, 6FFA5D952194454A0001E2F7 /* NETunnelProviderProtocol+Extension.swift in Sources */, @@ -1224,14 +1377,17 @@ 6F628C3D217F09E9003482A3 /* TunnelViewModel.swift in Sources */, 5F4541A621C4449E00994C13 /* ButtonCell.swift in Sources */, 5F45419821C2D60500994C13 /* KeyValueCell.swift in Sources */, + 585B107A2577E294004F691E /* IPAddress+AddrInfo.swift in Sources */, 6FBA103E21D6B6D70051C35F /* TunnelImporter.swift in Sources */, 6F9B8A8E223398610041B9C4 /* SSIDOptionDetailTableViewController.swift in Sources */, 6F19D30422402B8700A126F2 /* ConfirmationAlertPresenter.swift in Sources */, + 585B10822577E294004F691E /* PacketTunnelSettingsGenerator.swift in Sources */, 6F919EC3218A2AE90023B400 /* ErrorPresenter.swift in Sources */, 6B62E45F220A6FA900EF34A6 /* PrivateDataConfirmation.swift in Sources */, 6F5A2B4821AFF49A0081EDD8 /* FileManager+Extension.swift in Sources */, 5F45418C21C2D48200994C13 /* TunnelEditKeyValueCell.swift in Sources */, 6FE254FB219C10800028284D /* ZipImporter.swift in Sources */, + 585B107E2577E294004F691E /* PrivateKey.swift in Sources */, 6FDEF7FB21863B6100D8FBF6 /* unzip.c in Sources */, 6F29A9432278518D00DC6A6B /* RecentTunnelsTracker.swift in Sources */, 6F0F44C9222D55BB00B0FF04 /* TextCell.swift in Sources */, @@ -1241,15 +1397,20 @@ 6F61F1EB21B937EF00483816 /* WireGuardResult.swift in Sources */, 6F7774F321774263006A79B3 /* TunnelEditTableViewController.swift in Sources */, 6FBA103B21D6B4290051C35F /* ErrorPresenterProtocol.swift in Sources */, + 585B10862577E294004F691E /* IPAddressRange.swift in Sources */, 6FDEF802218646BA00D8FBF6 /* ZipArchive.swift in Sources */, + 585B10922577E294004F691E /* key.c in Sources */, 5F45419021C2D53800994C13 /* SwitchCell.swift in Sources */, 6FB1017921C57DE600766195 /* MockTunnels.swift in Sources */, 6B707D8421F918D4000A8F73 /* TunnelConfiguration+UapiConfig.swift in Sources */, 6FDEF806218725D200D8FBF6 /* SettingsTableViewController.swift in Sources */, + 585B106A2577E294004F691E /* WireGuardKit.swift in Sources */, 5F4541A221C2D6DF00994C13 /* BorderedTextButton.swift in Sources */, + 585B10662577E294004F691E /* TunnelConfiguration.swift in Sources */, 6F7774E1217181B1006A79B3 /* MainViewController.swift in Sources */, 6FFA5DA42197085D0001E2F7 /* ActivateOnDemandOption.swift in Sources */, 5F4541B221CBFAEE00994C13 /* String+ArrayConversion.swift in Sources */, + 585B108A2577E294004F691E /* Endpoint.swift in Sources */, 6F907C9C224663A2003CED21 /* LogViewHelper.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1743,40 +1904,6 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ - -/* Begin XCRemoteSwiftPackageReference section */ - 5892BF8D255581F6000E678D /* XCRemoteSwiftPackageReference "wireguard-apple" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://git.zx2c4.com/wireguard-apple"; - requirement = { - branch = "am/wg-adapter-rebased"; - kind = branch; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 5892BF8E255581F6000E678D /* WireGuardKit */ = { - isa = XCSwiftPackageProductDependency; - package = 5892BF8D255581F6000E678D /* XCRemoteSwiftPackageReference "wireguard-apple" */; - productName = WireGuardKit; - }; - 5892BFDA25593F79000E678D /* WireGuardKit */ = { - isa = XCSwiftPackageProductDependency; - package = 5892BF8D255581F6000E678D /* XCRemoteSwiftPackageReference "wireguard-apple" */; - productName = WireGuardKit; - }; - 5892BFDC25593F80000E678D /* WireGuardKit */ = { - isa = XCSwiftPackageProductDependency; - package = 5892BF8D255581F6000E678D /* XCRemoteSwiftPackageReference "wireguard-apple" */; - productName = WireGuardKit; - }; - 5892BFF225594742000E678D /* WireGuardKit */ = { - isa = XCSwiftPackageProductDependency; - package = 5892BF8D255581F6000E678D /* XCRemoteSwiftPackageReference "wireguard-apple" */; - productName = WireGuardKit; - }; -/* End XCSwiftPackageProductDependency section */ }; rootObject = 6FF4AC0C211EC46F002C96EB /* Project object */; } diff --git a/WireGuard.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WireGuard.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 4aeec04..0000000 --- a/WireGuard.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,16 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "WireGuardKit", - "repositoryURL": "https://git.zx2c4.com/wireguard-apple", - "state": { - "branch": "am/wg-adapter-rebased", - "revision": "e52f83b915a985a945dff622e5f48fa52e96f045", - "version": null - } - } - ] - }, - "version": 1 -}