From fe665e8ad5e5e0320cdbd0d6c9a673c9246c4dfe Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Thu, 23 Aug 2018 12:09:44 +0200 Subject: [PATCH] Rename library to TunnelKit --- Podfile | 8 +- Podfile.lock | 2 +- {PIATunnel => TunnelKit-iOS}/Info.plist | 0 TunnelKit-macOS/Info.plist | 24 ++ .../project.pbxproj | 344 ++++++++++-------- .../xcschemes/TunnelKit-iOS.xcscheme | 30 +- .../xcschemes/TunnelKit-macOS.xcscheme | 27 +- .../xcschemes/TunnelKitHost.xcscheme | 24 +- .../contents.xcworkspacedata | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../Resources/AppExtension/PIA-ECC-256k1.pem | 0 .../Resources/AppExtension/PIA-ECC-256r1.pem | 0 .../Resources/AppExtension/PIA-ECC-521r1.pem | 0 .../Resources/AppExtension/PIA-RSA-2048.pem | 0 .../Resources/AppExtension/PIA-RSA-3072.pem | 0 .../Resources/AppExtension/PIA-RSA-4096.pem | 0 .../AppExtension/ConnectionStrategy.swift | 0 .../Sources/AppExtension/DNSResolver.swift | 0 .../Sources/AppExtension/GenericSocket.swift | 0 .../AppExtension/InterfaceObserver.swift | 0 .../Sources/AppExtension/Keychain.swift | 0 .../AppExtension/MemoryDestination.swift | 0 .../PIATunnelProvider+Configuration.swift | 0 .../PIATunnelProvider+Interaction.swift | 0 .../AppExtension/PIATunnelProvider.swift | 0 .../Transport/LinkInterface+Strategy.swift | 0 .../Transport/NETCPInterface.swift | 0 .../Transport/NETunnelInterface.swift | 0 .../Transport/NEUDPInterface.swift | 0 .../NWTCPConnectionState+Description.swift | 0 .../NWUDPSessionState+Description.swift | 0 .../Sources/AppExtension/Utils.swift | 0 .../Sources/Core/Allocation.h | 0 .../Sources/Core/Allocation.m | 0 .../Sources/Core/Authenticator.swift | 2 +- .../Sources/Core/CommunicationType.swift | 0 .../Sources/Core/CoreConfiguration.swift | 0 .../Sources/Core/CryptoAEAD.h | 0 .../Sources/Core/CryptoAEAD.m | 0 .../Sources/Core/CryptoBox.h | 0 .../Sources/Core/CryptoBox.m | 0 .../Sources/Core/CryptoCBC.h | 0 .../Sources/Core/CryptoCBC.m | 0 .../Sources/Core/CryptoMacros.h | 0 .../Sources/Core/Data+Manipulation.swift | 0 .../Sources/Core/DataPath.h | 0 .../Sources/Core/DataPath.m | 0 .../Sources/Core/DataPathEncryption.h | 0 .../Sources/Core/Encryption.h | 0 .../Sources/Core/EncryptionProxy.swift | 2 +- .../Sources/Core/Errors.h | 0 .../Sources/Core/Errors.m | 0 .../Sources/Core/IOInterface.swift | 0 .../Sources/Core/LinkInterface.swift | 0 {PIATunnel => TunnelKit}/Sources/Core/MSS.h | 0 {PIATunnel => TunnelKit}/Sources/Core/MSS.m | 0 .../Sources/Core/Packet.swift | 2 +- .../Sources/Core/PacketMacros.h | 0 .../Sources/Core/PacketMacros.m | 0 .../Sources/Core/ProtocolMacros.swift | 2 +- .../Sources/Core/PushReply.swift | 0 .../Sources/Core/ReplayProtector.h | 0 .../Sources/Core/ReplayProtector.m | 0 .../Sources/Core/SecureRandom.swift | 2 +- .../Sources/Core/SessionKey.swift | 2 +- .../Sources/Core/SessionProxy.swift | 2 +- .../Sources/Core/TLSBox.h | 0 .../Sources/Core/TLSBox.m | 0 .../Sources/Core/TunnelInterface.swift | 0 .../Sources/Core/TunnelSettings.swift | 0 .../Sources/Core/ZeroingData.h | 0 .../Sources/Core/ZeroingData.m | 0 .../Sources/Core/ZeroingData.swift | 2 +- .../Sources/Core/module.modulemap | 2 +- .../AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Base.lproj/LaunchScreen.storyboard | 0 .../Base.lproj/Main.storyboard | 0 {PIATunnelHost => TunnelKitHost}/Info.plist | 0 .../TunnelKitHost.entitlements | 4 +- .../ViewController.swift | 0 .../AppExtensionTests.swift | 4 +- .../DataManipulationTests.swift | 2 +- .../DataPathEncryptionTests.swift | 4 +- .../DataPathPerformanceTests.swift | 4 +- .../EncryptionPerformanceTests.swift | 4 +- .../EncryptionTests.swift | 4 +- {PIATunnelTests => TunnelKitTests}/Info.plist | 0 .../LinkTests.swift | 2 +- .../RandomTests.swift | 2 +- .../RawPerformanceTests.swift | 2 +- .../TestUtils.swift | 4 +- 92 files changed, 290 insertions(+), 225 deletions(-) rename {PIATunnel => TunnelKit-iOS}/Info.plist (100%) create mode 100644 TunnelKit-macOS/Info.plist rename {PIATunnel.xcodeproj => TunnelKit.xcodeproj}/project.pbxproj (87%) rename PIATunnel.xcodeproj/xcshareddata/xcschemes/PIATunnel-iOS.xcscheme => TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKit-iOS.xcscheme (78%) rename PIATunnel.xcodeproj/xcshareddata/xcschemes/PIATunnel-macOS.xcscheme => TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKit-macOS.xcscheme (73%) rename PIATunnel.xcodeproj/xcshareddata/xcschemes/PIATunnelHost.xcscheme => TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKitHost.xcscheme (81%) rename {PIATunnel.xcworkspace => TunnelKit.xcworkspace}/contents.xcworkspacedata (79%) rename {PIATunnel.xcworkspace => TunnelKit.xcworkspace}/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {PIATunnel => TunnelKit}/Resources/AppExtension/PIA-ECC-256k1.pem (100%) rename {PIATunnel => TunnelKit}/Resources/AppExtension/PIA-ECC-256r1.pem (100%) rename {PIATunnel => TunnelKit}/Resources/AppExtension/PIA-ECC-521r1.pem (100%) rename {PIATunnel => TunnelKit}/Resources/AppExtension/PIA-RSA-2048.pem (100%) rename {PIATunnel => TunnelKit}/Resources/AppExtension/PIA-RSA-3072.pem (100%) rename {PIATunnel => TunnelKit}/Resources/AppExtension/PIA-RSA-4096.pem (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/ConnectionStrategy.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/DNSResolver.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/GenericSocket.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/InterfaceObserver.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/Keychain.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/MemoryDestination.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/PIATunnelProvider+Configuration.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/PIATunnelProvider+Interaction.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/PIATunnelProvider.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/Transport/LinkInterface+Strategy.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/Transport/NETCPInterface.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/Transport/NETunnelInterface.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/Transport/NEUDPInterface.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/Transport/NWTCPConnectionState+Description.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/Transport/NWUDPSessionState+Description.swift (100%) rename {PIATunnel => TunnelKit}/Sources/AppExtension/Utils.swift (100%) rename {PIATunnel => TunnelKit}/Sources/Core/Allocation.h (100%) rename {PIATunnel => TunnelKit}/Sources/Core/Allocation.m (100%) rename {PIATunnel => TunnelKit}/Sources/Core/Authenticator.swift (99%) rename {PIATunnel => TunnelKit}/Sources/Core/CommunicationType.swift (100%) rename {PIATunnel => TunnelKit}/Sources/Core/CoreConfiguration.swift (100%) rename {PIATunnel => TunnelKit}/Sources/Core/CryptoAEAD.h (100%) rename {PIATunnel => TunnelKit}/Sources/Core/CryptoAEAD.m (100%) rename {PIATunnel => TunnelKit}/Sources/Core/CryptoBox.h (100%) rename {PIATunnel => TunnelKit}/Sources/Core/CryptoBox.m (100%) rename {PIATunnel => TunnelKit}/Sources/Core/CryptoCBC.h (100%) rename {PIATunnel => TunnelKit}/Sources/Core/CryptoCBC.m (100%) rename {PIATunnel => TunnelKit}/Sources/Core/CryptoMacros.h (100%) rename {PIATunnel => TunnelKit}/Sources/Core/Data+Manipulation.swift (100%) rename {PIATunnel => TunnelKit}/Sources/Core/DataPath.h (100%) rename {PIATunnel => TunnelKit}/Sources/Core/DataPath.m (100%) rename {PIATunnel => TunnelKit}/Sources/Core/DataPathEncryption.h (100%) rename {PIATunnel => TunnelKit}/Sources/Core/Encryption.h (100%) rename {PIATunnel => TunnelKit}/Sources/Core/EncryptionProxy.swift (99%) rename {PIATunnel => TunnelKit}/Sources/Core/Errors.h (100%) rename {PIATunnel => TunnelKit}/Sources/Core/Errors.m (100%) rename {PIATunnel => TunnelKit}/Sources/Core/IOInterface.swift (100%) rename {PIATunnel => TunnelKit}/Sources/Core/LinkInterface.swift (100%) rename {PIATunnel => TunnelKit}/Sources/Core/MSS.h (100%) rename {PIATunnel => TunnelKit}/Sources/Core/MSS.m (100%) rename {PIATunnel => TunnelKit}/Sources/Core/Packet.swift (98%) rename {PIATunnel => TunnelKit}/Sources/Core/PacketMacros.h (100%) rename {PIATunnel => TunnelKit}/Sources/Core/PacketMacros.m (100%) rename {PIATunnel => TunnelKit}/Sources/Core/ProtocolMacros.swift (94%) rename {PIATunnel => TunnelKit}/Sources/Core/PushReply.swift (100%) rename {PIATunnel => TunnelKit}/Sources/Core/ReplayProtector.h (100%) rename {PIATunnel => TunnelKit}/Sources/Core/ReplayProtector.m (100%) rename {PIATunnel => TunnelKit}/Sources/Core/SecureRandom.swift (98%) rename {PIATunnel => TunnelKit}/Sources/Core/SessionKey.swift (99%) rename {PIATunnel => TunnelKit}/Sources/Core/SessionProxy.swift (99%) rename {PIATunnel => TunnelKit}/Sources/Core/TLSBox.h (100%) rename {PIATunnel => TunnelKit}/Sources/Core/TLSBox.m (100%) rename {PIATunnel => TunnelKit}/Sources/Core/TunnelInterface.swift (100%) rename {PIATunnel => TunnelKit}/Sources/Core/TunnelSettings.swift (100%) rename {PIATunnel => TunnelKit}/Sources/Core/ZeroingData.h (100%) rename {PIATunnel => TunnelKit}/Sources/Core/ZeroingData.m (100%) rename {PIATunnel => TunnelKit}/Sources/Core/ZeroingData.swift (97%) rename {PIATunnel => TunnelKit}/Sources/Core/module.modulemap (91%) rename {PIATunnelHost => TunnelKitHost}/AppDelegate.swift (100%) rename {PIATunnelHost => TunnelKitHost}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {PIATunnelHost => TunnelKitHost}/Base.lproj/LaunchScreen.storyboard (100%) rename {PIATunnelHost => TunnelKitHost}/Base.lproj/Main.storyboard (100%) rename {PIATunnelHost => TunnelKitHost}/Info.plist (100%) rename PIATunnelHost/PIATunnelHost.entitlements => TunnelKitHost/TunnelKitHost.entitlements (73%) rename {PIATunnelHost => TunnelKitHost}/ViewController.swift (100%) rename {PIATunnelTests => TunnelKitTests}/AppExtensionTests.swift (97%) rename {PIATunnelTests => TunnelKitTests}/DataManipulationTests.swift (98%) rename {PIATunnelTests => TunnelKitTests}/DataPathEncryptionTests.swift (98%) rename {PIATunnelTests => TunnelKitTests}/DataPathPerformanceTests.swift (97%) rename {PIATunnelTests => TunnelKitTests}/EncryptionPerformanceTests.swift (96%) rename {PIATunnelTests => TunnelKitTests}/EncryptionTests.swift (97%) rename {PIATunnelTests => TunnelKitTests}/Info.plist (100%) rename {PIATunnelTests => TunnelKitTests}/LinkTests.swift (99%) rename {PIATunnelTests => TunnelKitTests}/RandomTests.swift (97%) rename {PIATunnelTests => TunnelKitTests}/RawPerformanceTests.swift (99%) rename {PIATunnelTests => TunnelKitTests}/TestUtils.swift (91%) diff --git a/Podfile b/Podfile index aee2285..4f57486 100644 --- a/Podfile +++ b/Podfile @@ -1,18 +1,18 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! -abstract_target 'PIATunnel' do +abstract_target 'TunnelKit' do pod 'SwiftyBeaver' pod 'OpenSSL-Apple', '~> 1.1.0h' - target 'PIATunnel-iOS' do + target 'TunnelKit-iOS' do platform :ios, '9.0' end - target 'PIATunnelHost' do + target 'TunnelKitHost' do platform :ios, '9.0' end - target 'PIATunnel-macOS' do + target 'TunnelKit-macOS' do platform :osx, '10.11' end end diff --git a/Podfile.lock b/Podfile.lock index 1254d23..5dce3e6 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -15,6 +15,6 @@ SPEC CHECKSUMS: OpenSSL-Apple: cd153d705ef350eb834ae7ff5f21f792b51ed208 SwiftyBeaver: e45759613e50b522b0e6f53b1f0f14389b45ca34 -PODFILE CHECKSUM: d93463e96c0da9f94811327c6e2b123c6453c591 +PODFILE CHECKSUM: db783bdfb06f72df39d3c99df20aafdb51e0f7c6 COCOAPODS: 1.5.3 diff --git a/PIATunnel/Info.plist b/TunnelKit-iOS/Info.plist similarity index 100% rename from PIATunnel/Info.plist rename to TunnelKit-iOS/Info.plist diff --git a/TunnelKit-macOS/Info.plist b/TunnelKit-macOS/Info.plist new file mode 100644 index 0000000..1007fd9 --- /dev/null +++ b/TunnelKit-macOS/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/PIATunnel.xcodeproj/project.pbxproj b/TunnelKit.xcodeproj/project.pbxproj similarity index 87% rename from PIATunnel.xcodeproj/project.pbxproj rename to TunnelKit.xcodeproj/project.pbxproj index 94bac45..bdd7fe5 100644 --- a/PIATunnel.xcodeproj/project.pbxproj +++ b/TunnelKit.xcodeproj/project.pbxproj @@ -19,7 +19,7 @@ 0E07597F20F0060E00F38FD8 /* CryptoAEAD.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E07597C20F0060E00F38FD8 /* CryptoAEAD.h */; }; 0E07598020F0060E00F38FD8 /* CryptoAEAD.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E07597D20F0060E00F38FD8 /* CryptoAEAD.m */; }; 0E07598120F0060E00F38FD8 /* CryptoAEAD.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E07597D20F0060E00F38FD8 /* CryptoAEAD.m */; }; - 0E11089F1F77B9E800A92462 /* PIATunnel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E17D7F91F730D9F009EE129 /* PIATunnel.framework */; }; + 0E11089F1F77B9E800A92462 /* TunnelKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E17D7F91F730D9F009EE129 /* TunnelKit.framework */; }; 0E1108AC1F77B9F900A92462 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E1108AB1F77B9F900A92462 /* AppDelegate.swift */; }; 0E1108AE1F77B9F900A92462 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E1108AD1F77B9F900A92462 /* ViewController.swift */; }; 0E1108B11F77B9F900A92462 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0E1108AF1F77B9F900A92462 /* Main.storyboard */; }; @@ -28,7 +28,7 @@ 0E3E0F212108A8CC00B371C1 /* PushReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E3E0F202108A8CC00B371C1 /* PushReply.swift */; }; 0E3E0F222108A8CC00B371C1 /* PushReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E3E0F202108A8CC00B371C1 /* PushReply.swift */; }; 0E85A25A202CC5AF0059E9F9 /* AppExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E85A259202CC5AE0059E9F9 /* AppExtensionTests.swift */; }; - 0E9379C91F819A4300CE91B6 /* PIATunnel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E17D7F91F730D9F009EE129 /* PIATunnel.framework */; }; + 0E9379C91F819A4300CE91B6 /* TunnelKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E17D7F91F730D9F009EE129 /* TunnelKit.framework */; }; 0EA8E2072024D4B200A92DB6 /* PIA-ECC-256k1.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0EA8E2042024D4B100A92DB6 /* PIA-ECC-256k1.pem */; }; 0EA8E2082024D4B200A92DB6 /* PIA-ECC-256r1.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0EA8E2052024D4B100A92DB6 /* PIA-ECC-256r1.pem */; }; 0EA8E2092024D4B200A92DB6 /* PIA-ECC-521r1.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0EA8E2062024D4B200A92DB6 /* PIA-ECC-521r1.pem */; }; @@ -148,9 +148,9 @@ 0EFEB4AF2007627700F81029 /* InterfaceObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4AA200760EC00F81029 /* InterfaceObserver.swift */; }; 0EFEB4B02007627700F81029 /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4AD2007625E00F81029 /* Keychain.swift */; }; 0EFEB4B12007627700F81029 /* MemoryDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4A9200760EB00F81029 /* MemoryDestination.swift */; }; - 7824F3587AB5DCEE2EC390DB /* Pods_PIATunnel_PIATunnelHost.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EA91073AAC5BE66714244D3 /* Pods_PIATunnel_PIATunnelHost.framework */; }; - 82BA0AEEFB1911C6CF99E721 /* Pods_PIATunnel_PIATunnel_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C017D38784E2EBDA13B546A9 /* Pods_PIATunnel_PIATunnel_macOS.framework */; }; - FBDC1B556E0886795C1FCAF6 /* Pods_PIATunnel_PIATunnel_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47F39D305605C29A803DF509 /* Pods_PIATunnel_PIATunnel_iOS.framework */; }; + 205A79DD5EDF645063CDBC16 /* Pods_TunnelKit_TunnelKit_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73F2594DBE84DB9DCF22DCE8 /* Pods_TunnelKit_TunnelKit_iOS.framework */; }; + 78CA21E0B83D03BFD7FC2E03 /* Pods_TunnelKit_TunnelKit_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E0A783BE29E5C5654FE2F58D /* Pods_TunnelKit_TunnelKit_macOS.framework */; }; + C1CBB3B61F20AD9CE46CA754 /* Pods_TunnelKit_TunnelKitHost.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 875A5271D7B3E0AAAE5C1816 /* Pods_TunnelKit_TunnelKitHost.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -184,21 +184,22 @@ 0E07596D20EF79B400F38FD8 /* CryptoCBC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoCBC.h; sourceTree = ""; }; 0E07597C20F0060E00F38FD8 /* CryptoAEAD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAEAD.h; sourceTree = ""; }; 0E07597D20F0060E00F38FD8 /* CryptoAEAD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CryptoAEAD.m; sourceTree = ""; }; - 0E11089A1F77B9E800A92462 /* PIATunnelTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PIATunnelTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 0E11089A1F77B9E800A92462 /* TunnelKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TunnelKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 0E11089E1F77B9E800A92462 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 0E1108A91F77B9F900A92462 /* PIATunnelHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PIATunnelHost.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 0E1108A91F77B9F900A92462 /* TunnelKitHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TunnelKitHost.app; sourceTree = BUILT_PRODUCTS_DIR; }; 0E1108AB1F77B9F900A92462 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 0E1108AD1F77B9F900A92462 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; 0E1108B01F77B9F900A92462 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 0E1108B21F77B9F900A92462 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 0E1108B51F77B9F900A92462 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 0E1108B71F77B9F900A92462 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 0E17D7F91F730D9F009EE129 /* PIATunnel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PIATunnel.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 0E17D7FD1F730D9F009EE129 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 0E3251C51F95770D00C108D9 /* PIATunnel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PIATunnel.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0E17D7F91F730D9F009EE129 /* TunnelKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TunnelKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0E3251C51F95770D00C108D9 /* TunnelKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TunnelKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 0E3E0F202108A8CC00B371C1 /* PushReply.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushReply.swift; sourceTree = ""; }; + 0E6479DD212EAC96008E6888 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 0E6479E0212EACD6008E6888 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0E85A259202CC5AE0059E9F9 /* AppExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppExtensionTests.swift; sourceTree = ""; }; - 0E85A25B202CCA3D0059E9F9 /* PIATunnelHost.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PIATunnelHost.entitlements; sourceTree = ""; }; + 0E85A25B202CCA3D0059E9F9 /* TunnelKitHost.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = TunnelKitHost.entitlements; sourceTree = ""; }; 0EA8E2042024D4B100A92DB6 /* PIA-ECC-256k1.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "PIA-ECC-256k1.pem"; sourceTree = ""; }; 0EA8E2052024D4B100A92DB6 /* PIA-ECC-256r1.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "PIA-ECC-256r1.pem"; sourceTree = ""; }; 0EA8E2062024D4B200A92DB6 /* PIA-ECC-521r1.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "PIA-ECC-521r1.pem"; sourceTree = ""; }; @@ -265,15 +266,15 @@ 0EFEB4A9200760EB00F81029 /* MemoryDestination.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MemoryDestination.swift; sourceTree = ""; }; 0EFEB4AA200760EC00F81029 /* InterfaceObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InterfaceObserver.swift; sourceTree = ""; }; 0EFEB4AD2007625E00F81029 /* Keychain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Keychain.swift; sourceTree = ""; }; - 2EA91073AAC5BE66714244D3 /* Pods_PIATunnel_PIATunnelHost.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PIATunnel_PIATunnelHost.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 47F39D305605C29A803DF509 /* Pods_PIATunnel_PIATunnel_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PIATunnel_PIATunnel_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4EF01042B93805901ADF144F /* Pods-PIATunnel-PIATunnel-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PIATunnel-PIATunnel-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PIATunnel-PIATunnel-iOS/Pods-PIATunnel-PIATunnel-iOS.debug.xcconfig"; sourceTree = ""; }; - 4FCEB45EA990C21162F820EE /* Pods-PIATunnel-PIATunnelHost.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PIATunnel-PIATunnelHost.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PIATunnel-PIATunnelHost/Pods-PIATunnel-PIATunnelHost.debug.xcconfig"; sourceTree = ""; }; - 5CCF5EF1B897AB67ECDE05D0 /* Pods-PIATunnel-PIATunnel-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PIATunnel-PIATunnel-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-PIATunnel-PIATunnel-iOS/Pods-PIATunnel-PIATunnel-iOS.release.xcconfig"; sourceTree = ""; }; - 889C502914303CDCADF8C2B9 /* Pods-PIATunnel-PIATunnel-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PIATunnel-PIATunnel-macOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-PIATunnel-PIATunnel-macOS/Pods-PIATunnel-PIATunnel-macOS.release.xcconfig"; sourceTree = ""; }; - 99F9C9FAEB7F699A60047D42 /* Pods-PIATunnel-PIATunnelHost.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PIATunnel-PIATunnelHost.release.xcconfig"; path = "Pods/Target Support Files/Pods-PIATunnel-PIATunnelHost/Pods-PIATunnel-PIATunnelHost.release.xcconfig"; sourceTree = ""; }; - C017D38784E2EBDA13B546A9 /* Pods_PIATunnel_PIATunnel_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PIATunnel_PIATunnel_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D65AFCC4FA1CB9B85E7B1451 /* Pods-PIATunnel-PIATunnel-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PIATunnel-PIATunnel-macOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PIATunnel-PIATunnel-macOS/Pods-PIATunnel-PIATunnel-macOS.debug.xcconfig"; sourceTree = ""; }; + 73F2594DBE84DB9DCF22DCE8 /* Pods_TunnelKit_TunnelKit_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TunnelKit_TunnelKit_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 875A5271D7B3E0AAAE5C1816 /* Pods_TunnelKit_TunnelKitHost.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TunnelKit_TunnelKitHost.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 88EE5F29451989D2EDB7FBA6 /* Pods-TunnelKit-TunnelKitHost.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TunnelKit-TunnelKitHost.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost.debug.xcconfig"; sourceTree = ""; }; + 89BF199CD1F1B6804FB8008E /* Pods-TunnelKit-TunnelKit-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TunnelKit-TunnelKit-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TunnelKit-TunnelKit-iOS/Pods-TunnelKit-TunnelKit-iOS.debug.xcconfig"; sourceTree = ""; }; + D3B922EA953EA9716301A292 /* Pods-TunnelKit-TunnelKit-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TunnelKit-TunnelKit-macOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-TunnelKit-TunnelKit-macOS/Pods-TunnelKit-TunnelKit-macOS.release.xcconfig"; sourceTree = ""; }; + D4E677B9AAC8BA7EA19CCDFB /* Pods-TunnelKit-TunnelKit-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TunnelKit-TunnelKit-macOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TunnelKit-TunnelKit-macOS/Pods-TunnelKit-TunnelKit-macOS.debug.xcconfig"; sourceTree = ""; }; + DD36CD5917CA219F98EB17C8 /* Pods-TunnelKit-TunnelKitHost.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TunnelKit-TunnelKitHost.release.xcconfig"; path = "Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost.release.xcconfig"; sourceTree = ""; }; + E0A783BE29E5C5654FE2F58D /* Pods_TunnelKit_TunnelKit_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TunnelKit_TunnelKit_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + ED46392C2330B34CA0838A71 /* Pods-TunnelKit-TunnelKit-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TunnelKit-TunnelKit-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-TunnelKit-TunnelKit-iOS/Pods-TunnelKit-TunnelKit-iOS.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -281,7 +282,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0E11089F1F77B9E800A92462 /* PIATunnel.framework in Frameworks */, + 0E11089F1F77B9E800A92462 /* TunnelKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -289,8 +290,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0E9379C91F819A4300CE91B6 /* PIATunnel.framework in Frameworks */, - 7824F3587AB5DCEE2EC390DB /* Pods_PIATunnel_PIATunnelHost.framework in Frameworks */, + 0E9379C91F819A4300CE91B6 /* TunnelKit.framework in Frameworks */, + C1CBB3B61F20AD9CE46CA754 /* Pods_TunnelKit_TunnelKitHost.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -298,7 +299,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FBDC1B556E0886795C1FCAF6 /* Pods_PIATunnel_PIATunnel_iOS.framework in Frameworks */, + 205A79DD5EDF645063CDBC16 /* Pods_TunnelKit_TunnelKit_iOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -306,14 +307,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 82BA0AEEFB1911C6CF99E721 /* Pods_PIATunnel_PIATunnel_macOS.framework in Frameworks */, + 78CA21E0B83D03BFD7FC2E03 /* Pods_TunnelKit_TunnelKit_macOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0E11089B1F77B9E800A92462 /* PIATunnelTests */ = { + 0E11089B1F77B9E800A92462 /* TunnelKitTests */ = { isa = PBXGroup; children = ( 0E11089E1F77B9E800A92462 /* Info.plist */, @@ -328,13 +329,13 @@ 0EB2B45C20F0BF41004233D7 /* RawPerformanceTests.swift */, 0EB2B45A20F0BE4C004233D7 /* TestUtils.swift */, ); - path = PIATunnelTests; + path = TunnelKitTests; sourceTree = ""; }; - 0E1108AA1F77B9F900A92462 /* PIATunnelHost */ = { + 0E1108AA1F77B9F900A92462 /* TunnelKitHost */ = { isa = PBXGroup; children = ( - 0E85A25B202CCA3D0059E9F9 /* PIATunnelHost.entitlements */, + 0E85A25B202CCA3D0059E9F9 /* TunnelKitHost.entitlements */, 0E1108AB1F77B9F900A92462 /* AppDelegate.swift */, 0E1108AD1F77B9F900A92462 /* ViewController.swift */, 0E1108AF1F77B9F900A92462 /* Main.storyboard */, @@ -342,40 +343,41 @@ 0E1108B41F77B9F900A92462 /* LaunchScreen.storyboard */, 0E1108B71F77B9F900A92462 /* Info.plist */, ); - path = PIATunnelHost; + path = TunnelKitHost; sourceTree = ""; }; 0E17D7EF1F730D9F009EE129 = { isa = PBXGroup; children = ( - 0E17D7FB1F730D9F009EE129 /* PIATunnel */, - 0E11089B1F77B9E800A92462 /* PIATunnelTests */, - 0E1108AA1F77B9F900A92462 /* PIATunnelHost */, + 0E17D7FB1F730D9F009EE129 /* TunnelKit */, + 0E6479DC212EAC96008E6888 /* TunnelKit-iOS */, + 0E6479DE212EAC96008E6888 /* TunnelKit-macOS */, + 0E11089B1F77B9E800A92462 /* TunnelKitTests */, + 0E1108AA1F77B9F900A92462 /* TunnelKitHost */, 0E17D7FA1F730D9F009EE129 /* Products */, - CC09E28B727F735539F4CBE9 /* Pods */, - 8C8D529E2705C98E32A8218E /* Frameworks */, + 6D72A12EF3BD3F60205E4F36 /* Pods */, + FDD1C536E3EF0E70EFF9396A /* Frameworks */, ); sourceTree = ""; }; 0E17D7FA1F730D9F009EE129 /* Products */ = { isa = PBXGroup; children = ( - 0E17D7F91F730D9F009EE129 /* PIATunnel.framework */, - 0E11089A1F77B9E800A92462 /* PIATunnelTests.xctest */, - 0E1108A91F77B9F900A92462 /* PIATunnelHost.app */, - 0E3251C51F95770D00C108D9 /* PIATunnel.framework */, + 0E17D7F91F730D9F009EE129 /* TunnelKit.framework */, + 0E11089A1F77B9E800A92462 /* TunnelKitTests.xctest */, + 0E1108A91F77B9F900A92462 /* TunnelKitHost.app */, + 0E3251C51F95770D00C108D9 /* TunnelKit.framework */, ); name = Products; sourceTree = ""; }; - 0E17D7FB1F730D9F009EE129 /* PIATunnel */ = { + 0E17D7FB1F730D9F009EE129 /* TunnelKit */ = { isa = PBXGroup; children = ( 0EFEB47E2006D3D000F81029 /* Resources */, 0E17D8041F730DDD009EE129 /* Sources */, - 0E17D7FD1F730D9F009EE129 /* Info.plist */, ); - path = PIATunnel; + path = TunnelKit; sourceTree = ""; }; 0E17D8041F730DDD009EE129 /* Sources */ = { @@ -387,6 +389,22 @@ path = Sources; sourceTree = ""; }; + 0E6479DC212EAC96008E6888 /* TunnelKit-iOS */ = { + isa = PBXGroup; + children = ( + 0E6479E0212EACD6008E6888 /* Info.plist */, + ); + path = "TunnelKit-iOS"; + sourceTree = ""; + }; + 0E6479DE212EAC96008E6888 /* TunnelKit-macOS */ = { + isa = PBXGroup; + children = ( + 0E6479DD212EAC96008E6888 /* Info.plist */, + ); + path = "TunnelKit-macOS"; + sourceTree = ""; + }; 0EBBF2E32084FDF400E36B40 /* Transport */ = { isa = PBXGroup; children = ( @@ -488,29 +506,29 @@ path = AppExtension; sourceTree = ""; }; - 8C8D529E2705C98E32A8218E /* Frameworks */ = { + 6D72A12EF3BD3F60205E4F36 /* Pods */ = { isa = PBXGroup; children = ( - 47F39D305605C29A803DF509 /* Pods_PIATunnel_PIATunnel_iOS.framework */, - C017D38784E2EBDA13B546A9 /* Pods_PIATunnel_PIATunnel_macOS.framework */, - 2EA91073AAC5BE66714244D3 /* Pods_PIATunnel_PIATunnelHost.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - CC09E28B727F735539F4CBE9 /* Pods */ = { - isa = PBXGroup; - children = ( - 4EF01042B93805901ADF144F /* Pods-PIATunnel-PIATunnel-iOS.debug.xcconfig */, - 5CCF5EF1B897AB67ECDE05D0 /* Pods-PIATunnel-PIATunnel-iOS.release.xcconfig */, - D65AFCC4FA1CB9B85E7B1451 /* Pods-PIATunnel-PIATunnel-macOS.debug.xcconfig */, - 889C502914303CDCADF8C2B9 /* Pods-PIATunnel-PIATunnel-macOS.release.xcconfig */, - 4FCEB45EA990C21162F820EE /* Pods-PIATunnel-PIATunnelHost.debug.xcconfig */, - 99F9C9FAEB7F699A60047D42 /* Pods-PIATunnel-PIATunnelHost.release.xcconfig */, + 89BF199CD1F1B6804FB8008E /* Pods-TunnelKit-TunnelKit-iOS.debug.xcconfig */, + ED46392C2330B34CA0838A71 /* Pods-TunnelKit-TunnelKit-iOS.release.xcconfig */, + D4E677B9AAC8BA7EA19CCDFB /* Pods-TunnelKit-TunnelKit-macOS.debug.xcconfig */, + D3B922EA953EA9716301A292 /* Pods-TunnelKit-TunnelKit-macOS.release.xcconfig */, + 88EE5F29451989D2EDB7FBA6 /* Pods-TunnelKit-TunnelKitHost.debug.xcconfig */, + DD36CD5917CA219F98EB17C8 /* Pods-TunnelKit-TunnelKitHost.release.xcconfig */, ); name = Pods; sourceTree = ""; }; + FDD1C536E3EF0E70EFF9396A /* Frameworks */ = { + isa = PBXGroup; + children = ( + 73F2594DBE84DB9DCF22DCE8 /* Pods_TunnelKit_TunnelKit_iOS.framework */, + E0A783BE29E5C5654FE2F58D /* Pods_TunnelKit_TunnelKit_macOS.framework */, + 875A5271D7B3E0AAAE5C1816 /* Pods_TunnelKit_TunnelKitHost.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -555,9 +573,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 0E1108991F77B9E800A92462 /* PIATunnelTests */ = { + 0E1108991F77B9E800A92462 /* TunnelKitTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 0E1108A41F77B9E800A92462 /* Build configuration list for PBXNativeTarget "PIATunnelTests" */; + buildConfigurationList = 0E1108A41F77B9E800A92462 /* Build configuration list for PBXNativeTarget "TunnelKitTests" */; buildPhases = ( 0E1108961F77B9E800A92462 /* Sources */, 0E1108971F77B9E800A92462 /* Frameworks */, @@ -569,36 +587,36 @@ 0E1108A11F77B9E800A92462 /* PBXTargetDependency */, 0E1108BC1F77BA0200A92462 /* PBXTargetDependency */, ); - name = PIATunnelTests; + name = TunnelKitTests; productName = PIATunnelTests; - productReference = 0E11089A1F77B9E800A92462 /* PIATunnelTests.xctest */; + productReference = 0E11089A1F77B9E800A92462 /* TunnelKitTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 0E1108A81F77B9F900A92462 /* PIATunnelHost */ = { + 0E1108A81F77B9F900A92462 /* TunnelKitHost */ = { isa = PBXNativeTarget; - buildConfigurationList = 0E1108B81F77B9F900A92462 /* Build configuration list for PBXNativeTarget "PIATunnelHost" */; + buildConfigurationList = 0E1108B81F77B9F900A92462 /* Build configuration list for PBXNativeTarget "TunnelKitHost" */; buildPhases = ( - E92F2EA8869D758CA069C089 /* [CP] Check Pods Manifest.lock */, + 94AA64A70C6BF0AD8E5BA279 /* [CP] Check Pods Manifest.lock */, 0E1108A51F77B9F900A92462 /* Sources */, 0E1108A61F77B9F900A92462 /* Frameworks */, 0E1108A71F77B9F900A92462 /* Resources */, - D8CE7C5A74A8E75A0756E08F /* [CP] Embed Pods Frameworks */, + B90665BB6148F76EE6C7B876 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( 0E9379CB1F819A4600CE91B6 /* PBXTargetDependency */, ); - name = PIATunnelHost; + name = TunnelKitHost; productName = PIATunnelHost; - productReference = 0E1108A91F77B9F900A92462 /* PIATunnelHost.app */; + productReference = 0E1108A91F77B9F900A92462 /* TunnelKitHost.app */; productType = "com.apple.product-type.application"; }; - 0E17D7F81F730D9F009EE129 /* PIATunnel-iOS */ = { + 0E17D7F81F730D9F009EE129 /* TunnelKit-iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 0E17D8011F730D9F009EE129 /* Build configuration list for PBXNativeTarget "PIATunnel-iOS" */; + buildConfigurationList = 0E17D8011F730D9F009EE129 /* Build configuration list for PBXNativeTarget "TunnelKit-iOS" */; buildPhases = ( - B81ED2229B05F6217EE28199 /* [CP] Check Pods Manifest.lock */, + 0CF41397A3ED0F655784A1E9 /* [CP] Check Pods Manifest.lock */, 0E17D7F41F730D9F009EE129 /* Sources */, 0E17D7F51F730D9F009EE129 /* Frameworks */, 0E17D7F61F730D9F009EE129 /* Headers */, @@ -608,16 +626,16 @@ ); dependencies = ( ); - name = "PIATunnel-iOS"; + name = "TunnelKit-iOS"; productName = PIATunnel; - productReference = 0E17D7F91F730D9F009EE129 /* PIATunnel.framework */; + productReference = 0E17D7F91F730D9F009EE129 /* TunnelKit.framework */; productType = "com.apple.product-type.framework"; }; - 0E3251C41F95770D00C108D9 /* PIATunnel-macOS */ = { + 0E3251C41F95770D00C108D9 /* TunnelKit-macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 0E3251CA1F95770D00C108D9 /* Build configuration list for PBXNativeTarget "PIATunnel-macOS" */; + buildConfigurationList = 0E3251CA1F95770D00C108D9 /* Build configuration list for PBXNativeTarget "TunnelKit-macOS" */; buildPhases = ( - 5578C17CB1FA354FB3939356 /* [CP] Check Pods Manifest.lock */, + B26C9A240EEC9E35A64B6EFA /* [CP] Check Pods Manifest.lock */, 0E3251C01F95770D00C108D9 /* Sources */, 0E3251C11F95770D00C108D9 /* Frameworks */, 0E3251C21F95770D00C108D9 /* Headers */, @@ -627,9 +645,9 @@ ); dependencies = ( ); - name = "PIATunnel-macOS"; + name = "TunnelKit-macOS"; productName = "PIATunnel-macOS"; - productReference = 0E3251C51F95770D00C108D9 /* PIATunnel.framework */; + productReference = 0E3251C51F95770D00C108D9 /* TunnelKit.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -640,7 +658,7 @@ attributes = { LastSwiftUpdateCheck = 0900; LastUpgradeCheck = 0930; - ORGANIZATIONNAME = "London Trust Media"; + ORGANIZATIONNAME = "Davide De Rosa"; TargetAttributes = { 0E1108991F77B9E800A92462 = { CreatedOnToolsVersion = 9.0; @@ -669,7 +687,7 @@ }; }; }; - buildConfigurationList = 0E17D7F31F730D9F009EE129 /* Build configuration list for PBXProject "PIATunnel" */; + buildConfigurationList = 0E17D7F31F730D9F009EE129 /* Build configuration list for PBXProject "TunnelKit" */; compatibilityVersion = "Xcode 8.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -682,10 +700,10 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 0E17D7F81F730D9F009EE129 /* PIATunnel-iOS */, - 0E3251C41F95770D00C108D9 /* PIATunnel-macOS */, - 0E1108991F77B9E800A92462 /* PIATunnelTests */, - 0E1108A81F77B9F900A92462 /* PIATunnelHost */, + 0E17D7F81F730D9F009EE129 /* TunnelKit-iOS */, + 0E3251C41F95770D00C108D9 /* TunnelKit-macOS */, + 0E1108991F77B9E800A92462 /* TunnelKitTests */, + 0E1108A81F77B9F900A92462 /* TunnelKitHost */, ); }; /* End PBXProject section */ @@ -737,78 +755,94 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 5578C17CB1FA354FB3939356 /* [CP] Check Pods Manifest.lock */ = { + 0CF41397A3ED0F655784A1E9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( "${PODS_PODFILE_DIR_PATH}/Podfile.lock", "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-PIATunnel-PIATunnel-macOS-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-TunnelKit-TunnelKit-iOS-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - B81ED2229B05F6217EE28199 /* [CP] Check Pods Manifest.lock */ = { + 94AA64A70C6BF0AD8E5BA279 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( "${PODS_PODFILE_DIR_PATH}/Podfile.lock", "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-PIATunnel-PIATunnel-iOS-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-TunnelKit-TunnelKitHost-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - D8CE7C5A74A8E75A0756E08F /* [CP] Embed Pods Frameworks */ = { + B26C9A240EEC9E35A64B6EFA /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); + inputFileListPaths = ( + ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-PIATunnel-PIATunnelHost/Pods-PIATunnel-PIATunnelHost-frameworks.sh", + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-TunnelKit-TunnelKit-macOS-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + B90665BB6148F76EE6C7B876 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh", "${PODS_ROOT}/OpenSSL-Apple/frameworks/iPhone/openssl.framework", "${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework", ); name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + ); outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PIATunnel-PIATunnelHost/Pods-PIATunnel-PIATunnelHost-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - E92F2EA8869D758CA069C089 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-PIATunnel-PIATunnelHost-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -947,17 +981,17 @@ /* Begin PBXTargetDependency section */ 0E1108A11F77B9E800A92462 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 0E17D7F81F730D9F009EE129 /* PIATunnel-iOS */; + target = 0E17D7F81F730D9F009EE129 /* TunnelKit-iOS */; targetProxy = 0E1108A01F77B9E800A92462 /* PBXContainerItemProxy */; }; 0E1108BC1F77BA0200A92462 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 0E1108A81F77B9F900A92462 /* PIATunnelHost */; + target = 0E1108A81F77B9F900A92462 /* TunnelKitHost */; targetProxy = 0E1108BB1F77BA0200A92462 /* PBXContainerItemProxy */; }; 0E9379CB1F819A4600CE91B6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 0E17D7F81F730D9F009EE129 /* PIATunnel-iOS */; + target = 0E17D7F81F730D9F009EE129 /* TunnelKit-iOS */; targetProxy = 0E9379CA1F819A4600CE91B6 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -987,13 +1021,12 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = PIATunnelTests/Info.plist; + DEVELOPMENT_TEAM = DTDYD63ZX9; + INFOPLIST_FILE = TunnelKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnelTests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PIATunnelHost.app/PIATunnelHost"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TunnelKitHost.app/TunnelKitHost"; }; name = Debug; }; @@ -1002,27 +1035,26 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = PIATunnelTests/Info.plist; + DEVELOPMENT_TEAM = DTDYD63ZX9; + INFOPLIST_FILE = TunnelKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnelTests; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PIATunnelHost.app/PIATunnelHost"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TunnelKitHost.app/TunnelKitHost"; }; name = Release; }; 0E1108B91F77B9F900A92462 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4FCEB45EA990C21162F820EE /* Pods-PIATunnel-PIATunnelHost.debug.xcconfig */; + baseConfigurationReference = 88EE5F29451989D2EDB7FBA6 /* Pods-TunnelKit-TunnelKitHost.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = PIATunnelHost/PIATunnelHost.entitlements; + CODE_SIGN_ENTITLEMENTS = TunnelKitHost/TunnelKitHost.entitlements; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 5357M5NW9W; - INFOPLIST_FILE = PIATunnelHost/Info.plist; + DEVELOPMENT_TEAM = DTDYD63ZX9; + INFOPLIST_FILE = TunnelKitHost/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnelHost; + PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.ios.TunnelKitHost; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -1030,15 +1062,15 @@ }; 0E1108BA1F77B9F900A92462 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 99F9C9FAEB7F699A60047D42 /* Pods-PIATunnel-PIATunnelHost.release.xcconfig */; + baseConfigurationReference = DD36CD5917CA219F98EB17C8 /* Pods-TunnelKit-TunnelKitHost.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = PIATunnelHost/PIATunnelHost.entitlements; + CODE_SIGN_ENTITLEMENTS = TunnelKitHost/TunnelKitHost.entitlements; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 5357M5NW9W; - INFOPLIST_FILE = PIATunnelHost/Info.plist; + DEVELOPMENT_TEAM = DTDYD63ZX9; + INFOPLIST_FILE = TunnelKitHost/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnelHost; + PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.ios.TunnelKitHost; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -1167,7 +1199,7 @@ }; 0E17D8021F730D9F009EE129 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4EF01042B93805901ADF144F /* Pods-PIATunnel-PIATunnel-iOS.debug.xcconfig */; + baseConfigurationReference = 89BF199CD1F1B6804FB8008E /* Pods-TunnelKit-TunnelKit-iOS.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -1177,20 +1209,20 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = PIATunnel/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-iOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnel; - PRODUCT_NAME = PIATunnel; + PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.apple.TunnelKit; + PRODUCT_NAME = TunnelKit; SKIP_INSTALL = YES; - SWIFT_INCLUDE_PATHS = "$(SRCROOT)/PIATunnel/Sources"; + SWIFT_INCLUDE_PATHS = "$(SRCROOT)/TunnelKit/Sources"; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; 0E17D8031F730D9F009EE129 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5CCF5EF1B897AB67ECDE05D0 /* Pods-PIATunnel-PIATunnel-iOS.release.xcconfig */; + baseConfigurationReference = ED46392C2330B34CA0838A71 /* Pods-TunnelKit-TunnelKit-iOS.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -1200,20 +1232,20 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; - INFOPLIST_FILE = PIATunnel/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-iOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnel; - PRODUCT_NAME = PIATunnel; + PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.apple.TunnelKit; + PRODUCT_NAME = TunnelKit; SKIP_INSTALL = YES; - SWIFT_INCLUDE_PATHS = "$(SRCROOT)/PIATunnel/Sources"; + SWIFT_INCLUDE_PATHS = "$(SRCROOT)/TunnelKit/Sources"; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; 0E3251CB1F95770D00C108D9 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D65AFCC4FA1CB9B85E7B1451 /* Pods-PIATunnel-PIATunnel-macOS.debug.xcconfig */; + baseConfigurationReference = D4E677B9AAC8BA7EA19CCDFB /* Pods-TunnelKit-TunnelKit-macOS.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; @@ -1223,20 +1255,20 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; - INFOPLIST_FILE = PIATunnel/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-macOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnel; - PRODUCT_NAME = PIATunnel; + PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.apple.TunnelKit; + PRODUCT_NAME = TunnelKit; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_INCLUDE_PATHS = "$(SRCROOT)/PIATunnel/Sources"; + SWIFT_INCLUDE_PATHS = "$(SRCROOT)/TunnelKit/Sources"; }; name = Debug; }; 0E3251CC1F95770D00C108D9 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 889C502914303CDCADF8C2B9 /* Pods-PIATunnel-PIATunnel-macOS.release.xcconfig */; + baseConfigurationReference = D3B922EA953EA9716301A292 /* Pods-TunnelKit-TunnelKit-macOS.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; @@ -1246,21 +1278,21 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; - INFOPLIST_FILE = PIATunnel/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-macOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnel; - PRODUCT_NAME = PIATunnel; + PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.apple.TunnelKit; + PRODUCT_NAME = TunnelKit; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_INCLUDE_PATHS = "$(SRCROOT)/PIATunnel/Sources"; + SWIFT_INCLUDE_PATHS = "$(SRCROOT)/TunnelKit/Sources"; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 0E1108A41F77B9E800A92462 /* Build configuration list for PBXNativeTarget "PIATunnelTests" */ = { + 0E1108A41F77B9E800A92462 /* Build configuration list for PBXNativeTarget "TunnelKitTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 0E1108A21F77B9E800A92462 /* Debug */, @@ -1269,7 +1301,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 0E1108B81F77B9F900A92462 /* Build configuration list for PBXNativeTarget "PIATunnelHost" */ = { + 0E1108B81F77B9F900A92462 /* Build configuration list for PBXNativeTarget "TunnelKitHost" */ = { isa = XCConfigurationList; buildConfigurations = ( 0E1108B91F77B9F900A92462 /* Debug */, @@ -1278,7 +1310,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 0E17D7F31F730D9F009EE129 /* Build configuration list for PBXProject "PIATunnel" */ = { + 0E17D7F31F730D9F009EE129 /* Build configuration list for PBXProject "TunnelKit" */ = { isa = XCConfigurationList; buildConfigurations = ( 0E17D7FF1F730D9F009EE129 /* Debug */, @@ -1287,7 +1319,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 0E17D8011F730D9F009EE129 /* Build configuration list for PBXNativeTarget "PIATunnel-iOS" */ = { + 0E17D8011F730D9F009EE129 /* Build configuration list for PBXNativeTarget "TunnelKit-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 0E17D8021F730D9F009EE129 /* Debug */, @@ -1296,7 +1328,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 0E3251CA1F95770D00C108D9 /* Build configuration list for PBXNativeTarget "PIATunnel-macOS" */ = { + 0E3251CA1F95770D00C108D9 /* Build configuration list for PBXNativeTarget "TunnelKit-macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 0E3251CB1F95770D00C108D9 /* Debug */, diff --git a/PIATunnel.xcodeproj/xcshareddata/xcschemes/PIATunnel-iOS.xcscheme b/TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKit-iOS.xcscheme similarity index 78% rename from PIATunnel.xcodeproj/xcshareddata/xcschemes/PIATunnel-iOS.xcscheme rename to TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKit-iOS.xcscheme index ffb8869..8da558b 100644 --- a/PIATunnel.xcodeproj/xcshareddata/xcschemes/PIATunnel-iOS.xcscheme +++ b/TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKit-iOS.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "TunnelKit.framework" + BlueprintName = "TunnelKit-iOS" + ReferencedContainer = "container:TunnelKit.xcodeproj"> @@ -33,9 +33,9 @@ + BuildableName = "TunnelKitTests.xctest" + BlueprintName = "TunnelKitTests" + ReferencedContainer = "container:TunnelKit.xcodeproj"> @@ -43,9 +43,9 @@ + BuildableName = "TunnelKit.framework" + BlueprintName = "TunnelKit-iOS" + ReferencedContainer = "container:TunnelKit.xcodeproj"> @@ -65,9 +65,9 @@ + BuildableName = "TunnelKit.framework" + BlueprintName = "TunnelKit-iOS" + ReferencedContainer = "container:TunnelKit.xcodeproj"> @@ -83,9 +83,9 @@ + BuildableName = "TunnelKit.framework" + BlueprintName = "TunnelKit-iOS" + ReferencedContainer = "container:TunnelKit.xcodeproj"> diff --git a/PIATunnel.xcodeproj/xcshareddata/xcschemes/PIATunnel-macOS.xcscheme b/TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKit-macOS.xcscheme similarity index 73% rename from PIATunnel.xcodeproj/xcshareddata/xcschemes/PIATunnel-macOS.xcscheme rename to TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKit-macOS.xcscheme index bd4e83b..cf61719 100644 --- a/PIATunnel.xcodeproj/xcshareddata/xcschemes/PIATunnel-macOS.xcscheme +++ b/TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKit-macOS.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "TunnelKit.framework" + BlueprintName = "TunnelKit-macOS" + ReferencedContainer = "container:TunnelKit.xcodeproj"> @@ -29,6 +29,15 @@ shouldUseLaunchSchemeArgsEnv = "YES"> + + + + @@ -46,9 +55,9 @@ + BuildableName = "TunnelKit.framework" + BlueprintName = "TunnelKit-macOS" + ReferencedContainer = "container:TunnelKit.xcodeproj"> @@ -64,9 +73,9 @@ + BuildableName = "TunnelKit.framework" + BlueprintName = "TunnelKit-macOS" + ReferencedContainer = "container:TunnelKit.xcodeproj"> diff --git a/PIATunnel.xcodeproj/xcshareddata/xcschemes/PIATunnelHost.xcscheme b/TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKitHost.xcscheme similarity index 81% rename from PIATunnel.xcodeproj/xcshareddata/xcschemes/PIATunnelHost.xcscheme rename to TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKitHost.xcscheme index c90e370..9df5e0b 100644 --- a/PIATunnel.xcodeproj/xcshareddata/xcschemes/PIATunnelHost.xcscheme +++ b/TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKitHost.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "TunnelKitHost.app" + BlueprintName = "TunnelKitHost" + ReferencedContainer = "container:TunnelKit.xcodeproj"> @@ -33,9 +33,9 @@ + BuildableName = "TunnelKitHost.app" + BlueprintName = "TunnelKitHost" + ReferencedContainer = "container:TunnelKit.xcodeproj"> @@ -56,9 +56,9 @@ + BuildableName = "TunnelKitHost.app" + BlueprintName = "TunnelKitHost" + ReferencedContainer = "container:TunnelKit.xcodeproj"> @@ -75,9 +75,9 @@ + BuildableName = "TunnelKitHost.app" + BlueprintName = "TunnelKitHost" + ReferencedContainer = "container:TunnelKit.xcodeproj"> diff --git a/PIATunnel.xcworkspace/contents.xcworkspacedata b/TunnelKit.xcworkspace/contents.xcworkspacedata similarity index 79% rename from PIATunnel.xcworkspace/contents.xcworkspacedata rename to TunnelKit.xcworkspace/contents.xcworkspacedata index ea3ba69..d0e4eb8 100644 --- a/PIATunnel.xcworkspace/contents.xcworkspacedata +++ b/TunnelKit.xcworkspace/contents.xcworkspacedata @@ -2,7 +2,7 @@ + location = "group:TunnelKit.xcodeproj"> diff --git a/PIATunnel.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/TunnelKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from PIATunnel.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to TunnelKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/PIATunnel/Resources/AppExtension/PIA-ECC-256k1.pem b/TunnelKit/Resources/AppExtension/PIA-ECC-256k1.pem similarity index 100% rename from PIATunnel/Resources/AppExtension/PIA-ECC-256k1.pem rename to TunnelKit/Resources/AppExtension/PIA-ECC-256k1.pem diff --git a/PIATunnel/Resources/AppExtension/PIA-ECC-256r1.pem b/TunnelKit/Resources/AppExtension/PIA-ECC-256r1.pem similarity index 100% rename from PIATunnel/Resources/AppExtension/PIA-ECC-256r1.pem rename to TunnelKit/Resources/AppExtension/PIA-ECC-256r1.pem diff --git a/PIATunnel/Resources/AppExtension/PIA-ECC-521r1.pem b/TunnelKit/Resources/AppExtension/PIA-ECC-521r1.pem similarity index 100% rename from PIATunnel/Resources/AppExtension/PIA-ECC-521r1.pem rename to TunnelKit/Resources/AppExtension/PIA-ECC-521r1.pem diff --git a/PIATunnel/Resources/AppExtension/PIA-RSA-2048.pem b/TunnelKit/Resources/AppExtension/PIA-RSA-2048.pem similarity index 100% rename from PIATunnel/Resources/AppExtension/PIA-RSA-2048.pem rename to TunnelKit/Resources/AppExtension/PIA-RSA-2048.pem diff --git a/PIATunnel/Resources/AppExtension/PIA-RSA-3072.pem b/TunnelKit/Resources/AppExtension/PIA-RSA-3072.pem similarity index 100% rename from PIATunnel/Resources/AppExtension/PIA-RSA-3072.pem rename to TunnelKit/Resources/AppExtension/PIA-RSA-3072.pem diff --git a/PIATunnel/Resources/AppExtension/PIA-RSA-4096.pem b/TunnelKit/Resources/AppExtension/PIA-RSA-4096.pem similarity index 100% rename from PIATunnel/Resources/AppExtension/PIA-RSA-4096.pem rename to TunnelKit/Resources/AppExtension/PIA-RSA-4096.pem diff --git a/PIATunnel/Sources/AppExtension/ConnectionStrategy.swift b/TunnelKit/Sources/AppExtension/ConnectionStrategy.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/ConnectionStrategy.swift rename to TunnelKit/Sources/AppExtension/ConnectionStrategy.swift diff --git a/PIATunnel/Sources/AppExtension/DNSResolver.swift b/TunnelKit/Sources/AppExtension/DNSResolver.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/DNSResolver.swift rename to TunnelKit/Sources/AppExtension/DNSResolver.swift diff --git a/PIATunnel/Sources/AppExtension/GenericSocket.swift b/TunnelKit/Sources/AppExtension/GenericSocket.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/GenericSocket.swift rename to TunnelKit/Sources/AppExtension/GenericSocket.swift diff --git a/PIATunnel/Sources/AppExtension/InterfaceObserver.swift b/TunnelKit/Sources/AppExtension/InterfaceObserver.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/InterfaceObserver.swift rename to TunnelKit/Sources/AppExtension/InterfaceObserver.swift diff --git a/PIATunnel/Sources/AppExtension/Keychain.swift b/TunnelKit/Sources/AppExtension/Keychain.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/Keychain.swift rename to TunnelKit/Sources/AppExtension/Keychain.swift diff --git a/PIATunnel/Sources/AppExtension/MemoryDestination.swift b/TunnelKit/Sources/AppExtension/MemoryDestination.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/MemoryDestination.swift rename to TunnelKit/Sources/AppExtension/MemoryDestination.swift diff --git a/PIATunnel/Sources/AppExtension/PIATunnelProvider+Configuration.swift b/TunnelKit/Sources/AppExtension/PIATunnelProvider+Configuration.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/PIATunnelProvider+Configuration.swift rename to TunnelKit/Sources/AppExtension/PIATunnelProvider+Configuration.swift diff --git a/PIATunnel/Sources/AppExtension/PIATunnelProvider+Interaction.swift b/TunnelKit/Sources/AppExtension/PIATunnelProvider+Interaction.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/PIATunnelProvider+Interaction.swift rename to TunnelKit/Sources/AppExtension/PIATunnelProvider+Interaction.swift diff --git a/PIATunnel/Sources/AppExtension/PIATunnelProvider.swift b/TunnelKit/Sources/AppExtension/PIATunnelProvider.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/PIATunnelProvider.swift rename to TunnelKit/Sources/AppExtension/PIATunnelProvider.swift diff --git a/PIATunnel/Sources/AppExtension/Transport/LinkInterface+Strategy.swift b/TunnelKit/Sources/AppExtension/Transport/LinkInterface+Strategy.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/Transport/LinkInterface+Strategy.swift rename to TunnelKit/Sources/AppExtension/Transport/LinkInterface+Strategy.swift diff --git a/PIATunnel/Sources/AppExtension/Transport/NETCPInterface.swift b/TunnelKit/Sources/AppExtension/Transport/NETCPInterface.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/Transport/NETCPInterface.swift rename to TunnelKit/Sources/AppExtension/Transport/NETCPInterface.swift diff --git a/PIATunnel/Sources/AppExtension/Transport/NETunnelInterface.swift b/TunnelKit/Sources/AppExtension/Transport/NETunnelInterface.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/Transport/NETunnelInterface.swift rename to TunnelKit/Sources/AppExtension/Transport/NETunnelInterface.swift diff --git a/PIATunnel/Sources/AppExtension/Transport/NEUDPInterface.swift b/TunnelKit/Sources/AppExtension/Transport/NEUDPInterface.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/Transport/NEUDPInterface.swift rename to TunnelKit/Sources/AppExtension/Transport/NEUDPInterface.swift diff --git a/PIATunnel/Sources/AppExtension/Transport/NWTCPConnectionState+Description.swift b/TunnelKit/Sources/AppExtension/Transport/NWTCPConnectionState+Description.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/Transport/NWTCPConnectionState+Description.swift rename to TunnelKit/Sources/AppExtension/Transport/NWTCPConnectionState+Description.swift diff --git a/PIATunnel/Sources/AppExtension/Transport/NWUDPSessionState+Description.swift b/TunnelKit/Sources/AppExtension/Transport/NWUDPSessionState+Description.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/Transport/NWUDPSessionState+Description.swift rename to TunnelKit/Sources/AppExtension/Transport/NWUDPSessionState+Description.swift diff --git a/PIATunnel/Sources/AppExtension/Utils.swift b/TunnelKit/Sources/AppExtension/Utils.swift similarity index 100% rename from PIATunnel/Sources/AppExtension/Utils.swift rename to TunnelKit/Sources/AppExtension/Utils.swift diff --git a/PIATunnel/Sources/Core/Allocation.h b/TunnelKit/Sources/Core/Allocation.h similarity index 100% rename from PIATunnel/Sources/Core/Allocation.h rename to TunnelKit/Sources/Core/Allocation.h diff --git a/PIATunnel/Sources/Core/Allocation.m b/TunnelKit/Sources/Core/Allocation.m similarity index 100% rename from PIATunnel/Sources/Core/Allocation.m rename to TunnelKit/Sources/Core/Allocation.m diff --git a/PIATunnel/Sources/Core/Authenticator.swift b/TunnelKit/Sources/Core/Authenticator.swift similarity index 99% rename from PIATunnel/Sources/Core/Authenticator.swift rename to TunnelKit/Sources/Core/Authenticator.swift index a5b7eb6..78c80b6 100644 --- a/PIATunnel/Sources/Core/Authenticator.swift +++ b/TunnelKit/Sources/Core/Authenticator.swift @@ -8,7 +8,7 @@ import Foundation import SwiftyBeaver -import __PIATunnelNative +import __TunnelKitNative private let log = SwiftyBeaver.self diff --git a/PIATunnel/Sources/Core/CommunicationType.swift b/TunnelKit/Sources/Core/CommunicationType.swift similarity index 100% rename from PIATunnel/Sources/Core/CommunicationType.swift rename to TunnelKit/Sources/Core/CommunicationType.swift diff --git a/PIATunnel/Sources/Core/CoreConfiguration.swift b/TunnelKit/Sources/Core/CoreConfiguration.swift similarity index 100% rename from PIATunnel/Sources/Core/CoreConfiguration.swift rename to TunnelKit/Sources/Core/CoreConfiguration.swift diff --git a/PIATunnel/Sources/Core/CryptoAEAD.h b/TunnelKit/Sources/Core/CryptoAEAD.h similarity index 100% rename from PIATunnel/Sources/Core/CryptoAEAD.h rename to TunnelKit/Sources/Core/CryptoAEAD.h diff --git a/PIATunnel/Sources/Core/CryptoAEAD.m b/TunnelKit/Sources/Core/CryptoAEAD.m similarity index 100% rename from PIATunnel/Sources/Core/CryptoAEAD.m rename to TunnelKit/Sources/Core/CryptoAEAD.m diff --git a/PIATunnel/Sources/Core/CryptoBox.h b/TunnelKit/Sources/Core/CryptoBox.h similarity index 100% rename from PIATunnel/Sources/Core/CryptoBox.h rename to TunnelKit/Sources/Core/CryptoBox.h diff --git a/PIATunnel/Sources/Core/CryptoBox.m b/TunnelKit/Sources/Core/CryptoBox.m similarity index 100% rename from PIATunnel/Sources/Core/CryptoBox.m rename to TunnelKit/Sources/Core/CryptoBox.m diff --git a/PIATunnel/Sources/Core/CryptoCBC.h b/TunnelKit/Sources/Core/CryptoCBC.h similarity index 100% rename from PIATunnel/Sources/Core/CryptoCBC.h rename to TunnelKit/Sources/Core/CryptoCBC.h diff --git a/PIATunnel/Sources/Core/CryptoCBC.m b/TunnelKit/Sources/Core/CryptoCBC.m similarity index 100% rename from PIATunnel/Sources/Core/CryptoCBC.m rename to TunnelKit/Sources/Core/CryptoCBC.m diff --git a/PIATunnel/Sources/Core/CryptoMacros.h b/TunnelKit/Sources/Core/CryptoMacros.h similarity index 100% rename from PIATunnel/Sources/Core/CryptoMacros.h rename to TunnelKit/Sources/Core/CryptoMacros.h diff --git a/PIATunnel/Sources/Core/Data+Manipulation.swift b/TunnelKit/Sources/Core/Data+Manipulation.swift similarity index 100% rename from PIATunnel/Sources/Core/Data+Manipulation.swift rename to TunnelKit/Sources/Core/Data+Manipulation.swift diff --git a/PIATunnel/Sources/Core/DataPath.h b/TunnelKit/Sources/Core/DataPath.h similarity index 100% rename from PIATunnel/Sources/Core/DataPath.h rename to TunnelKit/Sources/Core/DataPath.h diff --git a/PIATunnel/Sources/Core/DataPath.m b/TunnelKit/Sources/Core/DataPath.m similarity index 100% rename from PIATunnel/Sources/Core/DataPath.m rename to TunnelKit/Sources/Core/DataPath.m diff --git a/PIATunnel/Sources/Core/DataPathEncryption.h b/TunnelKit/Sources/Core/DataPathEncryption.h similarity index 100% rename from PIATunnel/Sources/Core/DataPathEncryption.h rename to TunnelKit/Sources/Core/DataPathEncryption.h diff --git a/PIATunnel/Sources/Core/Encryption.h b/TunnelKit/Sources/Core/Encryption.h similarity index 100% rename from PIATunnel/Sources/Core/Encryption.h rename to TunnelKit/Sources/Core/Encryption.h diff --git a/PIATunnel/Sources/Core/EncryptionProxy.swift b/TunnelKit/Sources/Core/EncryptionProxy.swift similarity index 99% rename from PIATunnel/Sources/Core/EncryptionProxy.swift rename to TunnelKit/Sources/Core/EncryptionProxy.swift index a9b41d9..e55511a 100644 --- a/PIATunnel/Sources/Core/EncryptionProxy.swift +++ b/TunnelKit/Sources/Core/EncryptionProxy.swift @@ -7,7 +7,7 @@ // import Foundation -import __PIATunnelNative +import __TunnelKitNative /// Bridges native encryption for high-level operations. public class EncryptionProxy { diff --git a/PIATunnel/Sources/Core/Errors.h b/TunnelKit/Sources/Core/Errors.h similarity index 100% rename from PIATunnel/Sources/Core/Errors.h rename to TunnelKit/Sources/Core/Errors.h diff --git a/PIATunnel/Sources/Core/Errors.m b/TunnelKit/Sources/Core/Errors.m similarity index 100% rename from PIATunnel/Sources/Core/Errors.m rename to TunnelKit/Sources/Core/Errors.m diff --git a/PIATunnel/Sources/Core/IOInterface.swift b/TunnelKit/Sources/Core/IOInterface.swift similarity index 100% rename from PIATunnel/Sources/Core/IOInterface.swift rename to TunnelKit/Sources/Core/IOInterface.swift diff --git a/PIATunnel/Sources/Core/LinkInterface.swift b/TunnelKit/Sources/Core/LinkInterface.swift similarity index 100% rename from PIATunnel/Sources/Core/LinkInterface.swift rename to TunnelKit/Sources/Core/LinkInterface.swift diff --git a/PIATunnel/Sources/Core/MSS.h b/TunnelKit/Sources/Core/MSS.h similarity index 100% rename from PIATunnel/Sources/Core/MSS.h rename to TunnelKit/Sources/Core/MSS.h diff --git a/PIATunnel/Sources/Core/MSS.m b/TunnelKit/Sources/Core/MSS.m similarity index 100% rename from PIATunnel/Sources/Core/MSS.m rename to TunnelKit/Sources/Core/MSS.m diff --git a/PIATunnel/Sources/Core/Packet.swift b/TunnelKit/Sources/Core/Packet.swift similarity index 98% rename from PIATunnel/Sources/Core/Packet.swift rename to TunnelKit/Sources/Core/Packet.swift index 5f5759e..6718ef5 100644 --- a/PIATunnel/Sources/Core/Packet.swift +++ b/TunnelKit/Sources/Core/Packet.swift @@ -7,7 +7,7 @@ // import Foundation -import __PIATunnelNative +import __TunnelKitNative class CommonPacket { let packetId: UInt32 diff --git a/PIATunnel/Sources/Core/PacketMacros.h b/TunnelKit/Sources/Core/PacketMacros.h similarity index 100% rename from PIATunnel/Sources/Core/PacketMacros.h rename to TunnelKit/Sources/Core/PacketMacros.h diff --git a/PIATunnel/Sources/Core/PacketMacros.m b/TunnelKit/Sources/Core/PacketMacros.m similarity index 100% rename from PIATunnel/Sources/Core/PacketMacros.m rename to TunnelKit/Sources/Core/PacketMacros.m diff --git a/PIATunnel/Sources/Core/ProtocolMacros.swift b/TunnelKit/Sources/Core/ProtocolMacros.swift similarity index 94% rename from PIATunnel/Sources/Core/ProtocolMacros.swift rename to TunnelKit/Sources/Core/ProtocolMacros.swift index 51a3fb4..7aa3186 100644 --- a/PIATunnel/Sources/Core/ProtocolMacros.swift +++ b/TunnelKit/Sources/Core/ProtocolMacros.swift @@ -7,7 +7,7 @@ // import Foundation -import __PIATunnelNative +import __TunnelKitNative class ProtocolMacros { static let peerIdLength = 3 diff --git a/PIATunnel/Sources/Core/PushReply.swift b/TunnelKit/Sources/Core/PushReply.swift similarity index 100% rename from PIATunnel/Sources/Core/PushReply.swift rename to TunnelKit/Sources/Core/PushReply.swift diff --git a/PIATunnel/Sources/Core/ReplayProtector.h b/TunnelKit/Sources/Core/ReplayProtector.h similarity index 100% rename from PIATunnel/Sources/Core/ReplayProtector.h rename to TunnelKit/Sources/Core/ReplayProtector.h diff --git a/PIATunnel/Sources/Core/ReplayProtector.m b/TunnelKit/Sources/Core/ReplayProtector.m similarity index 100% rename from PIATunnel/Sources/Core/ReplayProtector.m rename to TunnelKit/Sources/Core/ReplayProtector.m diff --git a/PIATunnel/Sources/Core/SecureRandom.swift b/TunnelKit/Sources/Core/SecureRandom.swift similarity index 98% rename from PIATunnel/Sources/Core/SecureRandom.swift rename to TunnelKit/Sources/Core/SecureRandom.swift index 08783d6..bf53427 100644 --- a/PIATunnel/Sources/Core/SecureRandom.swift +++ b/TunnelKit/Sources/Core/SecureRandom.swift @@ -8,7 +8,7 @@ import Foundation import Security.SecRandom -import __PIATunnelNative +import __TunnelKitNative enum SecureRandomError: Error { case randomGenerator diff --git a/PIATunnel/Sources/Core/SessionKey.swift b/TunnelKit/Sources/Core/SessionKey.swift similarity index 99% rename from PIATunnel/Sources/Core/SessionKey.swift rename to TunnelKit/Sources/Core/SessionKey.swift index f783b03..04f1a52 100644 --- a/PIATunnel/Sources/Core/SessionKey.swift +++ b/TunnelKit/Sources/Core/SessionKey.swift @@ -7,7 +7,7 @@ // import Foundation -import __PIATunnelNative +import __TunnelKitNative import SwiftyBeaver private let log = SwiftyBeaver.self diff --git a/PIATunnel/Sources/Core/SessionProxy.swift b/TunnelKit/Sources/Core/SessionProxy.swift similarity index 99% rename from PIATunnel/Sources/Core/SessionProxy.swift rename to TunnelKit/Sources/Core/SessionProxy.swift index 410b560..82be3f7 100644 --- a/PIATunnel/Sources/Core/SessionProxy.swift +++ b/TunnelKit/Sources/Core/SessionProxy.swift @@ -8,7 +8,7 @@ import Foundation import SwiftyBeaver -import __PIATunnelNative +import __TunnelKitNative private let log = SwiftyBeaver.self diff --git a/PIATunnel/Sources/Core/TLSBox.h b/TunnelKit/Sources/Core/TLSBox.h similarity index 100% rename from PIATunnel/Sources/Core/TLSBox.h rename to TunnelKit/Sources/Core/TLSBox.h diff --git a/PIATunnel/Sources/Core/TLSBox.m b/TunnelKit/Sources/Core/TLSBox.m similarity index 100% rename from PIATunnel/Sources/Core/TLSBox.m rename to TunnelKit/Sources/Core/TLSBox.m diff --git a/PIATunnel/Sources/Core/TunnelInterface.swift b/TunnelKit/Sources/Core/TunnelInterface.swift similarity index 100% rename from PIATunnel/Sources/Core/TunnelInterface.swift rename to TunnelKit/Sources/Core/TunnelInterface.swift diff --git a/PIATunnel/Sources/Core/TunnelSettings.swift b/TunnelKit/Sources/Core/TunnelSettings.swift similarity index 100% rename from PIATunnel/Sources/Core/TunnelSettings.swift rename to TunnelKit/Sources/Core/TunnelSettings.swift diff --git a/PIATunnel/Sources/Core/ZeroingData.h b/TunnelKit/Sources/Core/ZeroingData.h similarity index 100% rename from PIATunnel/Sources/Core/ZeroingData.h rename to TunnelKit/Sources/Core/ZeroingData.h diff --git a/PIATunnel/Sources/Core/ZeroingData.m b/TunnelKit/Sources/Core/ZeroingData.m similarity index 100% rename from PIATunnel/Sources/Core/ZeroingData.m rename to TunnelKit/Sources/Core/ZeroingData.m diff --git a/PIATunnel/Sources/Core/ZeroingData.swift b/TunnelKit/Sources/Core/ZeroingData.swift similarity index 97% rename from PIATunnel/Sources/Core/ZeroingData.swift rename to TunnelKit/Sources/Core/ZeroingData.swift index ddb0e2e..793bbdc 100644 --- a/PIATunnel/Sources/Core/ZeroingData.swift +++ b/TunnelKit/Sources/Core/ZeroingData.swift @@ -7,7 +7,7 @@ // import Foundation -import __PIATunnelNative +import __TunnelKitNative func Z() -> ZeroingData { return ZeroingData() diff --git a/PIATunnel/Sources/Core/module.modulemap b/TunnelKit/Sources/Core/module.modulemap similarity index 91% rename from PIATunnel/Sources/Core/module.modulemap rename to TunnelKit/Sources/Core/module.modulemap index 7fc2bb4..c126865 100644 --- a/PIATunnel/Sources/Core/module.modulemap +++ b/TunnelKit/Sources/Core/module.modulemap @@ -1,4 +1,4 @@ -module __PIATunnelNative { +module __TunnelKitNative { header "Errors.h" header "ZeroingData.h" header "TLSBox.h" diff --git a/PIATunnelHost/AppDelegate.swift b/TunnelKitHost/AppDelegate.swift similarity index 100% rename from PIATunnelHost/AppDelegate.swift rename to TunnelKitHost/AppDelegate.swift diff --git a/PIATunnelHost/Assets.xcassets/AppIcon.appiconset/Contents.json b/TunnelKitHost/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from PIATunnelHost/Assets.xcassets/AppIcon.appiconset/Contents.json rename to TunnelKitHost/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/PIATunnelHost/Base.lproj/LaunchScreen.storyboard b/TunnelKitHost/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from PIATunnelHost/Base.lproj/LaunchScreen.storyboard rename to TunnelKitHost/Base.lproj/LaunchScreen.storyboard diff --git a/PIATunnelHost/Base.lproj/Main.storyboard b/TunnelKitHost/Base.lproj/Main.storyboard similarity index 100% rename from PIATunnelHost/Base.lproj/Main.storyboard rename to TunnelKitHost/Base.lproj/Main.storyboard diff --git a/PIATunnelHost/Info.plist b/TunnelKitHost/Info.plist similarity index 100% rename from PIATunnelHost/Info.plist rename to TunnelKitHost/Info.plist diff --git a/PIATunnelHost/PIATunnelHost.entitlements b/TunnelKitHost/TunnelKitHost.entitlements similarity index 73% rename from PIATunnelHost/PIATunnelHost.entitlements rename to TunnelKitHost/TunnelKitHost.entitlements index 0e617b3..52fdfc0 100644 --- a/PIATunnelHost/PIATunnelHost.entitlements +++ b/TunnelKitHost/TunnelKitHost.entitlements @@ -4,11 +4,11 @@ com.apple.security.application-groups - group.com.privateinternetaccess + group.com.algoritmico.TunnelKit keychain-access-groups - $(AppIdentifierPrefix)group.com.privateinternetaccess + $(AppIdentifierPrefix)group.com.algoritmico.TunnelKit diff --git a/PIATunnelHost/ViewController.swift b/TunnelKitHost/ViewController.swift similarity index 100% rename from PIATunnelHost/ViewController.swift rename to TunnelKitHost/ViewController.swift diff --git a/PIATunnelTests/AppExtensionTests.swift b/TunnelKitTests/AppExtensionTests.swift similarity index 97% rename from PIATunnelTests/AppExtensionTests.swift rename to TunnelKitTests/AppExtensionTests.swift index b5e43d2..4f5ad8f 100644 --- a/PIATunnelTests/AppExtensionTests.swift +++ b/TunnelKitTests/AppExtensionTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import PIATunnel +@testable import TunnelKit import NetworkExtension class AppExtensionTests: XCTestCase { @@ -27,7 +27,7 @@ class AppExtensionTests: XCTestCase { var cfg: PIATunnelProvider.Configuration! let identifier = "com.example.Provider" - let appGroup = "group.com.privateinternetaccess" + let appGroup = "group.com.algoritmico.TunnelKit" let endpoint = PIATunnelProvider.AuthenticatedEndpoint( hostname: "example.com", username: "foo", diff --git a/PIATunnelTests/DataManipulationTests.swift b/TunnelKitTests/DataManipulationTests.swift similarity index 98% rename from PIATunnelTests/DataManipulationTests.swift rename to TunnelKitTests/DataManipulationTests.swift index 51666dc..075b127 100644 --- a/PIATunnelTests/DataManipulationTests.swift +++ b/TunnelKitTests/DataManipulationTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import PIATunnel +@testable import TunnelKit class DataManipulationTests: XCTestCase { diff --git a/PIATunnelTests/DataPathEncryptionTests.swift b/TunnelKitTests/DataPathEncryptionTests.swift similarity index 98% rename from PIATunnelTests/DataPathEncryptionTests.swift rename to TunnelKitTests/DataPathEncryptionTests.swift index 22f74b2..b621c69 100644 --- a/PIATunnelTests/DataPathEncryptionTests.swift +++ b/TunnelKitTests/DataPathEncryptionTests.swift @@ -7,8 +7,8 @@ // import XCTest -@testable import PIATunnel -@testable import __PIATunnelNative +@testable import TunnelKit +@testable import __TunnelKitNative class DataPathEncryptionTests: XCTestCase { private var cipherKey: ZeroingData! diff --git a/PIATunnelTests/DataPathPerformanceTests.swift b/TunnelKitTests/DataPathPerformanceTests.swift similarity index 97% rename from PIATunnelTests/DataPathPerformanceTests.swift rename to TunnelKitTests/DataPathPerformanceTests.swift index 63ae9cc..14808ee 100644 --- a/PIATunnelTests/DataPathPerformanceTests.swift +++ b/TunnelKitTests/DataPathPerformanceTests.swift @@ -7,8 +7,8 @@ // import XCTest -@testable import PIATunnel -@testable import __PIATunnelNative +@testable import TunnelKit +@testable import __TunnelKitNative class DataPathPerformanceTests: XCTestCase { private var dataPath: DataPath! diff --git a/PIATunnelTests/EncryptionPerformanceTests.swift b/TunnelKitTests/EncryptionPerformanceTests.swift similarity index 96% rename from PIATunnelTests/EncryptionPerformanceTests.swift rename to TunnelKitTests/EncryptionPerformanceTests.swift index d3b8179..1c4a687 100644 --- a/PIATunnelTests/EncryptionPerformanceTests.swift +++ b/TunnelKitTests/EncryptionPerformanceTests.swift @@ -7,8 +7,8 @@ // import XCTest -@testable import PIATunnel -@testable import __PIATunnelNative +@testable import TunnelKit +@testable import __TunnelKitNative class EncryptionPerformanceTests: XCTestCase { private var cbcEncrypter: Encrypter! diff --git a/PIATunnelTests/EncryptionTests.swift b/TunnelKitTests/EncryptionTests.swift similarity index 97% rename from PIATunnelTests/EncryptionTests.swift rename to TunnelKitTests/EncryptionTests.swift index 9b79491..8f4c396 100644 --- a/PIATunnelTests/EncryptionTests.swift +++ b/TunnelKitTests/EncryptionTests.swift @@ -7,8 +7,8 @@ // import XCTest -@testable import PIATunnel -@testable import __PIATunnelNative +@testable import TunnelKit +@testable import __TunnelKitNative class EncryptionTests: XCTestCase { private var cipherKey: ZeroingData! diff --git a/PIATunnelTests/Info.plist b/TunnelKitTests/Info.plist similarity index 100% rename from PIATunnelTests/Info.plist rename to TunnelKitTests/Info.plist diff --git a/PIATunnelTests/LinkTests.swift b/TunnelKitTests/LinkTests.swift similarity index 99% rename from PIATunnelTests/LinkTests.swift rename to TunnelKitTests/LinkTests.swift index f06a54b..d3fc578 100644 --- a/PIATunnelTests/LinkTests.swift +++ b/TunnelKitTests/LinkTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import PIATunnel +@testable import TunnelKit class LinkTests: XCTestCase { diff --git a/PIATunnelTests/RandomTests.swift b/TunnelKitTests/RandomTests.swift similarity index 97% rename from PIATunnelTests/RandomTests.swift rename to TunnelKitTests/RandomTests.swift index 0dc4314..f2986e6 100644 --- a/PIATunnelTests/RandomTests.swift +++ b/TunnelKitTests/RandomTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import PIATunnel +@testable import TunnelKit class RandomTests: XCTestCase { diff --git a/PIATunnelTests/RawPerformanceTests.swift b/TunnelKitTests/RawPerformanceTests.swift similarity index 99% rename from PIATunnelTests/RawPerformanceTests.swift rename to TunnelKitTests/RawPerformanceTests.swift index 5473650..8a397e9 100644 --- a/PIATunnelTests/RawPerformanceTests.swift +++ b/TunnelKitTests/RawPerformanceTests.swift @@ -9,7 +9,7 @@ import Foundation import XCTest -@testable import PIATunnel +@testable import TunnelKit class RawPerformanceTests: XCTestCase { diff --git a/PIATunnelTests/TestUtils.swift b/TunnelKitTests/TestUtils.swift similarity index 91% rename from PIATunnelTests/TestUtils.swift rename to TunnelKitTests/TestUtils.swift index 107035e..9e75756 100644 --- a/PIATunnelTests/TestUtils.swift +++ b/TunnelKitTests/TestUtils.swift @@ -7,8 +7,8 @@ // import Foundation -@testable import PIATunnel -@testable import __PIATunnelNative +@testable import TunnelKit +@testable import __TunnelKitNative class TestUtils { static func uniqArray(_ v: [Int]) -> [Int] {