Merge branch 'split-core-openvpn'

TunnelKit.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
     s.ios.deployment_target = "11.0"
     s.osx.deployment_target = "10.11"
 
-    s.default_subspecs = "Core", "AppExtension"
+    s.default_subspecs = "Core", "OpenVPN", "AppExtension"
 
     s.subspec "Core" do |p|
         p.source_files          = "TunnelKit/Sources/Core/**/*.{h,m,swift}"
@@ -26,20 +26,30 @@ Pod::Spec.new do |s|
         p.libraries = "resolv"
     end
 
+    s.subspec "OpenVPN" do |p|
+        p.source_files          = "TunnelKit/Sources/OpenVPN/**/*.{h,m,swift}"
+        p.private_header_files  = "TunnelKit/Sources/OpenVPN/**/*.h"
+        p.preserve_paths        = "TunnelKit/Sources/OpenVPN/*.modulemap"
+        p.pod_target_xcconfig   = { "SWIFT_INCLUDE_PATHS" => "${PODS_TARGET_SRCROOT}/TunnelKit/Sources/OpenVPN",
+                                    "APPLICATION_EXTENSION_API_ONLY" => "YES" }
+
+        p.dependency "TunnelKit/Core"
+    end
+
     s.subspec "AppExtension" do |p|
         p.source_files          = "TunnelKit/Sources/AppExtension/**/*.swift"
         p.frameworks            = "NetworkExtension"
         p.pod_target_xcconfig   = { "APPLICATION_EXTENSION_API_ONLY" => "YES" }
 
-        p.dependency "TunnelKit/Core"
+        p.dependency "TunnelKit/OpenVPN"
-        p.dependency "SwiftyBeaver"
     end
 
     s.subspec "LZO" do |p|
         p.source_files          = "TunnelKit/Sources/Core/LZO.h",
                                   "TunnelKit/Sources/Core/Errors.{h,m}",
-                                  "TunnelKit/Sources/LZO/**/*lzo*.{h,m,c}"
+                                  "TunnelKit/Sources/LZO/lib/*lzo*.{h,m,c}"
         p.private_header_files  = "TunnelKit/Sources/Core/LZO.h",
+                                  "TunnelKit/Sources/Core/Errors.h",
                                   "TunnelKit/Sources/LZO/lib/*lzo*.h"
         p.pod_target_xcconfig   = { "APPLICATION_EXTENSION_API_ONLY" => "YES" }
     end

TunnelKit.xcodeproj/project.pbxproj

@@ -129,6 +129,38 @@
 		0EA82A3C2190B2B9007960EB /* StaticKeyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E041D0B2152E80A0025FE3C /* StaticKeyTests.swift */; };
 		0EA82A3D2190B2B9007960EB /* TestUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B45A20F0BE4C004233D7 /* TestUtils.swift */; };
 		0EA82A3E2190B2BC007960EB /* pia-2048.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0E749F612178911C00BB2701 /* pia-2048.pem */; };
+		0EB03E202290D22A006D03A0 /* ConnectionStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E102290D22A006D03A0 /* ConnectionStrategy.swift */; };
+		0EB03E212290D22A006D03A0 /* ConnectionStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E102290D22A006D03A0 /* ConnectionStrategy.swift */; };
+		0EB03E222290D22A006D03A0 /* NETCPInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E122290D22A006D03A0 /* NETCPInterface.swift */; };
+		0EB03E232290D22A006D03A0 /* NETCPInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E122290D22A006D03A0 /* NETCPInterface.swift */; };
+		0EB03E242290D22A006D03A0 /* NETunnelInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E132290D22A006D03A0 /* NETunnelInterface.swift */; };
+		0EB03E252290D22A006D03A0 /* NETunnelInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E132290D22A006D03A0 /* NETunnelInterface.swift */; };
+		0EB03E262290D22A006D03A0 /* NWTCPConnectionState+Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E142290D22A006D03A0 /* NWTCPConnectionState+Description.swift */; };
+		0EB03E272290D22A006D03A0 /* NWTCPConnectionState+Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E142290D22A006D03A0 /* NWTCPConnectionState+Description.swift */; };
+		0EB03E282290D22A006D03A0 /* NEUDPInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E152290D22A006D03A0 /* NEUDPInterface.swift */; };
+		0EB03E292290D22A006D03A0 /* NEUDPInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E152290D22A006D03A0 /* NEUDPInterface.swift */; };
+		0EB03E2A2290D22A006D03A0 /* NWUDPSessionState+Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E162290D22A006D03A0 /* NWUDPSessionState+Description.swift */; };
+		0EB03E2B2290D22A006D03A0 /* NWUDPSessionState+Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E162290D22A006D03A0 /* NWUDPSessionState+Description.swift */; };
+		0EB03E2C2290D22A006D03A0 /* DNSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E172290D22A006D03A0 /* DNSResolver.swift */; };
+		0EB03E2D2290D22A006D03A0 /* DNSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E172290D22A006D03A0 /* DNSResolver.swift */; };
+		0EB03E2E2290D22A006D03A0 /* TunnelKitProvider+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E182290D22A006D03A0 /* TunnelKitProvider+Configuration.swift */; };
+		0EB03E2F2290D22A006D03A0 /* TunnelKitProvider+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E182290D22A006D03A0 /* TunnelKitProvider+Configuration.swift */; };
+		0EB03E302290D22A006D03A0 /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E192290D22A006D03A0 /* Keychain.swift */; };
+		0EB03E312290D22A006D03A0 /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E192290D22A006D03A0 /* Keychain.swift */; };
+		0EB03E322290D22A006D03A0 /* MemoryDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E1A2290D22A006D03A0 /* MemoryDestination.swift */; };
+		0EB03E332290D22A006D03A0 /* MemoryDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E1A2290D22A006D03A0 /* MemoryDestination.swift */; };
+		0EB03E342290D22A006D03A0 /* GenericSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E1B2290D22A006D03A0 /* GenericSocket.swift */; };
+		0EB03E352290D22A006D03A0 /* GenericSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E1B2290D22A006D03A0 /* GenericSocket.swift */; };
+		0EB03E362290D22A006D03A0 /* TunnelKitProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E1C2290D22A006D03A0 /* TunnelKitProvider.swift */; };
+		0EB03E372290D22A006D03A0 /* TunnelKitProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E1C2290D22A006D03A0 /* TunnelKitProvider.swift */; };
+		0EB03E382290D22A006D03A0 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E1D2290D22A006D03A0 /* Utils.swift */; };
+		0EB03E392290D22A006D03A0 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E1D2290D22A006D03A0 /* Utils.swift */; };
+		0EB03E3A2290D22A006D03A0 /* TunnelKitProvider+Interaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E1E2290D22A006D03A0 /* TunnelKitProvider+Interaction.swift */; };
+		0EB03E3B2290D22A006D03A0 /* TunnelKitProvider+Interaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E1E2290D22A006D03A0 /* TunnelKitProvider+Interaction.swift */; };
+		0EB03E3C2290D22A006D03A0 /* InterfaceObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E1F2290D22A006D03A0 /* InterfaceObserver.swift */; };
+		0EB03E3D2290D22A006D03A0 /* InterfaceObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E1F2290D22A006D03A0 /* InterfaceObserver.swift */; };
+		0EB03E3F2290D310006D03A0 /* CoreConfiguration+OpenVPN.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E3E2290D310006D03A0 /* CoreConfiguration+OpenVPN.swift */; };
+		0EB03E402290D310006D03A0 /* CoreConfiguration+OpenVPN.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB03E3E2290D310006D03A0 /* CoreConfiguration+OpenVPN.swift */; };
 		0EB2B45320F0BB44004233D7 /* EncryptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B45220F0BB44004233D7 /* EncryptionTests.swift */; };
 		0EB2B45520F0BB53004233D7 /* DataManipulationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B45420F0BB53004233D7 /* DataManipulationTests.swift */; };
 		0EB2B45720F0BD16004233D7 /* RandomTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B45620F0BD16004233D7 /* RandomTests.swift */; };
@@ -137,22 +169,6 @@
 		0EB2B45D20F0BF41004233D7 /* RawPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B45C20F0BF41004233D7 /* RawPerformanceTests.swift */; };
 		0EB2B45F20F0C098004233D7 /* EncryptionPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B45E20F0C098004233D7 /* EncryptionPerformanceTests.swift */; };
 		0EB2B46120F0C0A4004233D7 /* DataPathPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B46020F0C0A4004233D7 /* DataPathPerformanceTests.swift */; };
-		0EBBF2E52084FE6F00E36B40 /* GenericSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBBF2E42084FE6F00E36B40 /* GenericSocket.swift */; };
-		0EBBF2E62084FE6F00E36B40 /* GenericSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBBF2E42084FE6F00E36B40 /* GenericSocket.swift */; };
-		0EBBF2F3208505D300E36B40 /* NEUDPInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBBF2EC2085055100E36B40 /* NEUDPInterface.swift */; };
-		0EBBF2F4208505D400E36B40 /* NEUDPInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBBF2EC2085055100E36B40 /* NEUDPInterface.swift */; };
-		0EBBF2F5208505D700E36B40 /* NETunnelInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBBF2EB2085055100E36B40 /* NETunnelInterface.swift */; };
-		0EBBF2F6208505D700E36B40 /* NETunnelInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBBF2EB2085055100E36B40 /* NETunnelInterface.swift */; };
-		0EBBF2F7208505DD00E36B40 /* NWUDPSessionState+Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBBF2EA2085055100E36B40 /* NWUDPSessionState+Description.swift */; };
-		0EBBF2F8208505DD00E36B40 /* NWUDPSessionState+Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBBF2EA2085055100E36B40 /* NWUDPSessionState+Description.swift */; };
-		0EBBF2FA2085061600E36B40 /* NETCPInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBBF2F92085061600E36B40 /* NETCPInterface.swift */; };
-		0EBBF2FB2085061600E36B40 /* NETCPInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBBF2F92085061600E36B40 /* NETCPInterface.swift */; };
-		0EBBF3002085196000E36B40 /* NWTCPConnectionState+Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBBF2FF2085196000E36B40 /* NWTCPConnectionState+Description.swift */; };
-		0EBBF3012085196000E36B40 /* NWTCPConnectionState+Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EBBF2FF2085196000E36B40 /* NWTCPConnectionState+Description.swift */; };
-		0EC1BBA520D71190007C4C7B /* DNSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EC1BBA420D71190007C4C7B /* DNSResolver.swift */; };
-		0EC1BBA620D712DE007C4C7B /* DNSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EC1BBA420D71190007C4C7B /* DNSResolver.swift */; };
-		0EC1BBA820D7D803007C4C7B /* ConnectionStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EC1BBA720D7D803007C4C7B /* ConnectionStrategy.swift */; };
-		0EC1BBA920D7D803007C4C7B /* ConnectionStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EC1BBA720D7D803007C4C7B /* ConnectionStrategy.swift */; };
 		0ECC60D82254981A0020BEAC /* ConfigurationError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ECC60D72254981A0020BEAC /* ConfigurationError.swift */; };
 		0ECC60D92254981A0020BEAC /* ConfigurationError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ECC60D72254981A0020BEAC /* ConfigurationError.swift */; };
 		0ECE3528212EB7770040F253 /* CryptoContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ECE3527212EB7770040F253 /* CryptoContainer.swift */; };
@@ -170,8 +186,6 @@
 		0EE7A79820F6296F00B42E6A /* PacketMacros.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7A79720F6296F00B42E6A /* PacketMacros.m */; };
 		0EE7A79920F6296F00B42E6A /* PacketMacros.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7A79720F6296F00B42E6A /* PacketMacros.m */; };
 		0EE7A7A120F664AC00B42E6A /* DataPathEncryptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7A7A020F664AB00B42E6A /* DataPathEncryptionTests.swift */; };
-		0EEC49DC20B5E732008FEB91 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EEC49DB20B5E732008FEB91 /* Utils.swift */; };
-		0EEC49DD20B5E732008FEB91 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EEC49DB20B5E732008FEB91 /* Utils.swift */; };
 		0EEC49E120B5F7EA008FEB91 /* Allocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0EFEB42E2006D3C800F81029 /* Allocation.h */; };
 		0EEC49E220B5F7F6008FEB91 /* CryptoBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 0EFEB4402006D3C800F81029 /* CryptoBox.h */; };
 		0EEC49E320B5F7F6008FEB91 /* DataPath.h in Headers */ = {isa = PBXBuildFile; fileRef = 0EFEB4352006D3C800F81029 /* DataPath.h */; };
@@ -216,12 +230,6 @@
 		0EFEB4742006D3C800F81029 /* CoreConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44A2006D3C800F81029 /* CoreConfiguration.swift */; };
 		0EFEB4752006D3C800F81029 /* Errors.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44B2006D3C800F81029 /* Errors.m */; };
 		0EFEB4762006D3C800F81029 /* DataPath.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44C2006D3C800F81029 /* DataPath.m */; };
-		0EFEB4782006D3C800F81029 /* TunnelKitProvider+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44F2006D3C800F81029 /* TunnelKitProvider+Configuration.swift */; };
-		0EFEB4792006D3C800F81029 /* TunnelKitProvider+Interaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4502006D3C800F81029 /* TunnelKitProvider+Interaction.swift */; };
-		0EFEB47B2006D3C800F81029 /* TunnelKitProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4522006D3C800F81029 /* TunnelKitProvider.swift */; };
-		0EFEB4872006D7C400F81029 /* TunnelKitProvider+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44F2006D3C800F81029 /* TunnelKitProvider+Configuration.swift */; };
-		0EFEB4882006D7C400F81029 /* TunnelKitProvider+Interaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4502006D3C800F81029 /* TunnelKitProvider+Interaction.swift */; };
-		0EFEB48A2006D7C400F81029 /* TunnelKitProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4522006D3C800F81029 /* TunnelKitProvider.swift */; };
 		0EFEB48D2006D7F300F81029 /* SessionProxy+EncryptionBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42A2006D3C800F81029 /* SessionProxy+EncryptionBridge.swift */; };
 		0EFEB48E2006D7F300F81029 /* SessionProxy+SessionKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42B2006D3C800F81029 /* SessionProxy+SessionKey.swift */; };
 		0EFEB4902006D7F300F81029 /* TunnelInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42F2006D3C800F81029 /* TunnelInterface.swift */; };
@@ -243,12 +251,6 @@
 		0EFEB4A22006D7F300F81029 /* CoreConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44A2006D3C800F81029 /* CoreConfiguration.swift */; };
 		0EFEB4A32006D7F300F81029 /* Errors.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44B2006D3C800F81029 /* Errors.m */; };
 		0EFEB4A42006D7F300F81029 /* DataPath.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44C2006D3C800F81029 /* DataPath.m */; };
-		0EFEB4AB200760EC00F81029 /* MemoryDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4A9200760EB00F81029 /* MemoryDestination.swift */; };
-		0EFEB4AC200760EC00F81029 /* InterfaceObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4AA200760EC00F81029 /* InterfaceObserver.swift */; };
-		0EFEB4AE2007625E00F81029 /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4AD2007625E00F81029 /* Keychain.swift */; };
-		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 */; };
 		83B2AD687B4E13994EABABCB /* Pods_TunnelKit_TunnelKitTests_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3832A0057760E6C8900714B /* Pods_TunnelKit_TunnelKitTests_macOS.framework */; };
 		B4C2A996F52241B77E7762BD /* Pods_TunnelKit_TunnelKit_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 276657B3FED3840178C53D6B /* Pods_TunnelKit_TunnelKit_iOS.framework */; };
 		B94D5E2579FB6292E2EC7AF1 /* Pods_TunnelKit_TunnelKitHost.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF76B5FEAAFD5056FFCC5DA2 /* Pods_TunnelKit_TunnelKitHost.framework */; };
@@ -357,6 +359,24 @@
 		0E85A25B202CCA3D0059E9F9 /* TunnelKitHost.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = TunnelKitHost.entitlements; sourceTree = "<group>"; };
 		0EA82A232190B220007960EB /* TunnelKitTests-macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "TunnelKitTests-macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		0EA82A272190B220007960EB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		0EB03E0E2290CF52006D03A0 /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
+		0EB03E102290D22A006D03A0 /* ConnectionStrategy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConnectionStrategy.swift; sourceTree = "<group>"; };
+		0EB03E122290D22A006D03A0 /* NETCPInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NETCPInterface.swift; sourceTree = "<group>"; };
+		0EB03E132290D22A006D03A0 /* NETunnelInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NETunnelInterface.swift; sourceTree = "<group>"; };
+		0EB03E142290D22A006D03A0 /* NWTCPConnectionState+Description.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NWTCPConnectionState+Description.swift"; sourceTree = "<group>"; };
+		0EB03E152290D22A006D03A0 /* NEUDPInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NEUDPInterface.swift; sourceTree = "<group>"; };
+		0EB03E162290D22A006D03A0 /* NWUDPSessionState+Description.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NWUDPSessionState+Description.swift"; sourceTree = "<group>"; };
+		0EB03E172290D22A006D03A0 /* DNSResolver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DNSResolver.swift; sourceTree = "<group>"; };
+		0EB03E182290D22A006D03A0 /* TunnelKitProvider+Configuration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TunnelKitProvider+Configuration.swift"; sourceTree = "<group>"; };
+		0EB03E192290D22A006D03A0 /* Keychain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Keychain.swift; sourceTree = "<group>"; };
+		0EB03E1A2290D22A006D03A0 /* MemoryDestination.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MemoryDestination.swift; sourceTree = "<group>"; };
+		0EB03E1B2290D22A006D03A0 /* GenericSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GenericSocket.swift; sourceTree = "<group>"; };
+		0EB03E1C2290D22A006D03A0 /* TunnelKitProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TunnelKitProvider.swift; sourceTree = "<group>"; };
+		0EB03E1D2290D22A006D03A0 /* Utils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
+		0EB03E1E2290D22A006D03A0 /* TunnelKitProvider+Interaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TunnelKitProvider+Interaction.swift"; sourceTree = "<group>"; };
+		0EB03E1F2290D22A006D03A0 /* InterfaceObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InterfaceObserver.swift; sourceTree = "<group>"; };
+		0EB03E3E2290D310006D03A0 /* CoreConfiguration+OpenVPN.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CoreConfiguration+OpenVPN.swift"; sourceTree = "<group>"; };
+		0EB03E412291542C006D03A0 /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
 		0EB2B45220F0BB44004233D7 /* EncryptionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionTests.swift; sourceTree = "<group>"; };
 		0EB2B45420F0BB53004233D7 /* DataManipulationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataManipulationTests.swift; sourceTree = "<group>"; };
 		0EB2B45620F0BD16004233D7 /* RandomTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RandomTests.swift; sourceTree = "<group>"; };
@@ -365,14 +385,6 @@
 		0EB2B45C20F0BF41004233D7 /* RawPerformanceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RawPerformanceTests.swift; sourceTree = "<group>"; };
 		0EB2B45E20F0C098004233D7 /* EncryptionPerformanceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionPerformanceTests.swift; sourceTree = "<group>"; };
 		0EB2B46020F0C0A4004233D7 /* DataPathPerformanceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataPathPerformanceTests.swift; sourceTree = "<group>"; };
-		0EBBF2E42084FE6F00E36B40 /* GenericSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GenericSocket.swift; sourceTree = "<group>"; };
-		0EBBF2EA2085055100E36B40 /* NWUDPSessionState+Description.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NWUDPSessionState+Description.swift"; sourceTree = "<group>"; };
-		0EBBF2EB2085055100E36B40 /* NETunnelInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NETunnelInterface.swift; sourceTree = "<group>"; };
-		0EBBF2EC2085055100E36B40 /* NEUDPInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NEUDPInterface.swift; sourceTree = "<group>"; };
-		0EBBF2F92085061600E36B40 /* NETCPInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NETCPInterface.swift; sourceTree = "<group>"; };
-		0EBBF2FF2085196000E36B40 /* NWTCPConnectionState+Description.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NWTCPConnectionState+Description.swift"; sourceTree = "<group>"; };
-		0EC1BBA420D71190007C4C7B /* DNSResolver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DNSResolver.swift; sourceTree = "<group>"; };
-		0EC1BBA720D7D803007C4C7B /* ConnectionStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionStrategy.swift; sourceTree = "<group>"; };
 		0ECC60D72254981A0020BEAC /* ConfigurationError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigurationError.swift; sourceTree = "<group>"; };
 		0ECE3527212EB7770040F253 /* CryptoContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CryptoContainer.swift; sourceTree = "<group>"; };
 		0ECEB1132252C8E900E9E551 /* tunnelbear.enc.8.ovpn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tunnelbear.enc.8.ovpn; sourceTree = "<group>"; };
@@ -384,7 +396,6 @@
 		0EE7A79720F6296F00B42E6A /* PacketMacros.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PacketMacros.m; sourceTree = "<group>"; };
 		0EE7A79D20F6488400B42E6A /* DataPathCrypto.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DataPathCrypto.h; sourceTree = "<group>"; };
 		0EE7A7A020F664AB00B42E6A /* DataPathEncryptionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataPathEncryptionTests.swift; sourceTree = "<group>"; };
-		0EEC49DB20B5E732008FEB91 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
 		0EFB902722788511006405E4 /* RoutingTable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoutingTable.h; sourceTree = "<group>"; };
 		0EFB902822788511006405E4 /* RoutingTable.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoutingTable.m; sourceTree = "<group>"; };
 		0EFEB42A2006D3C800F81029 /* SessionProxy+EncryptionBridge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SessionProxy+EncryptionBridge.swift"; sourceTree = "<group>"; };
@@ -407,7 +418,6 @@
 		0EFEB43E2006D3C800F81029 /* Packet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Packet.swift; sourceTree = "<group>"; };
 		0EFEB4402006D3C800F81029 /* CryptoBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoBox.h; sourceTree = "<group>"; };
 		0EFEB4412006D3C800F81029 /* ZeroingData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZeroingData.h; sourceTree = "<group>"; };
-		0EFEB4422006D3C800F81029 /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
 		0EFEB4432006D3C800F81029 /* Data+Manipulation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Data+Manipulation.swift"; sourceTree = "<group>"; };
 		0EFEB4442006D3C800F81029 /* TLSBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLSBox.h; sourceTree = "<group>"; };
 		0EFEB4452006D3C800F81029 /* IOInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IOInterface.swift; sourceTree = "<group>"; };
@@ -417,12 +427,6 @@
 		0EFEB44A2006D3C800F81029 /* CoreConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreConfiguration.swift; sourceTree = "<group>"; };
 		0EFEB44B2006D3C800F81029 /* Errors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Errors.m; sourceTree = "<group>"; };
 		0EFEB44C2006D3C800F81029 /* DataPath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataPath.m; sourceTree = "<group>"; };
-		0EFEB44F2006D3C800F81029 /* TunnelKitProvider+Configuration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TunnelKitProvider+Configuration.swift"; sourceTree = "<group>"; };
-		0EFEB4502006D3C800F81029 /* TunnelKitProvider+Interaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TunnelKitProvider+Interaction.swift"; sourceTree = "<group>"; };
-		0EFEB4522006D3C800F81029 /* TunnelKitProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TunnelKitProvider.swift; sourceTree = "<group>"; };
-		0EFEB4A9200760EB00F81029 /* MemoryDestination.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MemoryDestination.swift; sourceTree = "<group>"; };
-		0EFEB4AA200760EC00F81029 /* InterfaceObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InterfaceObserver.swift; sourceTree = "<group>"; };
-		0EFEB4AD2007625E00F81029 /* Keychain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Keychain.swift; sourceTree = "<group>"; };
 		276657B3FED3840178C53D6B /* Pods_TunnelKit_TunnelKit_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TunnelKit_TunnelKit_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		2DD764A8C3908CB48A442295 /* Pods-TunnelKit-TunnelKitTests-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TunnelKit-TunnelKitTests-macOS.release.xcconfig"; path = "Target Support Files/Pods-TunnelKit-TunnelKitTests-macOS/Pods-TunnelKit-TunnelKitTests-macOS.release.xcconfig"; sourceTree = "<group>"; };
 		33C00B882D0DF7C28257630B /* Pods-TunnelKit-TunnelKit-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TunnelKit-TunnelKit-macOS.debug.xcconfig"; path = "Target Support Files/Pods-TunnelKit-TunnelKit-macOS/Pods-TunnelKit-TunnelKit-macOS.debug.xcconfig"; sourceTree = "<group>"; };
@@ -572,9 +576,10 @@
 		0E17D8041F730DDD009EE129 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				0EFEB44D2006D3C800F81029 /* AppExtension */,
+				0EB03E0F2290D22A006D03A0 /* AppExtension */,
 				0EFEB4292006D3C800F81029 /* Core */,
 				0E58BEDC2240521F006FB157 /* LZO */,
+				0EB03E0A2290A338006D03A0 /* OpenVPN */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
@@ -631,33 +636,17 @@
 			path = "TunnelKitTests-iOS";
 			sourceTree = "<group>";
 		};
-		0EBBF2E32084FDF400E36B40 /* Transport */ = {
+		0EB03E0A2290A338006D03A0 /* OpenVPN */ = {
 			isa = PBXGroup;
 			children = (
-				0EBBF2F92085061600E36B40 /* NETCPInterface.swift */,
-				0EBBF2EB2085055100E36B40 /* NETunnelInterface.swift */,
-				0EBBF2EC2085055100E36B40 /* NEUDPInterface.swift */,
-				0EBBF2FF2085196000E36B40 /* NWTCPConnectionState+Description.swift */,
-				0EBBF2EA2085055100E36B40 /* NWUDPSessionState+Description.swift */,
-			);
-			path = Transport;
-			sourceTree = "<group>";
-		};
-		0EFEB4292006D3C800F81029 /* Core */ = {
-			isa = PBXGroup;
-			children = (
-				0EFEB42E2006D3C800F81029 /* Allocation.h */,
-				0EFEB4462006D3C800F81029 /* Allocation.m */,
-				0E12B2A421454F7F00B4BAE9 /* BidirectionalState.swift */,
 				0E58BF4F2240F98E006FB157 /* CompressionAlgorithmNative.h */,
 				0E245D6B2137F73600B012A2 /* CompressionFramingNative.h */,
-				0ECC60D72254981A0020BEAC /* ConfigurationError.swift */,
 				0E011F872196E2AB00BA59EE /* ConfigurationParser.swift */,
-				0E39BCE6214B2AB60035E9DE /* ControlPacket.h */,
-				0E39BCE7214B2AB60035E9DE /* ControlPacket.m */,
 				0E12B2A721456C0200B4BAE9 /* ControlChannel.swift */,
 				0E12B2AA2145E01700B4BAE9 /* ControlChannelSerializer.swift */,
-				0EFEB44A2006D3C800F81029 /* CoreConfiguration.swift */,
+				0E39BCE6214B2AB60035E9DE /* ControlPacket.h */,
+				0E39BCE7214B2AB60035E9DE /* ControlPacket.m */,
+				0EB03E3E2290D310006D03A0 /* CoreConfiguration+OpenVPN.swift */,
 				0E07596A20EF79AB00F38FD8 /* Crypto.h */,
 				0E07597C20F0060E00F38FD8 /* CryptoAEAD.h */,
 				0E07597D20F0060E00F38FD8 /* CryptoAEAD.m */,
@@ -669,23 +658,12 @@
 				0E3B15C52152B05E00984B17 /* CryptoCTR.h */,
 				0E3B15C62152B05E00984B17 /* CryptoCTR.m */,
 				0E07596120EF733F00F38FD8 /* CryptoMacros.h */,
-				0EFEB4432006D3C800F81029 /* Data+Manipulation.swift */,
 				0EFEB4352006D3C800F81029 /* DataPath.h */,
 				0EFEB44C2006D3C800F81029 /* DataPath.m */,
 				0EE7A79D20F6488400B42E6A /* DataPathCrypto.h */,
-				0E411B992271F90700E0852C /* DNS.h */,
+				0EB03E412291542C006D03A0 /* module.modulemap */,
-				0E411B9A2271F90700E0852C /* DNS.m */,
-				0E011F7C2196D97200BA59EE /* EndpointProtocol.swift */,
-				0EFEB4362006D3C800F81029 /* Errors.h */,
-				0EFEB44B2006D3C800F81029 /* Errors.m */,
-				0EFEB4452006D3C800F81029 /* IOInterface.swift */,
-				0EFEB4492006D3C800F81029 /* LinkInterface.swift */,
-				0E58BF5522411F37006FB157 /* LZO.h */,
-				0E58BF5822411FEF006FB157 /* LZO.m */,
-				0EFEB4422006D3C800F81029 /* module.modulemap */,
 				0EFEB42D2006D3C800F81029 /* MSS.h */,
 				0EFEB43D2006D3C800F81029 /* MSS.m */,
-				0E12B29D21449ADB00B4BAE9 /* NSRegularExpression+Shortcuts.swift */,
 				0EFEB43E2006D3C800F81029 /* Packet.swift */,
 				0EE7A79420F61EDC00B42E6A /* PacketMacros.h */,
 				0EE7A79720F6296F00B42E6A /* PacketMacros.m */,
@@ -694,11 +672,6 @@
 				0EFEB4382006D3C800F81029 /* ProtocolMacros.swift */,
 				0EFEB4392006D3C800F81029 /* ReplayProtector.h */,
 				0EFEB4482006D3C800F81029 /* ReplayProtector.m */,
-				0EFB902722788511006405E4 /* RoutingTable.h */,
-				0EFB902822788511006405E4 /* RoutingTable.m */,
-				0E0B203E2278A85B007A3CB9 /* RoutingTableEntry.h */,
-				0E0B203F2278A85B007A3CB9 /* RoutingTableEntry.m */,
-				0EFEB4372006D3C800F81029 /* SecureRandom.swift */,
 				0E0C2123212ED29D008AB282 /* SessionError.swift */,
 				0EFEB43C2006D3C800F81029 /* SessionProxy.swift */,
 				0EFEB43A2006D3C800F81029 /* SessionProxy+Authenticator.swift */,
@@ -710,10 +683,69 @@
 				0EFEB42B2006D3C800F81029 /* SessionProxy+SessionKey.swift */,
 				0E3E0F202108A8CC00B371C1 /* SessionProxy+SessionReply.swift */,
 				0E041D082152E6FE0025FE3C /* SessionProxy+TLSWrap.swift */,
-				0E011F792196D93600BA59EE /* SocketType.swift */,
 				0EE3B3E321471C3A0027AB17 /* StaticKey.swift */,
 				0EFEB4442006D3C800F81029 /* TLSBox.h */,
 				0EFEB4302006D3C800F81029 /* TLSBox.m */,
+			);
+			path = OpenVPN;
+			sourceTree = "<group>";
+		};
+		0EB03E0F2290D22A006D03A0 /* AppExtension */ = {
+			isa = PBXGroup;
+			children = (
+				0EB03E112290D22A006D03A0 /* Transport */,
+				0EB03E102290D22A006D03A0 /* ConnectionStrategy.swift */,
+				0EB03E172290D22A006D03A0 /* DNSResolver.swift */,
+				0EB03E1B2290D22A006D03A0 /* GenericSocket.swift */,
+				0EB03E1F2290D22A006D03A0 /* InterfaceObserver.swift */,
+				0EB03E192290D22A006D03A0 /* Keychain.swift */,
+				0EB03E1A2290D22A006D03A0 /* MemoryDestination.swift */,
+				0EB03E1C2290D22A006D03A0 /* TunnelKitProvider.swift */,
+				0EB03E182290D22A006D03A0 /* TunnelKitProvider+Configuration.swift */,
+				0EB03E1E2290D22A006D03A0 /* TunnelKitProvider+Interaction.swift */,
+				0EB03E1D2290D22A006D03A0 /* Utils.swift */,
+			);
+			path = AppExtension;
+			sourceTree = "<group>";
+		};
+		0EB03E112290D22A006D03A0 /* Transport */ = {
+			isa = PBXGroup;
+			children = (
+				0EB03E122290D22A006D03A0 /* NETCPInterface.swift */,
+				0EB03E132290D22A006D03A0 /* NETunnelInterface.swift */,
+				0EB03E142290D22A006D03A0 /* NWTCPConnectionState+Description.swift */,
+				0EB03E152290D22A006D03A0 /* NEUDPInterface.swift */,
+				0EB03E162290D22A006D03A0 /* NWUDPSessionState+Description.swift */,
+			);
+			path = Transport;
+			sourceTree = "<group>";
+		};
+		0EFEB4292006D3C800F81029 /* Core */ = {
+			isa = PBXGroup;
+			children = (
+				0EFEB42E2006D3C800F81029 /* Allocation.h */,
+				0EFEB4462006D3C800F81029 /* Allocation.m */,
+				0E12B2A421454F7F00B4BAE9 /* BidirectionalState.swift */,
+				0ECC60D72254981A0020BEAC /* ConfigurationError.swift */,
+				0EFEB44A2006D3C800F81029 /* CoreConfiguration.swift */,
+				0EFEB4432006D3C800F81029 /* Data+Manipulation.swift */,
+				0E411B992271F90700E0852C /* DNS.h */,
+				0E411B9A2271F90700E0852C /* DNS.m */,
+				0E011F7C2196D97200BA59EE /* EndpointProtocol.swift */,
+				0EFEB4362006D3C800F81029 /* Errors.h */,
+				0EFEB44B2006D3C800F81029 /* Errors.m */,
+				0EFEB4452006D3C800F81029 /* IOInterface.swift */,
+				0EFEB4492006D3C800F81029 /* LinkInterface.swift */,
+				0E58BF5522411F37006FB157 /* LZO.h */,
+				0E58BF5822411FEF006FB157 /* LZO.m */,
+				0EB03E0E2290CF52006D03A0 /* module.modulemap */,
+				0E12B29D21449ADB00B4BAE9 /* NSRegularExpression+Shortcuts.swift */,
+				0EFB902722788511006405E4 /* RoutingTable.h */,
+				0EFB902822788511006405E4 /* RoutingTable.m */,
+				0E0B203E2278A85B007A3CB9 /* RoutingTableEntry.h */,
+				0E0B203F2278A85B007A3CB9 /* RoutingTableEntry.m */,
+				0EFEB4372006D3C800F81029 /* SecureRandom.swift */,
+				0E011F792196D93600BA59EE /* SocketType.swift */,
 				0EFEB42F2006D3C800F81029 /* TunnelInterface.swift */,
 				0EFEB4412006D3C800F81029 /* ZeroingData.h */,
 				0EFEB4312006D3C800F81029 /* ZeroingData.m */,
@@ -722,24 +754,6 @@
 			path = Core;
 			sourceTree = "<group>";
 		};
-		0EFEB44D2006D3C800F81029 /* AppExtension */ = {
-			isa = PBXGroup;
-			children = (
-				0EBBF2E32084FDF400E36B40 /* Transport */,
-				0EC1BBA720D7D803007C4C7B /* ConnectionStrategy.swift */,
-				0EC1BBA420D71190007C4C7B /* DNSResolver.swift */,
-				0EBBF2E42084FE6F00E36B40 /* GenericSocket.swift */,
-				0EFEB4AA200760EC00F81029 /* InterfaceObserver.swift */,
-				0EFEB4AD2007625E00F81029 /* Keychain.swift */,
-				0EFEB4A9200760EB00F81029 /* MemoryDestination.swift */,
-				0EFEB4522006D3C800F81029 /* TunnelKitProvider.swift */,
-				0EFEB44F2006D3C800F81029 /* TunnelKitProvider+Configuration.swift */,
-				0EFEB4502006D3C800F81029 /* TunnelKitProvider+Interaction.swift */,
-				0EEC49DB20B5E732008FEB91 /* Utils.swift */,
-			);
-			path = AppExtension;
-			sourceTree = "<group>";
-		};
 		1B27D1F0B446D5907FAF40E1 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -1231,66 +1245,67 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0EBBF2F5208505D700E36B40 /* NETunnelInterface.swift in Sources */,
+				0EB03E202290D22A006D03A0 /* ConnectionStrategy.swift in Sources */,
+				0EB03E322290D22A006D03A0 /* MemoryDestination.swift in Sources */,
 				0E58BF4C22405C2F006FB157 /* StandardLZO.m in Sources */,
+				0EB03E222290D22A006D03A0 /* NETCPInterface.swift in Sources */,
 				0EFEB4732006D3C800F81029 /* LinkInterface.swift in Sources */,
-				0EBBF2F8208505DD00E36B40 /* NWUDPSessionState+Description.swift in Sources */,
 				0EFEB4652006D3C800F81029 /* SessionProxy+Authenticator.swift in Sources */,
 				0EE7A79820F6296F00B42E6A /* PacketMacros.m in Sources */,
-				0EEC49DC20B5E732008FEB91 /* Utils.swift in Sources */,
+				0EB03E282290D22A006D03A0 /* NEUDPInterface.swift in Sources */,
+				0EB03E2C2290D22A006D03A0 /* DNSResolver.swift in Sources */,
 				0EFEB4562006D3C800F81029 /* SessionProxy+SessionKey.swift in Sources */,
-				0EC1BBA520D71190007C4C7B /* DNSResolver.swift in Sources */,
 				0E0B20422278A85C007A3CB9 /* RoutingTableEntry.m in Sources */,
 				0E58BF5922411FEF006FB157 /* LZO.m in Sources */,
-				0EFEB4AB200760EC00F81029 /* MemoryDestination.swift in Sources */,
 				0E12B29E21449ADB00B4BAE9 /* NSRegularExpression+Shortcuts.swift in Sources */,
-				0EFEB4AE2007625E00F81029 /* Keychain.swift in Sources */,
 				0E749F5F2178885500BB2701 /* SessionProxy+PIA.swift in Sources */,
-				0EBBF3002085196000E36B40 /* NWTCPConnectionState+Description.swift in Sources */,
 				0EE3B3E421471C3A0027AB17 /* StaticKey.swift in Sources */,
 				0EFEB4622006D3C800F81029 /* SecureRandom.swift in Sources */,
 				0EFEB45D2006D3C800F81029 /* CryptoBox.m in Sources */,
 				0E3B15C92152B05E00984B17 /* CryptoCTR.m in Sources */,
 				0E011F7D2196D97200BA59EE /* EndpointProtocol.swift in Sources */,
-				0EBBF2FA2085061600E36B40 /* NETCPInterface.swift in Sources */,
 				0E0C2125212ED29D008AB282 /* SessionError.swift in Sources */,
 				0E12B2A821456C0200B4BAE9 /* ControlChannel.swift in Sources */,
 				0EFEB4552006D3C800F81029 /* SessionProxy+EncryptionBridge.swift in Sources */,
 				0EFEB45C2006D3C800F81029 /* ZeroingData.m in Sources */,
 				0EFEB4632006D3C800F81029 /* ProtocolMacros.swift in Sources */,
-				0EFEB4AC200760EC00F81029 /* InterfaceObserver.swift in Sources */,
 				0EFB902B22788512006405E4 /* RoutingTable.m in Sources */,
 				0EFEB46D2006D3C800F81029 /* Data+Manipulation.swift in Sources */,
-				0EFEB47B2006D3C800F81029 /* TunnelKitProvider.swift in Sources */,
+				0EB03E2A2290D22A006D03A0 /* NWUDPSessionState+Description.swift in Sources */,
 				0ECE3528212EB7770040F253 /* CryptoContainer.swift in Sources */,
 				0EFEB4742006D3C800F81029 /* CoreConfiguration.swift in Sources */,
 				0E07595F20EF6D1400F38FD8 /* CryptoCBC.m in Sources */,
-				0EC1BBA820D7D803007C4C7B /* ConnectionStrategy.swift in Sources */,
 				0EFEB46F2006D3C800F81029 /* IOInterface.swift in Sources */,
 				0E07598020F0060E00F38FD8 /* CryptoAEAD.m in Sources */,
 				0E011F882196E2AB00BA59EE /* ConfigurationParser.swift in Sources */,
 				0E39BCEA214B2AB60035E9DE /* ControlPacket.m in Sources */,
+				0EB03E3A2290D22A006D03A0 /* TunnelKitProvider+Interaction.swift in Sources */,
 				0E12B2AB2145E01700B4BAE9 /* ControlChannelSerializer.swift in Sources */,
 				0EFEB4662006D3C800F81029 /* ZeroingData.swift in Sources */,
-				0EBBF2F3208505D300E36B40 /* NEUDPInterface.swift in Sources */,
 				0EFEB4682006D3C800F81029 /* MSS.m in Sources */,
 				0E48AC662271ADA9009B1A98 /* PacketStream.m in Sources */,
+				0EB03E382290D22A006D03A0 /* Utils.swift in Sources */,
 				0E411B9D2271F90700E0852C /* DNS.m in Sources */,
 				0EFEB45B2006D3C800F81029 /* TLSBox.m in Sources */,
-				0EFEB4792006D3C800F81029 /* TunnelKitProvider+Interaction.swift in Sources */,
 				0E58BF3922405410006FB157 /* minilzo.c in Sources */,
+				0EB03E362290D22A006D03A0 /* TunnelKitProvider.swift in Sources */,
+				0EB03E2E2290D22A006D03A0 /* TunnelKitProvider+Configuration.swift in Sources */,
 				0EFEB4702006D3C800F81029 /* Allocation.m in Sources */,
 				0E041D092152E6FE0025FE3C /* SessionProxy+TLSWrap.swift in Sources */,
 				0EFEB4672006D3C800F81029 /* SessionProxy.swift in Sources */,
+				0EB03E3C2290D22A006D03A0 /* InterfaceObserver.swift in Sources */,
 				0ED9C8642138139000621BA3 /* SessionProxy+CompressionFraming.swift in Sources */,
+				0EB03E262290D22A006D03A0 /* NWTCPConnectionState+Description.swift in Sources */,
 				0EFEB4722006D3C800F81029 /* ReplayProtector.m in Sources */,
-				0EFEB4782006D3C800F81029 /* TunnelKitProvider+Configuration.swift in Sources */,
 				0E3E0F212108A8CC00B371C1 /* SessionProxy+SessionReply.swift in Sources */,
 				0ECC60D82254981A0020BEAC /* ConfigurationError.swift in Sources */,
 				0EFEB4752006D3C800F81029 /* Errors.m in Sources */,
 				0E58BF532240FAA6006FB157 /* SessionProxy+CompressionAlgorithm.swift in Sources */,
+				0EB03E3F2290D310006D03A0 /* CoreConfiguration+OpenVPN.swift in Sources */,
+				0EB03E342290D22A006D03A0 /* GenericSocket.swift in Sources */,
+				0EB03E302290D22A006D03A0 /* Keychain.swift in Sources */,
 				0E12B2A521454F7F00B4BAE9 /* BidirectionalState.swift in Sources */,
-				0EBBF2E52084FE6F00E36B40 /* GenericSocket.swift in Sources */,
+				0EB03E242290D22A006D03A0 /* NETunnelInterface.swift in Sources */,
 				0EFEB4762006D3C800F81029 /* DataPath.m in Sources */,
 				0E0C2127212ED29D008AB282 /* SessionProxy+Configuration.swift in Sources */,
 				0EFEB4692006D3C800F81029 /* Packet.swift in Sources */,
@@ -1303,66 +1318,67 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0EBBF2F6208505D700E36B40 /* NETunnelInterface.swift in Sources */,
+				0EB03E212290D22A006D03A0 /* ConnectionStrategy.swift in Sources */,
+				0EB03E332290D22A006D03A0 /* MemoryDestination.swift in Sources */,
 				0E58BF4D22405C2F006FB157 /* StandardLZO.m in Sources */,
+				0EB03E232290D22A006D03A0 /* NETCPInterface.swift in Sources */,
 				0EFEB4A12006D7F300F81029 /* LinkInterface.swift in Sources */,
-				0EFEB4872006D7C400F81029 /* TunnelKitProvider+Configuration.swift in Sources */,
-				0EBBF2F7208505DD00E36B40 /* NWUDPSessionState+Description.swift in Sources */,
-				0EFEB4882006D7C400F81029 /* TunnelKitProvider+Interaction.swift in Sources */,
 				0EE7A79920F6296F00B42E6A /* PacketMacros.m in Sources */,
-				0EEC49DD20B5E732008FEB91 /* Utils.swift in Sources */,
-				0EFEB4B12007627700F81029 /* MemoryDestination.swift in Sources */,
 				0E0B20432278A85C007A3CB9 /* RoutingTableEntry.m in Sources */,
+				0EB03E292290D22A006D03A0 /* NEUDPInterface.swift in Sources */,
+				0EB03E2D2290D22A006D03A0 /* DNSResolver.swift in Sources */,
 				0E58BF5A22411FEF006FB157 /* LZO.m in Sources */,
-				0EC1BBA620D712DE007C4C7B /* DNSResolver.swift in Sources */,
 				0E12B29F21449ADB00B4BAE9 /* NSRegularExpression+Shortcuts.swift in Sources */,
 				0EFEB4A02006D7F300F81029 /* ReplayProtector.m in Sources */,
 				0E749F602178885500BB2701 /* SessionProxy+PIA.swift in Sources */,
 				0EFEB4992006D7F300F81029 /* SessionProxy.swift in Sources */,
 				0EE3B3E521471C3A0027AB17 /* StaticKey.swift in Sources */,
-				0EBBF3012085196000E36B40 /* NWTCPConnectionState+Description.swift in Sources */,
 				0EFEB4962006D7F300F81029 /* ProtocolMacros.swift in Sources */,
 				0E3B15CA2152B05E00984B17 /* CryptoCTR.m in Sources */,
 				0E011F7E2196D97200BA59EE /* EndpointProtocol.swift in Sources */,
-				0EFEB48A2006D7C400F81029 /* TunnelKitProvider.swift in Sources */,
 				0E0C2126212ED29D008AB282 /* SessionError.swift in Sources */,
 				0E12B2A921456C0200B4BAE9 /* ControlChannel.swift in Sources */,
-				0EBBF2FB2085061600E36B40 /* NETCPInterface.swift in Sources */,
 				0EFEB4982006D7F300F81029 /* ZeroingData.swift in Sources */,
 				0EFEB4A32006D7F300F81029 /* Errors.m in Sources */,
 				0EFEB4A22006D7F300F81029 /* CoreConfiguration.swift in Sources */,
 				0EFB902C22788512006405E4 /* RoutingTable.m in Sources */,
 				0EFEB4952006D7F300F81029 /* SecureRandom.swift in Sources */,
 				0EFEB49A2006D7F300F81029 /* MSS.m in Sources */,
+				0EB03E2B2290D22A006D03A0 /* NWUDPSessionState+Description.swift in Sources */,
 				0ECE352A212EB88E0040F253 /* CryptoContainer.swift in Sources */,
 				0EFEB48D2006D7F300F81029 /* SessionProxy+EncryptionBridge.swift in Sources */,
 				0EFEB4922006D7F300F81029 /* ZeroingData.m in Sources */,
 				0E07596020EF6D1400F38FD8 /* CryptoCBC.m in Sources */,
-				0EC1BBA920D7D803007C4C7B /* ConnectionStrategy.swift in Sources */,
 				0EFEB4932006D7F300F81029 /* CryptoBox.m in Sources */,
 				0E011F892196E2AB00BA59EE /* ConfigurationParser.swift in Sources */,
 				0E39BCEB214B2AB60035E9DE /* ControlPacket.m in Sources */,
+				0EB03E3B2290D22A006D03A0 /* TunnelKitProvider+Interaction.swift in Sources */,
 				0E12B2AC2145E01700B4BAE9 /* ControlChannelSerializer.swift in Sources */,
 				0E07598120F0060E00F38FD8 /* CryptoAEAD.m in Sources */,
 				0EFEB49C2006D7F300F81029 /* Data+Manipulation.swift in Sources */,
-				0EBBF2F4208505D400E36B40 /* NEUDPInterface.swift in Sources */,
 				0E48AC672271ADA9009B1A98 /* PacketStream.m in Sources */,
+				0EB03E392290D22A006D03A0 /* Utils.swift in Sources */,
 				0E411B9E2271F90700E0852C /* DNS.m in Sources */,
 				0EFEB4902006D7F300F81029 /* TunnelInterface.swift in Sources */,
 				0EFEB49E2006D7F300F81029 /* Allocation.m in Sources */,
+				0EB03E372290D22A006D03A0 /* TunnelKitProvider.swift in Sources */,
+				0EB03E2F2290D22A006D03A0 /* TunnelKitProvider+Configuration.swift in Sources */,
 				0E58BF3A22405410006FB157 /* minilzo.c in Sources */,
-				0EFEB4B02007627700F81029 /* Keychain.swift in Sources */,
 				0E041D0A2152E6FE0025FE3C /* SessionProxy+TLSWrap.swift in Sources */,
 				0EFEB48E2006D7F300F81029 /* SessionProxy+SessionKey.swift in Sources */,
+				0EB03E3D2290D22A006D03A0 /* InterfaceObserver.swift in Sources */,
 				0ED9C8652138139000621BA3 /* SessionProxy+CompressionFraming.swift in Sources */,
-				0EFEB4AF2007627700F81029 /* InterfaceObserver.swift in Sources */,
+				0EB03E272290D22A006D03A0 /* NWTCPConnectionState+Description.swift in Sources */,
 				0EFEB4A42006D7F300F81029 /* DataPath.m in Sources */,
-				0EBBF2E62084FE6F00E36B40 /* GenericSocket.swift in Sources */,
 				0ECC60D92254981A0020BEAC /* ConfigurationError.swift in Sources */,
 				0E3E0F222108A8CC00B371C1 /* SessionProxy+SessionReply.swift in Sources */,
 				0E58BF542240FAA6006FB157 /* SessionProxy+CompressionAlgorithm.swift in Sources */,
 				0E12B2A621454F7F00B4BAE9 /* BidirectionalState.swift in Sources */,
+				0EB03E402290D310006D03A0 /* CoreConfiguration+OpenVPN.swift in Sources */,
+				0EB03E352290D22A006D03A0 /* GenericSocket.swift in Sources */,
+				0EB03E312290D22A006D03A0 /* Keychain.swift in Sources */,
 				0EFEB4912006D7F300F81029 /* TLSBox.m in Sources */,
+				0EB03E252290D22A006D03A0 /* NETunnelInterface.swift in Sources */,
 				0EFEB49D2006D7F300F81029 /* IOInterface.swift in Sources */,
 				0E0C2128212ED29D008AB282 /* SessionProxy+Configuration.swift in Sources */,
 				0EFEB4972006D7F300F81029 /* SessionProxy+Authenticator.swift in Sources */,
@@ -1532,7 +1548,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 538;
+				CURRENT_PROJECT_VERSION = 567;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1596,7 +1612,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 538;
+				CURRENT_PROJECT_VERSION = 567;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1629,7 +1645,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 538;
+				DYLIB_CURRENT_VERSION = 567;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-iOS/Info.plist";
@@ -1653,7 +1669,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 538;
+				DYLIB_CURRENT_VERSION = 567;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-iOS/Info.plist";
@@ -1677,7 +1693,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 538;
+				DYLIB_CURRENT_VERSION = 567;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-macOS/Info.plist";
@@ -1701,7 +1717,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 538;
+				DYLIB_CURRENT_VERSION = 567;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-macOS/Info.plist";

TunnelKit/Sources/AppExtension/Transport/NETCPInterface.swift

@@ -37,7 +37,7 @@
 import Foundation
 import NetworkExtension
 import SwiftyBeaver
-import __TunnelKitNative
+import __TunnelKitOpenVPN
 
 private let log = SwiftyBeaver.self
 
@@ -200,10 +200,6 @@ class NETCPLink: LinkInterface {
         return maxPacketSize
     }
     
-    let negotiationTimeout: TimeInterval = 60.0
-    
-    let hardResetTimeout: TimeInterval = 20.0
-    
     func setReadHandler(queue: DispatchQueue, _ handler: @escaping ([Data]?, Error?) -> Void) {
         loopReadPackets(queue, Data(), handler)
     }

TunnelKit/Sources/AppExtension/Transport/NEUDPInterface.swift

@@ -202,10 +202,6 @@ class NEUDPLink: LinkInterface {
         return maxDatagrams
     }
 
-    let negotiationTimeout: TimeInterval = 10.0
-    
-    let hardResetTimeout: TimeInterval = 5.0
-    
     func setReadHandler(queue: DispatchQueue, _ handler: @escaping ([Data]?, Error?) -> Void) {
 
         // WARNING: runs in Network.framework queue

TunnelKit/Sources/AppExtension/TunnelKitProvider.swift

@@ -36,7 +36,7 @@
 
 import NetworkExtension
 import SwiftyBeaver
-import __TunnelKitNative
+import __TunnelKitCore
 
 private let log = SwiftyBeaver.self
 
@@ -779,19 +779,19 @@ extension TunnelKitProvider {
     private func unifiedError(from error: Error) -> ProviderError {
         if let te = error.tunnelKitErrorCode() {
             switch te {
-            case .cryptoBoxRandomGenerator, .cryptoBoxAlgorithm:
+            case .cryptoRandomGenerator, .cryptoAlgorithm:
                 return .encryptionInitialization
                 
-            case .cryptoBoxEncryption, .cryptoBoxHMAC:
+            case .cryptoEncryption, .cryptoHMAC:
                 return .encryptionData
                 
-            case .tlsBoxCA, .tlsBoxClientCertificate, .tlsBoxClientKey:
+            case .tlsCertificateAuthority, .tlsClientCertificate, .tlsClientKey:
                 return .tlsInitialization
                 
-            case .tlsBoxServerCertificate, .tlsBoxServerEKU:
+            case .tlsServerCertificate, .tlsServerEKU:
                 return .tlsServerVerification
                 
-            case .tlsBoxHandshake:
+            case .tlsHandshake:
                 return .tlsHandshake
                 
             case .dataPathOverflow, .dataPathPeerIdMismatch:

TunnelKit/Sources/Core/CoreConfiguration.swift

@@ -35,7 +35,6 @@
 //
 
 import Foundation
-import __TunnelKitNative
 
 class CoreConfiguration {
     static let identifier = "com.algoritmico.TunnelKit"
@@ -55,59 +54,10 @@ class CoreConfiguration {
         return info["CFBundleShortVersionString"] as? String ?? ""
     }()
 
-    // MARK: Session
-
     // configurable
     static var masksPrivateData = true
     
     static let logsSensitiveData = false
-
-    static let usesReplayProtection = true
-
-    static let tickInterval = 0.2
-    
-    static let pushRequestInterval = 2.0
-    
-    static let pingTimeout = 120.0
-    
-    static let retransmissionLimit = 0.1
-    
-    static let softResetDelay = 5.0
-    
-    static let softNegotiationTimeout = 120.0
-
-    // MARK: Authentication
-    
-    static let peerInfo: String = {
-        var info = [
-            "IV_VER=2.4",
-            "IV_PLAT=mac",
-            "IV_UI_VER=\(identifier) \(version)",
-            "IV_PROTO=2",
-            "IV_NCP=2",
-            "IV_SSL=\(CryptoBox.version())",
-            "IV_LZO_STUB=1",
-        ]
-        if LZOIsSupported() {
-            info.append("IV_LZO=1")
-        }
-        info.append("")
-        return info.joined(separator: "\n")
-    }()
-    
-    static let randomLength = 32
-    
-    // MARK: Keys
-    
-    static let label1 = "OpenVPN master secret"
-    
-    static let label2 = "OpenVPN key expansion"
-    
-    static let preMasterLength = 48
-    
-    static let keyLength = 64
-    
-    static let keysCount = 4
 }
 
 extension CustomStringConvertible {

TunnelKit/Sources/Core/Errors.h

@@ -40,16 +40,16 @@ extern NSString *const TunnelKitErrorDomain;
 extern NSString *const TunnelKitErrorKey;
 
 typedef NS_ENUM(NSInteger, TunnelKitErrorCode) {
-    TunnelKitErrorCodeCryptoBoxRandomGenerator  = 101,
+    TunnelKitErrorCodeCryptoRandomGenerator     = 101,
-    TunnelKitErrorCodeCryptoBoxHMAC             = 102,
+    TunnelKitErrorCodeCryptoHMAC                = 102,
-    TunnelKitErrorCodeCryptoBoxEncryption       = 103,
+    TunnelKitErrorCodeCryptoEncryption          = 103,
-    TunnelKitErrorCodeCryptoBoxAlgorithm        = 104,
+    TunnelKitErrorCodeCryptoAlgorithm           = 104,
-    TunnelKitErrorCodeTLSBoxCA                  = 201,
+    TunnelKitErrorCodeTLSCertificateAuthority   = 201,
-    TunnelKitErrorCodeTLSBoxHandshake           = 202,
+    TunnelKitErrorCodeTLSHandshake              = 202,
-    TunnelKitErrorCodeTLSBoxClientCertificate   = 204,
+    TunnelKitErrorCodeTLSClientCertificate      = 204,
-    TunnelKitErrorCodeTLSBoxClientKey           = 205,
+    TunnelKitErrorCodeTLSClientKey              = 205,
-    TunnelKitErrorCodeTLSBoxServerCertificate   = 206,
+    TunnelKitErrorCodeTLSServerCertificate      = 206,
-    TunnelKitErrorCodeTLSBoxServerEKU           = 207,
+    TunnelKitErrorCodeTLSServerEKU              = 207,
     TunnelKitErrorCodeDataPathOverflow          = 301,
     TunnelKitErrorCodeDataPathPeerIdMismatch    = 302,
     TunnelKitErrorCodeDataPathCompression       = 303,

TunnelKit/Sources/Core/LinkInterface.swift

@@ -50,10 +50,4 @@ public protocol LinkInterface: IOInterface {
     
     /// The number of packets that this interface is able to bufferize.
     var packetBufferSize: Int { get }
-
-    /// Timeout in seconds for negotiation start.
-    var negotiationTimeout: TimeInterval { get }
-
-    /// Timeout in seconds for HARD_RESET response.
-    var hardResetTimeout: TimeInterval { get }
 }

TunnelKit/Sources/Core/SecureRandom.swift

@@ -36,7 +36,7 @@
 
 import Foundation
 import Security.SecRandom
-import __TunnelKitNative
+import __TunnelKitCore
 
 enum SecureRandomError: Error {
     case randomGenerator

TunnelKit/Sources/Core/ZeroingData.swift

@@ -35,7 +35,7 @@
 //
 
 import Foundation
-import __TunnelKitNative
+import __TunnelKitCore
 
 func Z() -> ZeroingData {
     return ZeroingData()

TunnelKit/Sources/Core/module.modulemap

@@ -34,23 +34,11 @@
 //      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-module __TunnelKitNative {
+module __TunnelKitCore {
-    header "Errors.h"
-    header "ZeroingData.h"
-    header "TLSBox.h"
-    header "Crypto.h"
-    header "CryptoBox.h"
-    header "MSS.h"
-    header "PacketMacros.h"
-    header "PacketStream.h"
-    header "ControlPacket.h"
-    header "ReplayProtector.h"
-    header "CompressionFramingNative.h"
-    header "CompressionAlgorithmNative.h"
-    header "DataPath.h"
-    header "DataPathCrypto.h"
     header "DNS.h"
+    header "Errors.h"
     header "LZO.h"
     header "RoutingTable.h"
+    header "ZeroingData.h"
     export *
 }

TunnelKit/Sources/OpenVPN/ConfigurationParser.swift

@@ -25,7 +25,7 @@
 
 import Foundation
 import SwiftyBeaver
-import __TunnelKitNative
+import __TunnelKitCore
 
 private let log = SwiftyBeaver.self
 

TunnelKit/Sources/OpenVPN/ControlChannel.swift

@@ -24,8 +24,9 @@
 //
 
 import Foundation
-import __TunnelKitNative
 import SwiftyBeaver
+import __TunnelKitCore
+import __TunnelKitOpenVPN
 
 private let log = SwiftyBeaver.self
 
@@ -163,7 +164,7 @@ class ControlChannel {
         for packet in queue.outbound {
             if let sentDate = packet.sentDate {
                 let timeAgo = -sentDate.timeIntervalSinceNow
-                guard (timeAgo >= CoreConfiguration.retransmissionLimit) else {
+                guard (timeAgo >= CoreConfiguration.OpenVPN.retransmissionLimit) else {
                     log.debug("Control: Skip writing packet with packetId \(packet.packetId) (sent on \(sentDate), \(timeAgo) seconds ago)")
                     continue
                 }

TunnelKit/Sources/OpenVPN/ControlChannelSerializer.swift

@@ -24,8 +24,9 @@
 //
 
 import Foundation
-import __TunnelKitNative
 import SwiftyBeaver
+import __TunnelKitCore
+import __TunnelKitOpenVPN
 
 private let log = SwiftyBeaver.self
 

TunnelKit/Sources/OpenVPN/ControlPacket.m

@@ -24,6 +24,7 @@
 //
 
 #import "ControlPacket.h"
+#import "Crypto.h"
 
 @implementation ControlPacket
 

TunnelKit/Sources/OpenVPN/CoreConfiguration+OpenVPN.swift

@@ -0,0 +1,97 @@
+//
+//  CoreConfiguration+OpenVPN.swift
+//  TunnelKit
+//
+//  Created by Davide De Rosa on 5/19/19.
+//  Copyright (c) 2019 Davide De Rosa. All rights reserved.
+//
+//  https://github.com/passepartoutvpn
+//
+//  This file is part of TunnelKit.
+//
+//  TunnelKit is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  TunnelKit is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with TunnelKit.  If not, see <http://www.gnu.org/licenses/>.
+//
+//  This file incorporates work covered by the following copyright and
+//  permission notice:
+//
+//      Copyright (c) 2018-Present Private Internet Access
+//
+//      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+//      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+//      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+import Foundation
+import __TunnelKitCore
+import __TunnelKitOpenVPN
+
+extension CoreConfiguration {
+    struct OpenVPN {
+    
+        // MARK: Session
+        
+        static let usesReplayProtection = true
+
+        static let negotiationTimeout = 30.0
+        
+        static let hardResetTimeout = 10.0
+
+        static let tickInterval = 0.2
+        
+        static let pushRequestInterval = 2.0
+        
+        static let pingTimeout = 120.0
+        
+        static let retransmissionLimit = 0.1
+        
+        static let softResetDelay = 5.0
+        
+        static let softNegotiationTimeout = 120.0
+        
+        // MARK: Authentication
+        
+        static let peerInfo: String = {
+            var info = [
+                "IV_VER=2.4",
+                "IV_PLAT=mac",
+                "IV_UI_VER=\(identifier) \(version)",
+                "IV_PROTO=2",
+                "IV_NCP=2",
+                "IV_SSL=\(CryptoBox.version())",
+                "IV_LZO_STUB=1",
+            ]
+            if LZOIsSupported() {
+                info.append("IV_LZO=1")
+            }
+            info.append("")
+            return info.joined(separator: "\n")
+        }()
+        
+        static let randomLength = 32
+        
+        // MARK: Keys
+        
+        static let label1 = "OpenVPN master secret"
+        
+        static let label2 = "OpenVPN key expansion"
+        
+        static let preMasterLength = 48
+        
+        static let keyLength = 64
+        
+        static let keysCount = 4
+    }
+}

TunnelKit/Sources/OpenVPN/Crypto.h

@@ -36,10 +36,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "ZeroingData.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
+@class ZeroingData;
 @protocol DataPathEncrypter;
 @protocol DataPathDecrypter;
 

TunnelKit/Sources/OpenVPN/CryptoAEAD.m

@@ -40,6 +40,8 @@
 
 #import "CryptoAEAD.h"
 #import "CryptoMacros.h"
+#import "PacketMacros.h"
+#import "ZeroingData.h"
 #import "Allocation.h"
 #import "Errors.h"
 

TunnelKit/Sources/OpenVPN/CryptoBox.h

@@ -36,10 +36,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "ZeroingData.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
+@class ZeroingData;
 @protocol Encrypter;
 @protocol Decrypter;
 

TunnelKit/Sources/OpenVPN/CryptoBox.m

@@ -111,7 +111,7 @@
         if ([self.cipherAlgorithm hasSuffix:@"-cbc"]) {
             if (!self.digestAlgorithm) {
                 if (error) {
-                    *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoBoxAlgorithm);
+                    *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoAlgorithm);
                 }
                 return NO;
             }
@@ -132,7 +132,7 @@
         // not supported
         else {
             if (error) {
-                *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoBoxAlgorithm);
+                *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoAlgorithm);
             }
             return NO;
         }

TunnelKit/Sources/OpenVPN/CryptoCBC.m

@@ -41,6 +41,7 @@
 #import "CryptoCBC.h"
 #import "CryptoMacros.h"
 #import "PacketMacros.h"
+#import "ZeroingData.h"
 #import "Allocation.h"
 #import "Errors.h"
 
@@ -152,7 +153,7 @@ const NSInteger CryptoCBCMaxHMACLength = 100;
     if (self.cipher) {
         if (RAND_bytes(outIV, self.cipherIVLength) != 1) {
             if (error) {
-                *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoBoxRandomGenerator);
+                *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoRandomGenerator);
             }
             return NO;
         }
@@ -215,7 +216,7 @@ const NSInteger CryptoCBCMaxHMACLength = 100;
     
     if (TUNNEL_CRYPTO_SUCCESS(code) && CRYPTO_memcmp(self.bufferDecHMAC, bytes, self.digestLength) != 0) {
         if (error) {
-            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoBoxHMAC);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoHMAC);
         }
         return NO;
     }
@@ -240,7 +241,7 @@ const NSInteger CryptoCBCMaxHMACLength = 100;
     
     if (TUNNEL_CRYPTO_SUCCESS(code) && CRYPTO_memcmp(self.bufferDecHMAC, bytes, self.digestLength) != 0) {
         if (error) {
-            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoBoxHMAC);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoHMAC);
         }
         return NO;
     }

TunnelKit/Sources/OpenVPN/CryptoCTR.m

@@ -30,6 +30,7 @@
 #import "CryptoCTR.h"
 #import "CryptoMacros.h"
 #import "PacketMacros.h"
+#import "ZeroingData.h"
 #import "Allocation.h"
 #import "Errors.h"
 
@@ -195,7 +196,7 @@ static const NSInteger CryptoCTRTagLength = 32;
     
     if (TUNNEL_CRYPTO_SUCCESS(code) && CRYPTO_memcmp(self.bufferDecHMAC, bytes, CryptoCTRTagLength) != 0) {
         if (error) {
-            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoBoxHMAC);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoHMAC);
         }
         return NO;
     }

TunnelKit/Sources/OpenVPN/CryptoContainer.swift

@@ -35,7 +35,7 @@
 //
 
 import Foundation
-import __TunnelKitNative
+import __TunnelKitOpenVPN
 
 /// Represents a cryptographic container in PEM format.
 public struct CryptoContainer: Equatable {

TunnelKit/Sources/OpenVPN/CryptoMacros.h

@@ -41,7 +41,7 @@
 #define TUNNEL_CRYPTO_RETURN_STATUS(ret)\
 if (ret <= 0) {\
     if (error) {\
-        *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoBoxEncryption);\
+        *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoEncryption);\
     }\
     return NO;\
 }\

TunnelKit/Sources/OpenVPN/DataPath.h

@@ -36,6 +36,9 @@
 
 #import <Foundation/Foundation.h>
 
+#import "CompressionFramingNative.h"
+#import "CompressionAlgorithmNative.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol DataPathEncrypter;

TunnelKit/Sources/OpenVPN/DataPath.m

@@ -38,6 +38,7 @@
 
 #import "DataPath.h"
 #import "DataPathCrypto.h"
+#import "PacketMacros.h"
 #import "MSS.h"
 #import "ReplayProtector.h"
 #import "LZO.h"

TunnelKit/Sources/OpenVPN/MSS.h

@@ -35,5 +35,6 @@
 //
 
 #import <stdint.h>
+#import <Foundation/Foundation.h>
 
 void MSSFix(uint8_t *data, NSInteger data_len);

TunnelKit/Sources/OpenVPN/Packet.swift

@@ -35,9 +35,7 @@
 //
 
 import Foundation
-import __TunnelKitNative
+import __TunnelKitOpenVPN
-
-// TODO: convert to C for efficiency
 
 ///// Reads and writes packets as a stream. Useful for stream-oriented links (e.g TCP/IP).
 //public class PacketStream {

TunnelKit/Sources/OpenVPN/SessionError.swift

@@ -35,7 +35,7 @@
 //
 
 import Foundation
-import __TunnelKitNative
+import __TunnelKitCore
 
 /// The possible errors raised/thrown during `SessionProxy` operation.
 public enum SessionError: String, Error {

TunnelKit/Sources/OpenVPN/SessionProxy+Authenticator.swift

@@ -36,7 +36,8 @@
 
 import Foundation
 import SwiftyBeaver
-import __TunnelKitNative
+import __TunnelKitCore
+import __TunnelKitOpenVPN
 
 private let log = SwiftyBeaver.self
 
@@ -68,9 +69,9 @@ extension SessionProxy {
         var withLocalOptions: Bool
         
         init(_ username: String?, _ password: String?) throws {
-            preMaster = try SecureRandom.safeData(length: CoreConfiguration.preMasterLength)
+            preMaster = try SecureRandom.safeData(length: CoreConfiguration.OpenVPN.preMasterLength)
-            random1 = try SecureRandom.safeData(length: CoreConfiguration.randomLength)
+            random1 = try SecureRandom.safeData(length: CoreConfiguration.OpenVPN.randomLength)
-            random2 = try SecureRandom.safeData(length: CoreConfiguration.randomLength)
+            random2 = try SecureRandom.safeData(length: CoreConfiguration.OpenVPN.randomLength)
             
             // XXX: not 100% secure, can't erase input username/password
             if let username = username, let password = password {
@@ -144,7 +145,7 @@ extension SessionProxy {
             }
 
             // peer info
-            raw.appendSized(Z(CoreConfiguration.peerInfo, nullTerminated: true))
+            raw.appendSized(Z(CoreConfiguration.OpenVPN.peerInfo, nullTerminated: true))
 
             if CoreConfiguration.logsSensitiveData {
                 log.debug("TLS.auth: Put plaintext (\(raw.count) bytes): \(raw.toHex())")
@@ -165,7 +166,7 @@ extension SessionProxy {
             let prefixLength = ProtocolMacros.tlsPrefix.count
 
             // TLS prefix + random (x2) + opts length [+ opts]
-            guard (controlBuffer.count >= prefixLength + 2 * CoreConfiguration.randomLength + 2) else {
+            guard (controlBuffer.count >= prefixLength + 2 * CoreConfiguration.OpenVPN.randomLength + 2) else {
                 return false
             }
             
@@ -176,11 +177,11 @@ extension SessionProxy {
             
             var offset = ProtocolMacros.tlsPrefix.count
             
-            let serverRandom1 = controlBuffer.withOffset(offset, count: CoreConfiguration.randomLength)
+            let serverRandom1 = controlBuffer.withOffset(offset, count: CoreConfiguration.OpenVPN.randomLength)
-            offset += CoreConfiguration.randomLength
+            offset += CoreConfiguration.OpenVPN.randomLength
             
-            let serverRandom2 = controlBuffer.withOffset(offset, count: CoreConfiguration.randomLength)
+            let serverRandom2 = controlBuffer.withOffset(offset, count: CoreConfiguration.OpenVPN.randomLength)
-            offset += CoreConfiguration.randomLength
+            offset += CoreConfiguration.OpenVPN.randomLength
             
             let serverOptsLength = Int(controlBuffer.networkUInt16Value(fromOffset: offset))
             offset += 2

TunnelKit/Sources/OpenVPN/SessionProxy+CompressionAlgorithm.swift

@@ -24,7 +24,7 @@
 //
 
 import Foundation
-import __TunnelKitNative
+import __TunnelKitOpenVPN
 
 extension SessionProxy {
     

TunnelKit/Sources/OpenVPN/SessionProxy+CompressionFraming.swift

@@ -24,7 +24,7 @@
 //
 
 import Foundation
-import __TunnelKitNative
+import __TunnelKitOpenVPN
 
 extension SessionProxy {
 

TunnelKit/Sources/OpenVPN/SessionProxy+EncryptionBridge.swift

@@ -35,7 +35,8 @@
 //
 
 import Foundation
-import __TunnelKitNative
+import __TunnelKitCore
+import __TunnelKitOpenVPN
 
 extension SessionProxy {
 
@@ -134,21 +135,21 @@ extension SessionProxy {
             }
             
             let masterData = try EncryptionBridge.keysPRF(
-                CoreConfiguration.label1, auth.preMaster, auth.random1,
+                CoreConfiguration.OpenVPN.label1, auth.preMaster, auth.random1,
                 serverRandom1, nil, nil,
-                CoreConfiguration.preMasterLength
+                CoreConfiguration.OpenVPN.preMasterLength
             )
             
             let keysData = try EncryptionBridge.keysPRF(
-                CoreConfiguration.label2, masterData, auth.random2,
+                CoreConfiguration.OpenVPN.label2, masterData, auth.random2,
                 serverRandom2, sessionId, remoteSessionId,
-                CoreConfiguration.keysCount * CoreConfiguration.keyLength
+                CoreConfiguration.OpenVPN.keysCount * CoreConfiguration.OpenVPN.keyLength
             )
             
             var keysArray = [ZeroingData]()
-            for i in 0..<CoreConfiguration.keysCount {
+            for i in 0..<CoreConfiguration.OpenVPN.keysCount {
-                let offset = i * CoreConfiguration.keyLength
+                let offset = i * CoreConfiguration.OpenVPN.keyLength
-                let zbuf = keysData.withOffset(offset, count: CoreConfiguration.keyLength)
+                let zbuf = keysData.withOffset(offset, count: CoreConfiguration.OpenVPN.keyLength)
                 keysArray.append(zbuf)
             }
             

TunnelKit/Sources/OpenVPN/SessionProxy+SessionKey.swift

@@ -35,8 +35,9 @@
 //
 
 import Foundation
-import __TunnelKitNative
 import SwiftyBeaver
+import __TunnelKitCore
+import __TunnelKitOpenVPN
 
 private let log = SwiftyBeaver.self
 
@@ -84,12 +85,12 @@ extension SessionProxy {
 
         // Ruby: Key.hard_reset_timeout
         func didHardResetTimeOut(link: LinkInterface) -> Bool {
-            return ((state == .hardReset) && (-startTime.timeIntervalSinceNow > link.hardResetTimeout))
+            return ((state == .hardReset) && (-startTime.timeIntervalSinceNow > CoreConfiguration.OpenVPN.hardResetTimeout))
         }
         
         // Ruby: Key.negotiate_timeout
         func didNegotiationTimeOut(link: LinkInterface) -> Bool {
-            let timeout = (softReset ? CoreConfiguration.softNegotiationTimeout : link.negotiationTimeout)
+            let timeout = (softReset ? CoreConfiguration.OpenVPN.softNegotiationTimeout : CoreConfiguration.OpenVPN.negotiationTimeout)
             
             return ((controlState != .connected) && (-startTime.timeIntervalSinceNow > timeout))
         }

TunnelKit/Sources/OpenVPN/SessionProxy.swift

@@ -36,7 +36,8 @@
 
 import Foundation
 import SwiftyBeaver
-import __TunnelKitNative
+import __TunnelKitCore
+import __TunnelKitOpenVPN
 
 private let log = SwiftyBeaver.self
 
@@ -415,7 +416,7 @@ public class SessionProxy {
         }
         
         guard negotiationKey.controlState == .connected else {
-            queue.asyncAfter(deadline: .now() + CoreConfiguration.tickInterval) { [weak self] in
+            queue.asyncAfter(deadline: .now() + CoreConfiguration.OpenVPN.tickInterval) { [weak self] in
                 self?.loopNegotiation()
             }
             return
@@ -565,7 +566,7 @@ public class SessionProxy {
         }
         
         let now = Date()
-        guard (now.timeIntervalSince(lastPing.inbound) <= CoreConfiguration.pingTimeout) else {
+        guard (now.timeIntervalSince(lastPing.inbound) <= CoreConfiguration.OpenVPN.pingTimeout) else {
             deferStop(.shutdown, SessionError.pingTimeout)
             return
         }
@@ -733,7 +734,7 @@ public class SessionProxy {
         if negotiationKey.softReset {
             completeConnection()
         }
-        nextPushRequestDate = Date().addingTimeInterval(CoreConfiguration.pushRequestInterval)
+        nextPushRequestDate = Date().addingTimeInterval(CoreConfiguration.OpenVPN.pushRequestInterval)
     }
     
     private func maybeRenegotiate() {
@@ -898,7 +899,7 @@ public class SessionProxy {
             }
             
             negotiationKey.controlState = .preIfConfig
-            nextPushRequestDate = Date().addingTimeInterval(negotiationKey.softReset ? CoreConfiguration.softResetDelay : CoreConfiguration.retransmissionLimit)
+            nextPushRequestDate = Date().addingTimeInterval(negotiationKey.softReset ? CoreConfiguration.OpenVPN.softResetDelay : CoreConfiguration.OpenVPN.retransmissionLimit)
             pushRequest()
         }
         
@@ -1113,7 +1114,7 @@ public class SessionProxy {
             compressionFraming: (pushedFraming ?? configuration.fallbackCompressionFraming).native,
             compressionAlgorithm: (pushedCompression ?? configuration.compressionAlgorithm ?? .disabled).native,
             maxPackets: link?.packetBufferSize ?? 200,
-            usesReplayProtection: CoreConfiguration.usesReplayProtection
+            usesReplayProtection: CoreConfiguration.OpenVPN.usesReplayProtection
         )
     }
     

TunnelKit/Sources/OpenVPN/StaticKey.swift

@@ -24,7 +24,7 @@
 //
 
 import Foundation
-import __TunnelKitNative
+import __TunnelKitCore
 
 /// Represents an OpenVPN static key file (as generated with --genkey)
 public class StaticKey: Codable {

TunnelKit/Sources/OpenVPN/TLSBox.m

@@ -53,7 +53,7 @@ static const char *const TLSBoxServerEKU = "TLS Web Server Authentication";
 
 int TLSBoxVerifyPeer(int ok, X509_STORE_CTX *ctx) {
     if (!ok) {
-        NSError *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxCA);
+        NSError *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSCertificateAuthority);
         [[NSNotificationCenter defaultCenter] postNotificationName:TLSBoxPeerVerificationErrorNotification
                                                             object:nil
                                                           userInfo:@{TunnelKitErrorKey: error}];
@@ -213,7 +213,7 @@ const NSInteger TLSBoxDefaultSecurityLevel = -1;
     if (!SSL_CTX_load_verify_locations(self.ctx, [self.caPath cStringUsingEncoding:NSASCIIStringEncoding], NULL)) {
         ERR_print_errors_fp(stdout);
         if (error) {
-            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxCA);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSCertificateAuthority);
         }
         return NO;
     }
@@ -222,7 +222,7 @@ const NSInteger TLSBoxDefaultSecurityLevel = -1;
         if (!SSL_CTX_use_certificate_file(self.ctx, [self.clientCertificatePath cStringUsingEncoding:NSASCIIStringEncoding], SSL_FILETYPE_PEM)) {
             ERR_print_errors_fp(stdout);
             if (error) {
-                *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxClientCertificate);
+                *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSClientCertificate);
             }
             return NO;
         }
@@ -231,7 +231,7 @@ const NSInteger TLSBoxDefaultSecurityLevel = -1;
             if (!SSL_CTX_use_PrivateKey_file(self.ctx, [self.clientKeyPath cStringUsingEncoding:NSASCIIStringEncoding], SSL_FILETYPE_PEM)) {
                 ERR_print_errors_fp(stdout);
                 if (error) {
-                    *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxClientKey);
+                    *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSClientKey);
                 }
                 return NO;
             }
@@ -251,7 +251,7 @@ const NSInteger TLSBoxDefaultSecurityLevel = -1;
     
     if (!SSL_do_handshake(self.ssl)) {
         if (error) {
-            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxHandshake);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSHandshake);
         }
         return NO;
     }
@@ -271,7 +271,7 @@ const NSInteger TLSBoxDefaultSecurityLevel = -1;
 
         if (self.checksEKU && ![self verifyEKUWithSSL:self.ssl]) {
             if (error) {
-                *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxServerEKU);
+                *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSServerEKU);
             }
             return nil;
         }
@@ -281,7 +281,7 @@ const NSInteger TLSBoxDefaultSecurityLevel = -1;
     }
     if ((ret < 0) && !BIO_should_retry(self.bioCipherTextOut)) {
         if (error) {
-            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxHandshake);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSHandshake);
         }
     }
     return nil;
@@ -299,7 +299,7 @@ const NSInteger TLSBoxDefaultSecurityLevel = -1;
     }
     if ((ret < 0) && !BIO_should_retry(self.bioPlainText)) {
         if (error) {
-            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxHandshake);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSHandshake);
         }
     }
     return NO;
@@ -321,7 +321,7 @@ const NSInteger TLSBoxDefaultSecurityLevel = -1;
     const int ret = BIO_write(self.bioCipherTextIn, text, (int)length);
     if (ret != length) {
         if (error) {
-            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxHandshake);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSHandshake);
         }
         return NO;
     }
@@ -342,7 +342,7 @@ const NSInteger TLSBoxDefaultSecurityLevel = -1;
     const int ret = BIO_write(self.bioPlainText, text, (int)length);
     if (ret != length) {
         if (error) {
-            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxHandshake);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSHandshake);
         }
         return NO;
     }

TunnelKit/Sources/OpenVPN/module.modulemap

@@ -0,0 +1,51 @@
+//
+//  module.modulemap
+//  TunnelKit
+//
+//  Created by Davide De Rosa on 5/19/19.
+//  Copyright (c) 2019 Davide De Rosa. All rights reserved.
+//
+//  https://github.com/passepartoutvpn
+//
+//  This file is part of TunnelKit.
+//
+//  TunnelKit is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  TunnelKit is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with TunnelKit.  If not, see <http://www.gnu.org/licenses/>.
+//
+//  This file incorporates work covered by the following copyright and
+//  permission notice:
+//
+//      Copyright (c) 2018-Present Private Internet Access
+//
+//      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+//      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+//      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+module __TunnelKitOpenVPN {
+    header "CompressionAlgorithmNative.h"
+    header "CompressionFramingNative.h"
+    header "ControlPacket.h"
+    header "Crypto.h"
+    header "CryptoBox.h"
+    header "DataPath.h"
+    header "DataPathCrypto.h"
+    header "MSS.h"
+    header "PacketMacros.h"
+    header "PacketStream.h"
+    header "ReplayProtector.h"
+    header "TLSBox.h"
+    export *
+}

TunnelKitTests/CompressionTests.swift

@@ -25,7 +25,7 @@
 
 import XCTest
 @testable import TunnelKit
-import __TunnelKitNative
+import __TunnelKitCore
 
 class CompressionTests: XCTestCase {
 

TunnelKitTests/ControlChannelTests.swift

@@ -25,7 +25,8 @@
 
 import XCTest
 @testable import TunnelKit
-import __TunnelKitNative
+import __TunnelKitCore
+import __TunnelKitOpenVPN
 
 class ControlChannelTests: XCTestCase {
     private let hex = "634a4d2d459d606c8e6abbec168fdcd1871462eaa2eaed84c8f403bdf8c7da737d81b5774cc35fe0a42b38aa053f1335fd4a22d721880433bbb20ae1f2d88315b2d186b3b377685506fa39d85d38da16c2ecc0d631bda64f9d8f5a8d073f18aab97ade23e49ea9e7de86784d1ed5fa356df5f7fa1d163e5537efa8d4ba61239dc301a9aa55de0e06e33a7545f7d0cc153405576464ba92942dafa5fb79c7a60663ff1e7da3122ae09d4561653bef3eeb312ad68b191e2f94cbcf4e21caff0b59f8be86567bd21787070c2dc10a8baf7e87ce2e07d7d7de25ead11bd6d6e6ec030c0a3fd50d2d0ca3c0378022bb642e954868d7b93e18a131ecbb12b0bbedb1ce"

TunnelKitTests/DNSTests.swift

@@ -25,7 +25,7 @@
 
 import XCTest
 import TunnelKit
-import __TunnelKitNative
+import __TunnelKitCore
 
 class DNSTests: XCTestCase {
 

TunnelKitTests/DataPathEncryptionTests.swift

@@ -36,7 +36,8 @@
 
 import XCTest
 @testable import TunnelKit
-@testable import __TunnelKitNative
+import __TunnelKitCore
+import __TunnelKitOpenVPN
 
 class DataPathEncryptionTests: XCTestCase {
     private let cipherKey = try! SecureRandom.safeData(length: 32)

TunnelKitTests/DataPathPerformanceTests.swift

@@ -36,7 +36,7 @@
 
 import XCTest
 @testable import TunnelKit
-@testable import __TunnelKitNative
+import __TunnelKitOpenVPN
 
 class DataPathPerformanceTests: XCTestCase {
     private var dataPath: DataPath!

TunnelKitTests/EncryptionPerformanceTests.swift

@@ -36,7 +36,8 @@
 
 import XCTest
 @testable import TunnelKit
-@testable import __TunnelKitNative
+import __TunnelKitCore
+import __TunnelKitOpenVPN
 
 class EncryptionPerformanceTests: XCTestCase {
     private var cbcEncrypter: Encrypter!

TunnelKitTests/EncryptionTests.swift

@@ -36,7 +36,8 @@
 
 import XCTest
 @testable import TunnelKit
-@testable import __TunnelKitNative
+import __TunnelKitCore
+import __TunnelKitOpenVPN
 
 class EncryptionTests: XCTestCase {
     private var cipherEncKey: ZeroingData!

TunnelKitTests/LinkTests.swift

@@ -36,7 +36,7 @@
 
 import XCTest
 @testable import TunnelKit
-@testable import __TunnelKitNative
+@testable import __TunnelKitCore
 
 class LinkTests: XCTestCase {
 

TunnelKitTests/PacketTests.swift

@@ -25,7 +25,7 @@
 
 import XCTest
 @testable import TunnelKit
-import __TunnelKitNative
+import __TunnelKitOpenVPN
 
 class PacketTests: XCTestCase {
     

TunnelKitTests/RoutingTests.swift

@@ -24,7 +24,7 @@
 //
 
 import XCTest
-import __TunnelKitNative
+import __TunnelKitCore
 
 class RoutingTests: XCTestCase {
 

TunnelKitTests/TestUtils.swift

@@ -36,7 +36,8 @@
 
 import Foundation
 @testable import TunnelKit
-@testable import __TunnelKitNative
+import __TunnelKitCore
+import __TunnelKitOpenVPN
 
 class TestUtils {
     static func uniqArray(_ v: [Int]) -> [Int] {