Wrap OpenVPN entities in pseudonamespace

Temporarily exclude AppExtension and tests.

.jazzy.yaml

@@ -26,13 +26,10 @@ custom_categories:
         - SocketType
     - name: OpenVPN
       children:
-        - ConfigurationParser
+        - OpenVPN
-        - CryptoContainer
         - SessionError
-        - SessionProxy
         - SessionProxyDelegate
         - SessionReply
-        - StaticKey
     - name: AppExtension
       children:
         - TunnelKitProvider

TunnelKit.xcodeproj/project.pbxproj

@@ -11,15 +11,12 @@
 		0E011F7B2196D93600BA59EE /* SocketType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F792196D93600BA59EE /* SocketType.swift */; };
 		0E011F7D2196D97200BA59EE /* EndpointProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F7C2196D97200BA59EE /* EndpointProtocol.swift */; };
 		0E011F7E2196D97200BA59EE /* EndpointProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F7C2196D97200BA59EE /* EndpointProtocol.swift */; };
-		0E011F812196E23700BA59EE /* ConfigurationParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F7F2196E20300BA59EE /* ConfigurationParserTests.swift */; };
-		0E011F822196E23800BA59EE /* ConfigurationParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F7F2196E20300BA59EE /* ConfigurationParserTests.swift */; };
 		0E011F852196E25900BA59EE /* pia-hungary.ovpn in Resources */ = {isa = PBXBuildFile; fileRef = 0E011F832196E25400BA59EE /* pia-hungary.ovpn */; };
 		0E011F862196E25A00BA59EE /* pia-hungary.ovpn in Resources */ = {isa = PBXBuildFile; fileRef = 0E011F832196E25400BA59EE /* pia-hungary.ovpn */; };
 		0E011F882196E2AB00BA59EE /* ConfigurationParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F872196E2AB00BA59EE /* ConfigurationParser.swift */; };
 		0E011F892196E2AB00BA59EE /* ConfigurationParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E011F872196E2AB00BA59EE /* ConfigurationParser.swift */; };
-		0E041D092152E6FE0025FE3C /* SessionProxy+TLSWrap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E041D082152E6FE0025FE3C /* SessionProxy+TLSWrap.swift */; };
+		0E041D092152E6FE0025FE3C /* TLSWrap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E041D082152E6FE0025FE3C /* TLSWrap.swift */; };
-		0E041D0A2152E6FE0025FE3C /* SessionProxy+TLSWrap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E041D082152E6FE0025FE3C /* SessionProxy+TLSWrap.swift */; };
+		0E041D0A2152E6FE0025FE3C /* TLSWrap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E041D082152E6FE0025FE3C /* TLSWrap.swift */; };
-		0E041D0C2152E80A0025FE3C /* StaticKeyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E041D0B2152E80A0025FE3C /* StaticKeyTests.swift */; };
 		0E07595F20EF6D1400F38FD8 /* CryptoCBC.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E07595C20EF6D1400F38FD8 /* CryptoCBC.m */; };
 		0E07596020EF6D1400F38FD8 /* CryptoCBC.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E07595C20EF6D1400F38FD8 /* CryptoCBC.m */; };
 		0E07596320EF733F00F38FD8 /* CryptoMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E07596120EF733F00F38FD8 /* CryptoMacros.h */; };
@@ -32,16 +29,14 @@
 		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 */; };
-		0E0B203C227886AD007A3CB9 /* RoutingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E0B203B227886AD007A3CB9 /* RoutingTests.swift */; };
-		0E0B203D227886AD007A3CB9 /* RoutingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E0B203B227886AD007A3CB9 /* RoutingTests.swift */; };
 		0E0B20402278A85C007A3CB9 /* RoutingTableEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E0B203E2278A85B007A3CB9 /* RoutingTableEntry.h */; };
 		0E0B20412278A85C007A3CB9 /* RoutingTableEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E0B203E2278A85B007A3CB9 /* RoutingTableEntry.h */; };
 		0E0B20422278A85C007A3CB9 /* RoutingTableEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E0B203F2278A85B007A3CB9 /* RoutingTableEntry.m */; };
 		0E0B20432278A85C007A3CB9 /* RoutingTableEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E0B203F2278A85B007A3CB9 /* RoutingTableEntry.m */; };
 		0E0C2125212ED29D008AB282 /* SessionError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E0C2123212ED29D008AB282 /* SessionError.swift */; };
 		0E0C2126212ED29D008AB282 /* SessionError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E0C2123212ED29D008AB282 /* SessionError.swift */; };
-		0E0C2127212ED29D008AB282 /* SessionProxy+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E0C2124212ED29D008AB282 /* SessionProxy+Configuration.swift */; };
+		0E0C2127212ED29D008AB282 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E0C2124212ED29D008AB282 /* Configuration.swift */; };
-		0E0C2128212ED29D008AB282 /* SessionProxy+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E0C2124212ED29D008AB282 /* SessionProxy+Configuration.swift */; };
+		0E0C2128212ED29D008AB282 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E0C2124212ED29D008AB282 /* Configuration.swift */; };
 		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 */; };
@@ -50,14 +45,12 @@
 		0E1108B61F77B9F900A92462 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0E1108B41F77B9F900A92462 /* LaunchScreen.storyboard */; };
 		0E12B29E21449ADB00B4BAE9 /* NSRegularExpression+Shortcuts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E12B29D21449ADB00B4BAE9 /* NSRegularExpression+Shortcuts.swift */; };
 		0E12B29F21449ADB00B4BAE9 /* NSRegularExpression+Shortcuts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E12B29D21449ADB00B4BAE9 /* NSRegularExpression+Shortcuts.swift */; };
-		0E12B2A32145341B00B4BAE9 /* PacketTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E12B2A22145341B00B4BAE9 /* PacketTests.swift */; };
 		0E12B2A521454F7F00B4BAE9 /* BidirectionalState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E12B2A421454F7F00B4BAE9 /* BidirectionalState.swift */; };
 		0E12B2A621454F7F00B4BAE9 /* BidirectionalState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E12B2A421454F7F00B4BAE9 /* BidirectionalState.swift */; };
 		0E12B2A821456C0200B4BAE9 /* ControlChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E12B2A721456C0200B4BAE9 /* ControlChannel.swift */; };
 		0E12B2A921456C0200B4BAE9 /* ControlChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E12B2A721456C0200B4BAE9 /* ControlChannel.swift */; };
 		0E12B2AB2145E01700B4BAE9 /* ControlChannelSerializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E12B2AA2145E01700B4BAE9 /* ControlChannelSerializer.swift */; };
 		0E12B2AC2145E01700B4BAE9 /* ControlChannelSerializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E12B2AA2145E01700B4BAE9 /* ControlChannelSerializer.swift */; };
-		0E245D692135972800B012A2 /* PushTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E245D682135972800B012A2 /* PushTests.swift */; };
 		0E245D6C2137F73600B012A2 /* CompressionFramingNative.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E245D6B2137F73600B012A2 /* CompressionFramingNative.h */; };
 		0E39BCE8214B2AB60035E9DE /* ControlPacket.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E39BCE6214B2AB60035E9DE /* ControlPacket.h */; };
 		0E39BCE9214B2AB60035E9DE /* ControlPacket.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E39BCE6214B2AB60035E9DE /* ControlPacket.h */; };
@@ -71,8 +64,8 @@
 		0E3B65752249253B00EFF4DA /* tunnelbear.enc.1.ovpn in Resources */ = {isa = PBXBuildFile; fileRef = 0E3B656E224923EC00EFF4DA /* tunnelbear.enc.1.ovpn */; };
 		0E3B65762249253F00EFF4DA /* tunnelbear.key in Resources */ = {isa = PBXBuildFile; fileRef = 0E3B65712249247E00EFF4DA /* tunnelbear.key */; };
 		0E3B65772249254000EFF4DA /* tunnelbear.key in Resources */ = {isa = PBXBuildFile; fileRef = 0E3B65712249247E00EFF4DA /* tunnelbear.key */; };
-		0E3E0F212108A8CC00B371C1 /* SessionProxy+SessionReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E3E0F202108A8CC00B371C1 /* SessionProxy+SessionReply.swift */; };
+		0E3E0F212108A8CC00B371C1 /* SessionReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E3E0F202108A8CC00B371C1 /* SessionReply.swift */; };
-		0E3E0F222108A8CC00B371C1 /* SessionProxy+SessionReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E3E0F202108A8CC00B371C1 /* SessionProxy+SessionReply.swift */; };
+		0E3E0F222108A8CC00B371C1 /* SessionReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E3E0F202108A8CC00B371C1 /* SessionReply.swift */; };
 		0E411B9B2271F90700E0852C /* DNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E411B992271F90700E0852C /* DNS.h */; };
 		0E411B9C2271F90700E0852C /* DNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E411B992271F90700E0852C /* DNS.h */; };
 		0E411B9D2271F90700E0852C /* DNS.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E411B9A2271F90700E0852C /* DNS.m */; };
@@ -85,7 +78,6 @@
 		0E48AC672271ADA9009B1A98 /* PacketStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E48AC632271ADA9009B1A98 /* PacketStream.m */; };
 		0E500EA622493B5B00CAE560 /* tunnelbear.enc.1.key in Resources */ = {isa = PBXBuildFile; fileRef = 0E500EA522493B5B00CAE560 /* tunnelbear.enc.1.key */; };
 		0E500EA722493B5B00CAE560 /* tunnelbear.enc.1.key in Resources */ = {isa = PBXBuildFile; fileRef = 0E500EA522493B5B00CAE560 /* tunnelbear.enc.1.key */; };
-		0E50D57521634E0A00FC87A8 /* ControlChannelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E50D57421634E0A00FC87A8 /* ControlChannelTests.swift */; };
 		0E58BF3322405410006FB157 /* lzoconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E58BF2F22405410006FB157 /* lzoconf.h */; };
 		0E58BF3422405410006FB157 /* lzoconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E58BF2F22405410006FB157 /* lzoconf.h */; };
 		0E58BF3522405410006FB157 /* lzodefs.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E58BF3022405410006FB157 /* lzodefs.h */; };
@@ -94,81 +86,24 @@
 		0E58BF3822405410006FB157 /* minilzo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E58BF3122405410006FB157 /* minilzo.h */; };
 		0E58BF3922405410006FB157 /* minilzo.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E58BF3222405410006FB157 /* minilzo.c */; };
 		0E58BF3A22405410006FB157 /* minilzo.c in Sources */ = {isa = PBXBuildFile; fileRef = 0E58BF3222405410006FB157 /* minilzo.c */; };
-		0E58BF3C2240547F006FB157 /* CompressionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E58BF3B2240547F006FB157 /* CompressionTests.swift */; };
-		0E58BF3D2240547F006FB157 /* CompressionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E58BF3B2240547F006FB157 /* CompressionTests.swift */; };
 		0E58BF4C22405C2F006FB157 /* StandardLZO.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E58BF4922405C2F006FB157 /* StandardLZO.m */; };
 		0E58BF4D22405C2F006FB157 /* StandardLZO.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E58BF4922405C2F006FB157 /* StandardLZO.m */; };
 		0E58BF502240F98F006FB157 /* CompressionAlgorithmNative.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E58BF4F2240F98E006FB157 /* CompressionAlgorithmNative.h */; };
 		0E58BF512240F98F006FB157 /* CompressionAlgorithmNative.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E58BF4F2240F98E006FB157 /* CompressionAlgorithmNative.h */; };
-		0E58BF532240FAA6006FB157 /* SessionProxy+CompressionAlgorithm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E58BF522240FAA6006FB157 /* SessionProxy+CompressionAlgorithm.swift */; };
+		0E58BF532240FAA6006FB157 /* CompressionAlgorithm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E58BF522240FAA6006FB157 /* CompressionAlgorithm.swift */; };
-		0E58BF542240FAA6006FB157 /* SessionProxy+CompressionAlgorithm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E58BF522240FAA6006FB157 /* SessionProxy+CompressionAlgorithm.swift */; };
+		0E58BF542240FAA6006FB157 /* CompressionAlgorithm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E58BF522240FAA6006FB157 /* CompressionAlgorithm.swift */; };
 		0E58BF5622411F3D006FB157 /* LZO.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E58BF5522411F37006FB157 /* LZO.h */; };
 		0E58BF5722411F3E006FB157 /* LZO.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E58BF5522411F37006FB157 /* LZO.h */; };
 		0E58BF5922411FEF006FB157 /* LZO.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E58BF5822411FEF006FB157 /* LZO.m */; };
 		0E58BF5A22411FEF006FB157 /* LZO.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E58BF5822411FEF006FB157 /* LZO.m */; };
-		0E58F1302138AC2F00A49F27 /* DNSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E58F12F2138AC2F00A49F27 /* DNSTests.swift */; };
 		0E749F5F2178885500BB2701 /* SessionProxy+PIA.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E749F5E2178885500BB2701 /* SessionProxy+PIA.swift */; };
 		0E749F602178885500BB2701 /* SessionProxy+PIA.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E749F5E2178885500BB2701 /* SessionProxy+PIA.swift */; };
 		0E749F622178911D00BB2701 /* pia-2048.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0E749F612178911C00BB2701 /* pia-2048.pem */; };
-		0E85A25A202CC5AF0059E9F9 /* AppExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E85A259202CC5AE0059E9F9 /* AppExtensionTests.swift */; };
 		0E9379C91F819A4300CE91B6 /* TunnelKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E17D7F91F730D9F009EE129 /* TunnelKit.framework */; };
 		0EA82A282190B220007960EB /* TunnelKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E3251C51F95770D00C108D9 /* TunnelKit.framework */; };
-		0EA82A2F2190B2B9007960EB /* AppExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E85A259202CC5AE0059E9F9 /* AppExtensionTests.swift */; };
-		0EA82A302190B2B9007960EB /* ControlChannelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E50D57421634E0A00FC87A8 /* ControlChannelTests.swift */; };
-		0EA82A312190B2B9007960EB /* DataManipulationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B45420F0BB53004233D7 /* DataManipulationTests.swift */; };
-		0EA82A322190B2B9007960EB /* DataPathEncryptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7A7A020F664AB00B42E6A /* DataPathEncryptionTests.swift */; };
-		0EA82A332190B2B9007960EB /* DataPathPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B46020F0C0A4004233D7 /* DataPathPerformanceTests.swift */; };
-		0EA82A342190B2B9007960EB /* DNSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E58F12F2138AC2F00A49F27 /* DNSTests.swift */; };
-		0EA82A352190B2B9007960EB /* EncryptionPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B45E20F0C098004233D7 /* EncryptionPerformanceTests.swift */; };
-		0EA82A362190B2B9007960EB /* EncryptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B45220F0BB44004233D7 /* EncryptionTests.swift */; };
-		0EA82A372190B2B9007960EB /* LinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B45820F0BD9A004233D7 /* LinkTests.swift */; };
-		0EA82A382190B2B9007960EB /* PacketTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E12B2A22145341B00B4BAE9 /* PacketTests.swift */; };
-		0EA82A392190B2B9007960EB /* PushTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E245D682135972800B012A2 /* PushTests.swift */; };
-		0EA82A3A2190B2B9007960EB /* RandomTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B45620F0BD16004233D7 /* RandomTests.swift */; };
-		0EA82A3B2190B2B9007960EB /* RawPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B45C20F0BF41004233D7 /* RawPerformanceTests.swift */; };
-		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 */; };
-		0EB2B45920F0BD9A004233D7 /* LinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B45820F0BD9A004233D7 /* LinkTests.swift */; };
-		0EB2B45B20F0BE4C004233D7 /* TestUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EB2B45A20F0BE4C004233D7 /* TestUtils.swift */; };
-		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 */; };
 		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 */; };
@@ -179,19 +114,20 @@
 		0ECEB1182252C8E900E9E551 /* tunnelbear.enc.8.key in Resources */ = {isa = PBXBuildFile; fileRef = 0ECEB1142252C8E900E9E551 /* tunnelbear.enc.8.key */; };
 		0ECEB11B2252CDAD00E9E551 /* tunnelbear.crt in Resources */ = {isa = PBXBuildFile; fileRef = 0ECEB11A2252CDAD00E9E551 /* tunnelbear.crt */; };
 		0ECEB11C2252CDAD00E9E551 /* tunnelbear.crt in Resources */ = {isa = PBXBuildFile; fileRef = 0ECEB11A2252CDAD00E9E551 /* tunnelbear.crt */; };
-		0ED9C8642138139000621BA3 /* SessionProxy+CompressionFraming.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ED9C8632138139000621BA3 /* SessionProxy+CompressionFraming.swift */; };
+		0ED9C8642138139000621BA3 /* CompressionFraming.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ED9C8632138139000621BA3 /* CompressionFraming.swift */; };
-		0ED9C8652138139000621BA3 /* SessionProxy+CompressionFraming.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ED9C8632138139000621BA3 /* SessionProxy+CompressionFraming.swift */; };
+		0ED9C8652138139000621BA3 /* CompressionFraming.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ED9C8632138139000621BA3 /* CompressionFraming.swift */; };
 		0EE2F96E2291636B00F56F49 /* IPv4Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE2F96D2291636B00F56F49 /* IPv4Settings.swift */; };
 		0EE2F96F2291636B00F56F49 /* IPv4Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE2F96D2291636B00F56F49 /* IPv4Settings.swift */; };
 		0EE2F9712291638600F56F49 /* IPv6Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE2F9702291638600F56F49 /* IPv6Settings.swift */; };
 		0EE2F9722291638600F56F49 /* IPv6Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE2F9702291638600F56F49 /* IPv6Settings.swift */; };
 		0EE2F974229163C900F56F49 /* Proxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE2F973229163C900F56F49 /* Proxy.swift */; };
 		0EE2F975229163C900F56F49 /* Proxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE2F973229163C900F56F49 /* Proxy.swift */; };
+		0EE2F97722916A5D00F56F49 /* OpenVPN.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE2F97622916A5D00F56F49 /* OpenVPN.swift */; };
+		0EE2F97822916A5D00F56F49 /* OpenVPN.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE2F97622916A5D00F56F49 /* OpenVPN.swift */; };
 		0EE3B3E421471C3A0027AB17 /* StaticKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE3B3E321471C3A0027AB17 /* StaticKey.swift */; };
 		0EE3B3E521471C3A0027AB17 /* StaticKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE3B3E321471C3A0027AB17 /* StaticKey.swift */; };
 		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 */; };
 		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 */; };
@@ -207,8 +143,8 @@
 		0EFB902A22788511006405E4 /* RoutingTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 0EFB902722788511006405E4 /* RoutingTable.h */; };
 		0EFB902B22788512006405E4 /* RoutingTable.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFB902822788511006405E4 /* RoutingTable.m */; };
 		0EFB902C22788512006405E4 /* RoutingTable.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFB902822788511006405E4 /* RoutingTable.m */; };
-		0EFEB4552006D3C800F81029 /* SessionProxy+EncryptionBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42A2006D3C800F81029 /* SessionProxy+EncryptionBridge.swift */; };
+		0EFEB4552006D3C800F81029 /* EncryptionBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42A2006D3C800F81029 /* EncryptionBridge.swift */; };
-		0EFEB4562006D3C800F81029 /* SessionProxy+SessionKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42B2006D3C800F81029 /* SessionProxy+SessionKey.swift */; };
+		0EFEB4562006D3C800F81029 /* SessionKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42B2006D3C800F81029 /* SessionKey.swift */; };
 		0EFEB4582006D3C800F81029 /* MSS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0EFEB42D2006D3C800F81029 /* MSS.h */; };
 		0EFEB4592006D3C800F81029 /* Allocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 0EFEB42E2006D3C800F81029 /* Allocation.h */; };
 		0EFEB45A2006D3C800F81029 /* TunnelInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42F2006D3C800F81029 /* TunnelInterface.swift */; };
@@ -220,7 +156,7 @@
 		0EFEB4622006D3C800F81029 /* SecureRandom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4372006D3C800F81029 /* SecureRandom.swift */; };
 		0EFEB4632006D3C800F81029 /* ProtocolMacros.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4382006D3C800F81029 /* ProtocolMacros.swift */; };
 		0EFEB4642006D3C800F81029 /* ReplayProtector.h in Headers */ = {isa = PBXBuildFile; fileRef = 0EFEB4392006D3C800F81029 /* ReplayProtector.h */; };
-		0EFEB4652006D3C800F81029 /* SessionProxy+Authenticator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB43A2006D3C800F81029 /* SessionProxy+Authenticator.swift */; };
+		0EFEB4652006D3C800F81029 /* Authenticator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB43A2006D3C800F81029 /* Authenticator.swift */; };
 		0EFEB4662006D3C800F81029 /* ZeroingData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB43B2006D3C800F81029 /* ZeroingData.swift */; };
 		0EFEB4672006D3C800F81029 /* SessionProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB43C2006D3C800F81029 /* SessionProxy.swift */; };
 		0EFEB4682006D3C800F81029 /* MSS.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB43D2006D3C800F81029 /* MSS.m */; };
@@ -236,15 +172,15 @@
 		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 */; };
-		0EFEB48D2006D7F300F81029 /* SessionProxy+EncryptionBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42A2006D3C800F81029 /* SessionProxy+EncryptionBridge.swift */; };
+		0EFEB48D2006D7F300F81029 /* EncryptionBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42A2006D3C800F81029 /* EncryptionBridge.swift */; };
-		0EFEB48E2006D7F300F81029 /* SessionProxy+SessionKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42B2006D3C800F81029 /* SessionProxy+SessionKey.swift */; };
+		0EFEB48E2006D7F300F81029 /* SessionKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42B2006D3C800F81029 /* SessionKey.swift */; };
 		0EFEB4902006D7F300F81029 /* TunnelInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42F2006D3C800F81029 /* TunnelInterface.swift */; };
 		0EFEB4912006D7F300F81029 /* TLSBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4302006D3C800F81029 /* TLSBox.m */; };
 		0EFEB4922006D7F300F81029 /* ZeroingData.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4312006D3C800F81029 /* ZeroingData.m */; };
 		0EFEB4932006D7F300F81029 /* CryptoBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4322006D3C800F81029 /* CryptoBox.m */; };
 		0EFEB4952006D7F300F81029 /* SecureRandom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4372006D3C800F81029 /* SecureRandom.swift */; };
 		0EFEB4962006D7F300F81029 /* ProtocolMacros.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4382006D3C800F81029 /* ProtocolMacros.swift */; };
-		0EFEB4972006D7F300F81029 /* SessionProxy+Authenticator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB43A2006D3C800F81029 /* SessionProxy+Authenticator.swift */; };
+		0EFEB4972006D7F300F81029 /* Authenticator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB43A2006D3C800F81029 /* Authenticator.swift */; };
 		0EFEB4982006D7F300F81029 /* ZeroingData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB43B2006D3C800F81029 /* ZeroingData.swift */; };
 		0EFEB4992006D7F300F81029 /* SessionProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB43C2006D3C800F81029 /* SessionProxy.swift */; };
 		0EFEB49A2006D7F300F81029 /* MSS.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB43D2006D3C800F81029 /* MSS.m */; };
@@ -297,22 +233,19 @@
 /* Begin PBXFileReference section */
 		0E011F792196D93600BA59EE /* SocketType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketType.swift; sourceTree = "<group>"; };
 		0E011F7C2196D97200BA59EE /* EndpointProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndpointProtocol.swift; sourceTree = "<group>"; };
-		0E011F7F2196E20300BA59EE /* ConfigurationParserTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurationParserTests.swift; sourceTree = "<group>"; };
 		0E011F832196E25400BA59EE /* pia-hungary.ovpn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "pia-hungary.ovpn"; sourceTree = "<group>"; };
 		0E011F872196E2AB00BA59EE /* ConfigurationParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurationParser.swift; sourceTree = "<group>"; };
-		0E041D082152E6FE0025FE3C /* SessionProxy+TLSWrap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SessionProxy+TLSWrap.swift"; sourceTree = "<group>"; };
+		0E041D082152E6FE0025FE3C /* TLSWrap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TLSWrap.swift; sourceTree = "<group>"; };
-		0E041D0B2152E80A0025FE3C /* StaticKeyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StaticKeyTests.swift; sourceTree = "<group>"; };
 		0E07595C20EF6D1400F38FD8 /* CryptoCBC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CryptoCBC.m; sourceTree = "<group>"; };
 		0E07596120EF733F00F38FD8 /* CryptoMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoMacros.h; sourceTree = "<group>"; };
 		0E07596A20EF79AB00F38FD8 /* Crypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Crypto.h; sourceTree = "<group>"; };
 		0E07596D20EF79B400F38FD8 /* CryptoCBC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoCBC.h; sourceTree = "<group>"; };
 		0E07597C20F0060E00F38FD8 /* CryptoAEAD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoAEAD.h; sourceTree = "<group>"; };
 		0E07597D20F0060E00F38FD8 /* CryptoAEAD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CryptoAEAD.m; sourceTree = "<group>"; };
-		0E0B203B227886AD007A3CB9 /* RoutingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoutingTests.swift; sourceTree = "<group>"; };
 		0E0B203E2278A85B007A3CB9 /* RoutingTableEntry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoutingTableEntry.h; sourceTree = "<group>"; };
 		0E0B203F2278A85B007A3CB9 /* RoutingTableEntry.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RoutingTableEntry.m; sourceTree = "<group>"; };
 		0E0C2123212ED29D008AB282 /* SessionError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SessionError.swift; sourceTree = "<group>"; };
-		0E0C2124212ED29D008AB282 /* SessionProxy+Configuration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SessionProxy+Configuration.swift"; sourceTree = "<group>"; };
+		0E0C2124212ED29D008AB282 /* Configuration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
 		0E11089A1F77B9E800A92462 /* TunnelKitTests-iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "TunnelKitTests-iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		0E11089E1F77B9E800A92462 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		0E1108A91F77B9F900A92462 /* TunnelKitHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TunnelKitHost.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -323,12 +256,10 @@
 		0E1108B51F77B9F900A92462 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		0E1108B71F77B9F900A92462 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		0E12B29D21449ADB00B4BAE9 /* NSRegularExpression+Shortcuts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSRegularExpression+Shortcuts.swift"; sourceTree = "<group>"; };
-		0E12B2A22145341B00B4BAE9 /* PacketTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PacketTests.swift; sourceTree = "<group>"; };
 		0E12B2A421454F7F00B4BAE9 /* BidirectionalState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BidirectionalState.swift; sourceTree = "<group>"; };
 		0E12B2A721456C0200B4BAE9 /* ControlChannel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlChannel.swift; sourceTree = "<group>"; };
 		0E12B2AA2145E01700B4BAE9 /* ControlChannelSerializer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlChannelSerializer.swift; sourceTree = "<group>"; };
 		0E17D7F91F730D9F009EE129 /* TunnelKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TunnelKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		0E245D682135972800B012A2 /* PushTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushTests.swift; sourceTree = "<group>"; };
 		0E245D6B2137F73600B012A2 /* CompressionFramingNative.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompressionFramingNative.h; sourceTree = "<group>"; };
 		0E3251C51F95770D00C108D9 /* TunnelKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TunnelKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0E39BCE6214B2AB60035E9DE /* ControlPacket.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ControlPacket.h; sourceTree = "<group>"; };
@@ -337,7 +268,7 @@
 		0E3B15C62152B05E00984B17 /* CryptoCTR.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CryptoCTR.m; sourceTree = "<group>"; };
 		0E3B656E224923EC00EFF4DA /* tunnelbear.enc.1.ovpn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tunnelbear.enc.1.ovpn; sourceTree = "<group>"; };
 		0E3B65712249247E00EFF4DA /* tunnelbear.key */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tunnelbear.key; sourceTree = "<group>"; };
-		0E3E0F202108A8CC00B371C1 /* SessionProxy+SessionReply.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionProxy+SessionReply.swift"; sourceTree = "<group>"; };
+		0E3E0F202108A8CC00B371C1 /* SessionReply.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionReply.swift; sourceTree = "<group>"; };
 		0E411B992271F90700E0852C /* DNS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DNS.h; sourceTree = "<group>"; };
 		0E411B9A2271F90700E0852C /* DNS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DNS.m; sourceTree = "<group>"; };
 		0E411B9F2271FA3300E0852C /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/usr/lib/libresolv.tbd; sourceTree = DEVELOPER_DIR; };
@@ -345,70 +276,43 @@
 		0E48AC622271ADA8009B1A98 /* PacketStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PacketStream.h; sourceTree = "<group>"; };
 		0E48AC632271ADA9009B1A98 /* PacketStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PacketStream.m; sourceTree = "<group>"; };
 		0E500EA522493B5B00CAE560 /* tunnelbear.enc.1.key */ = {isa = PBXFileReference; lastKnownFileType = text; path = tunnelbear.enc.1.key; sourceTree = "<group>"; };
-		0E50D57421634E0A00FC87A8 /* ControlChannelTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ControlChannelTests.swift; sourceTree = "<group>"; };
 		0E58BF2F22405410006FB157 /* lzoconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzoconf.h; sourceTree = "<group>"; };
 		0E58BF3022405410006FB157 /* lzodefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lzodefs.h; sourceTree = "<group>"; };
 		0E58BF3122405410006FB157 /* minilzo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = minilzo.h; sourceTree = "<group>"; };
 		0E58BF3222405410006FB157 /* minilzo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = minilzo.c; sourceTree = "<group>"; };
-		0E58BF3B2240547F006FB157 /* CompressionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompressionTests.swift; sourceTree = "<group>"; };
 		0E58BF4922405C2F006FB157 /* StandardLZO.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StandardLZO.m; sourceTree = "<group>"; };
 		0E58BF4F2240F98E006FB157 /* CompressionAlgorithmNative.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompressionAlgorithmNative.h; sourceTree = "<group>"; };
-		0E58BF522240FAA6006FB157 /* SessionProxy+CompressionAlgorithm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionProxy+CompressionAlgorithm.swift"; sourceTree = "<group>"; };
+		0E58BF522240FAA6006FB157 /* CompressionAlgorithm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompressionAlgorithm.swift; sourceTree = "<group>"; };
 		0E58BF5522411F37006FB157 /* LZO.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LZO.h; sourceTree = "<group>"; };
 		0E58BF5822411FEF006FB157 /* LZO.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LZO.m; sourceTree = "<group>"; };
-		0E58F12F2138AC2F00A49F27 /* DNSTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DNSTests.swift; sourceTree = "<group>"; };
 		0E6479DD212EAC96008E6888 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		0E6479E0212EACD6008E6888 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		0E749F5E2178885500BB2701 /* SessionProxy+PIA.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionProxy+PIA.swift"; sourceTree = "<group>"; };
 		0E749F612178911C00BB2701 /* pia-2048.pem */ = {isa = PBXFileReference; lastKnownFileType = text; path = "pia-2048.pem"; sourceTree = "<group>"; };
-		0E85A259202CC5AE0059E9F9 /* AppExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppExtensionTests.swift; sourceTree = "<group>"; };
 		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>"; };
-		0EB2B45820F0BD9A004233D7 /* LinkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinkTests.swift; sourceTree = "<group>"; };
-		0EB2B45A20F0BE4C004233D7 /* TestUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestUtils.swift; sourceTree = "<group>"; };
-		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>"; };
 		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>"; };
 		0ECEB1142252C8E900E9E551 /* tunnelbear.enc.8.key */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tunnelbear.enc.8.key; sourceTree = "<group>"; };
 		0ECEB11A2252CDAD00E9E551 /* tunnelbear.crt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tunnelbear.crt; sourceTree = "<group>"; };
-		0ED9C8632138139000621BA3 /* SessionProxy+CompressionFraming.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SessionProxy+CompressionFraming.swift"; sourceTree = "<group>"; };
+		0ED9C8632138139000621BA3 /* CompressionFraming.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompressionFraming.swift; sourceTree = "<group>"; };
 		0EE2F96D2291636B00F56F49 /* IPv4Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPv4Settings.swift; sourceTree = "<group>"; };
 		0EE2F9702291638600F56F49 /* IPv6Settings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPv6Settings.swift; sourceTree = "<group>"; };
 		0EE2F973229163C900F56F49 /* Proxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Proxy.swift; sourceTree = "<group>"; };
+		0EE2F97622916A5D00F56F49 /* OpenVPN.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenVPN.swift; sourceTree = "<group>"; };
 		0EE3B3E321471C3A0027AB17 /* StaticKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StaticKey.swift; sourceTree = "<group>"; };
 		0EE7A79420F61EDC00B42E6A /* PacketMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PacketMacros.h; sourceTree = "<group>"; };
 		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>"; };
 		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>"; };
+		0EFEB42A2006D3C800F81029 /* EncryptionBridge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EncryptionBridge.swift; sourceTree = "<group>"; };
-		0EFEB42B2006D3C800F81029 /* SessionProxy+SessionKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SessionProxy+SessionKey.swift"; sourceTree = "<group>"; };
+		0EFEB42B2006D3C800F81029 /* SessionKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SessionKey.swift; sourceTree = "<group>"; };
 		0EFEB42D2006D3C800F81029 /* MSS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSS.h; sourceTree = "<group>"; };
 		0EFEB42E2006D3C800F81029 /* Allocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Allocation.h; sourceTree = "<group>"; };
 		0EFEB42F2006D3C800F81029 /* TunnelInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TunnelInterface.swift; sourceTree = "<group>"; };
@@ -420,7 +324,7 @@
 		0EFEB4372006D3C800F81029 /* SecureRandom.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecureRandom.swift; sourceTree = "<group>"; };
 		0EFEB4382006D3C800F81029 /* ProtocolMacros.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProtocolMacros.swift; sourceTree = "<group>"; };
 		0EFEB4392006D3C800F81029 /* ReplayProtector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReplayProtector.h; sourceTree = "<group>"; };
-		0EFEB43A2006D3C800F81029 /* SessionProxy+Authenticator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SessionProxy+Authenticator.swift"; sourceTree = "<group>"; };
+		0EFEB43A2006D3C800F81029 /* Authenticator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Authenticator.swift; sourceTree = "<group>"; };
 		0EFEB43B2006D3C800F81029 /* ZeroingData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ZeroingData.swift; sourceTree = "<group>"; };
 		0EFEB43C2006D3C800F81029 /* SessionProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SessionProxy.swift; sourceTree = "<group>"; };
 		0EFEB43D2006D3C800F81029 /* MSS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSS.m; sourceTree = "<group>"; };
@@ -502,24 +406,6 @@
 		0E11089B1F77B9E800A92462 /* TunnelKitTests */ = {
 			isa = PBXGroup;
 			children = (
-				0E85A259202CC5AE0059E9F9 /* AppExtensionTests.swift */,
-				0E58BF3B2240547F006FB157 /* CompressionTests.swift */,
-				0E011F7F2196E20300BA59EE /* ConfigurationParserTests.swift */,
-				0E50D57421634E0A00FC87A8 /* ControlChannelTests.swift */,
-				0EB2B45420F0BB53004233D7 /* DataManipulationTests.swift */,
-				0EE7A7A020F664AB00B42E6A /* DataPathEncryptionTests.swift */,
-				0EB2B46020F0C0A4004233D7 /* DataPathPerformanceTests.swift */,
-				0E58F12F2138AC2F00A49F27 /* DNSTests.swift */,
-				0EB2B45E20F0C098004233D7 /* EncryptionPerformanceTests.swift */,
-				0EB2B45220F0BB44004233D7 /* EncryptionTests.swift */,
-				0EB2B45820F0BD9A004233D7 /* LinkTests.swift */,
-				0E12B2A22145341B00B4BAE9 /* PacketTests.swift */,
-				0E245D682135972800B012A2 /* PushTests.swift */,
-				0EB2B45620F0BD16004233D7 /* RandomTests.swift */,
-				0EB2B45C20F0BF41004233D7 /* RawPerformanceTests.swift */,
-				0E0B203B227886AD007A3CB9 /* RoutingTests.swift */,
-				0E041D0B2152E80A0025FE3C /* StaticKeyTests.swift */,
-				0EB2B45A20F0BE4C004233D7 /* TestUtils.swift */,
 				0E749F612178911C00BB2701 /* pia-2048.pem */,
 				0E011F832196E25400BA59EE /* pia-hungary.ovpn */,
 				0ECEB11A2252CDAD00E9E551 /* tunnelbear.crt */,
@@ -585,7 +471,6 @@
 		0E17D8041F730DDD009EE129 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				0EB03E0F2290D22A006D03A0 /* AppExtension */,
 				0EFEB4292006D3C800F81029 /* Core */,
 				0E58BEDC2240521F006FB157 /* LZO */,
 				0EB03E0A2290A338006D03A0 /* OpenVPN */,
@@ -648,8 +533,12 @@
 		0EB03E0A2290A338006D03A0 /* OpenVPN */ = {
 			isa = PBXGroup;
 			children = (
+				0EFEB43A2006D3C800F81029 /* Authenticator.swift */,
+				0E58BF522240FAA6006FB157 /* CompressionAlgorithm.swift */,
 				0E58BF4F2240F98E006FB157 /* CompressionAlgorithmNative.h */,
+				0ED9C8632138139000621BA3 /* CompressionFraming.swift */,
 				0E245D6B2137F73600B012A2 /* CompressionFramingNative.h */,
+				0E0C2124212ED29D008AB282 /* Configuration.swift */,
 				0E011F872196E2AB00BA59EE /* ConfigurationParser.swift */,
 				0E12B2A721456C0200B4BAE9 /* ControlChannel.swift */,
 				0E12B2AA2145E01700B4BAE9 /* ControlChannelSerializer.swift */,
@@ -670,9 +559,11 @@
 				0EFEB4352006D3C800F81029 /* DataPath.h */,
 				0EFEB44C2006D3C800F81029 /* DataPath.m */,
 				0EE7A79D20F6488400B42E6A /* DataPathCrypto.h */,
+				0EFEB42A2006D3C800F81029 /* EncryptionBridge.swift */,
 				0EB03E412291542C006D03A0 /* module.modulemap */,
 				0EFEB42D2006D3C800F81029 /* MSS.h */,
 				0EFEB43D2006D3C800F81029 /* MSS.m */,
+				0EE2F97622916A5D00F56F49 /* OpenVPN.swift */,
 				0EFEB43E2006D3C800F81029 /* Packet.swift */,
 				0EE7A79420F61EDC00B42E6A /* PacketMacros.h */,
 				0EE7A79720F6296F00B42E6A /* PacketMacros.m */,
@@ -682,53 +573,18 @@
 				0EFEB4392006D3C800F81029 /* ReplayProtector.h */,
 				0EFEB4482006D3C800F81029 /* ReplayProtector.m */,
 				0E0C2123212ED29D008AB282 /* SessionError.swift */,
+				0EFEB42B2006D3C800F81029 /* SessionKey.swift */,
 				0EFEB43C2006D3C800F81029 /* SessionProxy.swift */,
-				0EFEB43A2006D3C800F81029 /* SessionProxy+Authenticator.swift */,
-				0E58BF522240FAA6006FB157 /* SessionProxy+CompressionAlgorithm.swift */,
-				0ED9C8632138139000621BA3 /* SessionProxy+CompressionFraming.swift */,
-				0E0C2124212ED29D008AB282 /* SessionProxy+Configuration.swift */,
-				0EFEB42A2006D3C800F81029 /* SessionProxy+EncryptionBridge.swift */,
 				0E749F5E2178885500BB2701 /* SessionProxy+PIA.swift */,
-				0EFEB42B2006D3C800F81029 /* SessionProxy+SessionKey.swift */,
+				0E3E0F202108A8CC00B371C1 /* SessionReply.swift */,
-				0E3E0F202108A8CC00B371C1 /* SessionProxy+SessionReply.swift */,
-				0E041D082152E6FE0025FE3C /* SessionProxy+TLSWrap.swift */,
 				0EE3B3E321471C3A0027AB17 /* StaticKey.swift */,
 				0EFEB4442006D3C800F81029 /* TLSBox.h */,
 				0EFEB4302006D3C800F81029 /* TLSBox.m */,
+				0E041D082152E6FE0025FE3C /* TLSWrap.swift */,
 			);
 			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 = (
@@ -1223,24 +1079,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0EB2B45720F0BD16004233D7 /* RandomTests.swift in Sources */,
-				0E011F812196E23700BA59EE /* ConfigurationParserTests.swift in Sources */,
-				0EB2B45920F0BD9A004233D7 /* LinkTests.swift in Sources */,
-				0EB2B45520F0BB53004233D7 /* DataManipulationTests.swift in Sources */,
-				0E50D57521634E0A00FC87A8 /* ControlChannelTests.swift in Sources */,
-				0EB2B45320F0BB44004233D7 /* EncryptionTests.swift in Sources */,
-				0EB2B45B20F0BE4C004233D7 /* TestUtils.swift in Sources */,
-				0E58F1302138AC2F00A49F27 /* DNSTests.swift in Sources */,
-				0E12B2A32145341B00B4BAE9 /* PacketTests.swift in Sources */,
-				0E041D0C2152E80A0025FE3C /* StaticKeyTests.swift in Sources */,
-				0E245D692135972800B012A2 /* PushTests.swift in Sources */,
-				0EB2B46120F0C0A4004233D7 /* DataPathPerformanceTests.swift in Sources */,
-				0E0B203C227886AD007A3CB9 /* RoutingTests.swift in Sources */,
-				0EB2B45F20F0C098004233D7 /* EncryptionPerformanceTests.swift in Sources */,
-				0EE7A7A120F664AC00B42E6A /* DataPathEncryptionTests.swift in Sources */,
-				0EB2B45D20F0BF41004233D7 /* RawPerformanceTests.swift in Sources */,
-				0E85A25A202CC5AF0059E9F9 /* AppExtensionTests.swift in Sources */,
-				0E58BF3C2240547F006FB157 /* CompressionTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1257,17 +1095,12 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0EB03E202290D22A006D03A0 /* ConnectionStrategy.swift in Sources */,
-				0EB03E322290D22A006D03A0 /* MemoryDestination.swift in Sources */,
 				0E58BF4C22405C2F006FB157 /* StandardLZO.m in Sources */,
-				0EB03E222290D22A006D03A0 /* NETCPInterface.swift in Sources */,
 				0EE2F974229163C900F56F49 /* Proxy.swift in Sources */,
 				0EFEB4732006D3C800F81029 /* LinkInterface.swift in Sources */,
-				0EFEB4652006D3C800F81029 /* SessionProxy+Authenticator.swift in Sources */,
+				0EFEB4652006D3C800F81029 /* Authenticator.swift in Sources */,
 				0EE7A79820F6296F00B42E6A /* PacketMacros.m in Sources */,
-				0EB03E282290D22A006D03A0 /* NEUDPInterface.swift in Sources */,
+				0EFEB4562006D3C800F81029 /* SessionKey.swift in Sources */,
-				0EB03E2C2290D22A006D03A0 /* DNSResolver.swift in Sources */,
-				0EFEB4562006D3C800F81029 /* SessionProxy+SessionKey.swift in Sources */,
 				0E0B20422278A85C007A3CB9 /* RoutingTableEntry.m in Sources */,
 				0E58BF5922411FEF006FB157 /* LZO.m in Sources */,
 				0E12B29E21449ADB00B4BAE9 /* NSRegularExpression+Shortcuts.swift in Sources */,
@@ -1279,13 +1112,12 @@
 				0E011F7D2196D97200BA59EE /* EndpointProtocol.swift in Sources */,
 				0E0C2125212ED29D008AB282 /* SessionError.swift in Sources */,
 				0E12B2A821456C0200B4BAE9 /* ControlChannel.swift in Sources */,
-				0EFEB4552006D3C800F81029 /* SessionProxy+EncryptionBridge.swift in Sources */,
+				0EFEB4552006D3C800F81029 /* EncryptionBridge.swift in Sources */,
 				0EFEB45C2006D3C800F81029 /* ZeroingData.m in Sources */,
 				0EE2F9712291638600F56F49 /* IPv6Settings.swift in Sources */,
 				0EFEB4632006D3C800F81029 /* ProtocolMacros.swift in Sources */,
 				0EFB902B22788512006405E4 /* RoutingTable.m in Sources */,
 				0EFEB46D2006D3C800F81029 /* Data+Manipulation.swift in Sources */,
-				0EB03E2A2290D22A006D03A0 /* NWUDPSessionState+Description.swift in Sources */,
 				0ECE3528212EB7770040F253 /* CryptoContainer.swift in Sources */,
 				0EFEB4742006D3C800F81029 /* CoreConfiguration.swift in Sources */,
 				0E07595F20EF6D1400F38FD8 /* CryptoCBC.m in Sources */,
@@ -1293,36 +1125,28 @@
 				0E07598020F0060E00F38FD8 /* CryptoAEAD.m in Sources */,
 				0E011F882196E2AB00BA59EE /* ConfigurationParser.swift in Sources */,
 				0E39BCEA214B2AB60035E9DE /* ControlPacket.m in Sources */,
-				0EB03E3A2290D22A006D03A0 /* TunnelKitProvider+Interaction.swift in Sources */,
 				0EE2F96E2291636B00F56F49 /* IPv4Settings.swift in Sources */,
 				0E12B2AB2145E01700B4BAE9 /* ControlChannelSerializer.swift in Sources */,
 				0EFEB4662006D3C800F81029 /* ZeroingData.swift in Sources */,
 				0EFEB4682006D3C800F81029 /* MSS.m in Sources */,
 				0E48AC662271ADA9009B1A98 /* PacketStream.m in Sources */,
-				0EB03E382290D22A006D03A0 /* Utils.swift in Sources */,
+				0EE2F97722916A5D00F56F49 /* OpenVPN.swift in Sources */,
 				0E411B9D2271F90700E0852C /* DNS.m in Sources */,
 				0EFEB45B2006D3C800F81029 /* TLSBox.m 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 */,
+				0E041D092152E6FE0025FE3C /* TLSWrap.swift in Sources */,
 				0EFEB4672006D3C800F81029 /* SessionProxy.swift in Sources */,
-				0EB03E3C2290D22A006D03A0 /* InterfaceObserver.swift in Sources */,
+				0ED9C8642138139000621BA3 /* CompressionFraming.swift in Sources */,
-				0ED9C8642138139000621BA3 /* SessionProxy+CompressionFraming.swift in Sources */,
-				0EB03E262290D22A006D03A0 /* NWTCPConnectionState+Description.swift in Sources */,
 				0EFEB4722006D3C800F81029 /* ReplayProtector.m in Sources */,
-				0E3E0F212108A8CC00B371C1 /* SessionProxy+SessionReply.swift in Sources */,
+				0E3E0F212108A8CC00B371C1 /* SessionReply.swift in Sources */,
 				0ECC60D82254981A0020BEAC /* ConfigurationError.swift in Sources */,
 				0EFEB4752006D3C800F81029 /* Errors.m in Sources */,
-				0E58BF532240FAA6006FB157 /* SessionProxy+CompressionAlgorithm.swift in Sources */,
+				0E58BF532240FAA6006FB157 /* 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 */,
-				0EB03E242290D22A006D03A0 /* NETunnelInterface.swift in Sources */,
 				0EFEB4762006D3C800F81029 /* DataPath.m in Sources */,
-				0E0C2127212ED29D008AB282 /* SessionProxy+Configuration.swift in Sources */,
+				0E0C2127212ED29D008AB282 /* Configuration.swift in Sources */,
 				0EFEB4692006D3C800F81029 /* Packet.swift in Sources */,
 				0E011F7A2196D93600BA59EE /* SocketType.swift in Sources */,
 				0EFEB45A2006D3C800F81029 /* TunnelInterface.swift in Sources */,
@@ -1333,16 +1157,11 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0EB03E212290D22A006D03A0 /* ConnectionStrategy.swift in Sources */,
-				0EB03E332290D22A006D03A0 /* MemoryDestination.swift in Sources */,
 				0E58BF4D22405C2F006FB157 /* StandardLZO.m in Sources */,
-				0EB03E232290D22A006D03A0 /* NETCPInterface.swift in Sources */,
 				0EE2F975229163C900F56F49 /* Proxy.swift in Sources */,
 				0EFEB4A12006D7F300F81029 /* LinkInterface.swift in Sources */,
 				0EE7A79920F6296F00B42E6A /* PacketMacros.m in Sources */,
 				0E0B20432278A85C007A3CB9 /* RoutingTableEntry.m in Sources */,
-				0EB03E292290D22A006D03A0 /* NEUDPInterface.swift in Sources */,
-				0EB03E2D2290D22A006D03A0 /* DNSResolver.swift in Sources */,
 				0E58BF5A22411FEF006FB157 /* LZO.m in Sources */,
 				0E12B29F21449ADB00B4BAE9 /* NSRegularExpression+Shortcuts.swift in Sources */,
 				0EFEB4A02006D7F300F81029 /* ReplayProtector.m in Sources */,
@@ -1361,45 +1180,36 @@
 				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 */,
+				0EFEB48D2006D7F300F81029 /* EncryptionBridge.swift in Sources */,
 				0EFEB4922006D7F300F81029 /* ZeroingData.m in Sources */,
 				0E07596020EF6D1400F38FD8 /* CryptoCBC.m in Sources */,
 				0EFEB4932006D7F300F81029 /* CryptoBox.m in Sources */,
 				0E011F892196E2AB00BA59EE /* ConfigurationParser.swift in Sources */,
 				0E39BCEB214B2AB60035E9DE /* ControlPacket.m in Sources */,
-				0EB03E3B2290D22A006D03A0 /* TunnelKitProvider+Interaction.swift in Sources */,
 				0EE2F96F2291636B00F56F49 /* IPv4Settings.swift in Sources */,
 				0E12B2AC2145E01700B4BAE9 /* ControlChannelSerializer.swift in Sources */,
 				0E07598120F0060E00F38FD8 /* CryptoAEAD.m in Sources */,
 				0EFEB49C2006D7F300F81029 /* Data+Manipulation.swift in Sources */,
 				0E48AC672271ADA9009B1A98 /* PacketStream.m in Sources */,
-				0EB03E392290D22A006D03A0 /* Utils.swift in Sources */,
+				0EE2F97822916A5D00F56F49 /* OpenVPN.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 */,
-				0E041D0A2152E6FE0025FE3C /* SessionProxy+TLSWrap.swift in Sources */,
+				0E041D0A2152E6FE0025FE3C /* TLSWrap.swift in Sources */,
-				0EFEB48E2006D7F300F81029 /* SessionProxy+SessionKey.swift in Sources */,
+				0EFEB48E2006D7F300F81029 /* SessionKey.swift in Sources */,
-				0EB03E3D2290D22A006D03A0 /* InterfaceObserver.swift in Sources */,
+				0ED9C8652138139000621BA3 /* CompressionFraming.swift in Sources */,
-				0ED9C8652138139000621BA3 /* SessionProxy+CompressionFraming.swift in Sources */,
-				0EB03E272290D22A006D03A0 /* NWTCPConnectionState+Description.swift in Sources */,
 				0EFEB4A42006D7F300F81029 /* DataPath.m in Sources */,
 				0ECC60D92254981A0020BEAC /* ConfigurationError.swift in Sources */,
-				0E3E0F222108A8CC00B371C1 /* SessionProxy+SessionReply.swift in Sources */,
+				0E3E0F222108A8CC00B371C1 /* SessionReply.swift in Sources */,
-				0E58BF542240FAA6006FB157 /* SessionProxy+CompressionAlgorithm.swift in Sources */,
+				0E58BF542240FAA6006FB157 /* 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 */,
+				0E0C2128212ED29D008AB282 /* Configuration.swift in Sources */,
-				0EFEB4972006D7F300F81029 /* SessionProxy+Authenticator.swift in Sources */,
+				0EFEB4972006D7F300F81029 /* Authenticator.swift in Sources */,
 				0E011F7B2196D93600BA59EE /* SocketType.swift in Sources */,
 				0EFEB49B2006D7F300F81029 /* Packet.swift in Sources */,
 			);
@@ -1409,24 +1219,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0EA82A3A2190B2B9007960EB /* RandomTests.swift in Sources */,
-				0E011F822196E23800BA59EE /* ConfigurationParserTests.swift in Sources */,
-				0EA82A332190B2B9007960EB /* DataPathPerformanceTests.swift in Sources */,
-				0EA82A372190B2B9007960EB /* LinkTests.swift in Sources */,
-				0EA82A352190B2B9007960EB /* EncryptionPerformanceTests.swift in Sources */,
-				0EA82A2F2190B2B9007960EB /* AppExtensionTests.swift in Sources */,
-				0EA82A322190B2B9007960EB /* DataPathEncryptionTests.swift in Sources */,
-				0EA82A392190B2B9007960EB /* PushTests.swift in Sources */,
-				0EA82A3C2190B2B9007960EB /* StaticKeyTests.swift in Sources */,
-				0EA82A302190B2B9007960EB /* ControlChannelTests.swift in Sources */,
-				0EA82A312190B2B9007960EB /* DataManipulationTests.swift in Sources */,
-				0EA82A382190B2B9007960EB /* PacketTests.swift in Sources */,
-				0E0B203D227886AD007A3CB9 /* RoutingTests.swift in Sources */,
-				0EA82A3B2190B2B9007960EB /* RawPerformanceTests.swift in Sources */,
-				0EA82A362190B2B9007960EB /* EncryptionTests.swift in Sources */,
-				0EA82A3D2190B2B9007960EB /* TestUtils.swift in Sources */,
-				0EA82A342190B2B9007960EB /* DNSTests.swift in Sources */,
-				0E58BF3D2240547F006FB157 /* CompressionTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

TunnelKit/Sources/OpenVPN/Authenticator.swift

@@ -1,5 +1,5 @@
 //
-//  SessionProxy+Authenticator.swift
+//  Authenticator.swift
 //  TunnelKit
 //
 //  Created by Davide De Rosa on 2/9/17.
@@ -48,7 +48,7 @@ fileprivate extension ZeroingData {
     }
 }
 
-extension SessionProxy {
+extension OpenVPN {
     class Authenticator {
         private var controlBuffer: ZeroingData
         
@@ -90,7 +90,7 @@ extension SessionProxy {
         // MARK: Authentication request
 
         // Ruby: on_tls_connect
-        func putAuth(into: TLSBox, options: SessionProxy.Configuration) throws {
+        func putAuth(into: TLSBox, options: Configuration) throws {
             let raw = Z(ProtocolMacros.tlsPrefix)
             
             // local keys

TunnelKit/Sources/OpenVPN/CompressionAlgorithm.swift

@@ -1,5 +1,5 @@
 //
-//  SessionProxy+CompressionAlgorithm.swift
+//  CompressionAlgorithm.swift
 //  TunnelKit
 //
 //  Created by Davide De Rosa on 3/19/19.
@@ -26,7 +26,7 @@
 import Foundation
 import __TunnelKitOpenVPN
 
-extension SessionProxy {
+extension OpenVPN {
     
     /// Defines the type of compression algorithm.
     public enum CompressionAlgorithm: Int, Codable, CustomStringConvertible {

TunnelKit/Sources/OpenVPN/CompressionFraming.swift

@@ -1,5 +1,5 @@
 //
-//  SessionProxy+CompressionFraming.swift
+//  CompressionFraming.swift
 //  TunnelKit
 //
 //  Created by Davide De Rosa on 8/30/18.
@@ -26,7 +26,7 @@
 import Foundation
 import __TunnelKitOpenVPN
 
-extension SessionProxy {
+extension OpenVPN {
 
     /// Defines the type of compression framing.
     public enum CompressionFraming: Int, Codable, CustomStringConvertible {

TunnelKit/Sources/OpenVPN/Configuration.swift

@@ -1,5 +1,5 @@
 //
-//  SessionProxy+Configuration.swift
+//  Configuration.swift
 //  TunnelKit
 //
 //  Created by Davide De Rosa on 8/23/18.
@@ -36,7 +36,7 @@
 
 import Foundation
 
-extension SessionProxy {
+extension OpenVPN {
     
     /// A pair of credentials for authentication.
     public struct Credentials: Codable, Equatable {
@@ -167,22 +167,22 @@ extension SessionProxy {
         static let compressionFraming: CompressionFraming = .disabled
     }
     
-    /// The way to create a `SessionProxy.Configuration` object for a `SessionProxy`.
+    /// The way to create a `Configuration` object for a `SessionProxy`.
     public struct ConfigurationBuilder {
 
         // MARK: General
         
         /// The cipher algorithm for data encryption.
-        public var cipher: SessionProxy.Cipher?
+        public var cipher: Cipher?
         
         /// The digest algorithm for HMAC.
-        public var digest: SessionProxy.Digest?
+        public var digest: Digest?
         
         /// Compression framing, disabled by default.
-        public var compressionFraming: SessionProxy.CompressionFraming?
+        public var compressionFraming: CompressionFraming?
         
         /// Compression algorithm, disabled by default.
-        public var compressionAlgorithm: SessionProxy.CompressionAlgorithm?
+        public var compressionAlgorithm: CompressionAlgorithm?
         
         /// The CA for TLS negotiation (PEM format).
         public var ca: CryptoContainer?
@@ -194,7 +194,7 @@ extension SessionProxy {
         public var clientKey: CryptoContainer?
         
         /// The optional TLS wrapping.
-        public var tlsWrap: SessionProxy.TLSWrap?
+        public var tlsWrap: TLSWrap?
         
         /// If set, overrides TLS security level (0 = lowest).
         public var tlsSecurityLevel: Int?
@@ -261,9 +261,9 @@ extension SessionProxy {
         }
         
         /**
-         Builds a `SessionProxy.Configuration` object.
+         Builds a `Configuration` object.
          
-         - Returns: A `SessionProxy.Configuration` object with this builder.
+         - Returns: A `Configuration` object with this builder.
          */
         public func build() -> Configuration {
             return Configuration(
@@ -317,82 +317,82 @@ extension SessionProxy {
     /// The immutable configuration for `SessionProxy`.
     public struct Configuration: Codable {
 
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.cipher`
+        /// - Seealso: `ConfigurationBuilder.cipher`
         public let cipher: Cipher?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.digest`
+        /// - Seealso: `ConfigurationBuilder.digest`
         public let digest: Digest?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.compressionFraming`
+        /// - Seealso: `ConfigurationBuilder.compressionFraming`
         public let compressionFraming: CompressionFraming?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.compressionAlgorithm`
+        /// - Seealso: `ConfigurationBuilder.compressionAlgorithm`
         public let compressionAlgorithm: CompressionAlgorithm?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.ca`
+        /// - Seealso: `ConfigurationBuilder.ca`
         public let ca: CryptoContainer?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.clientCertificate`
+        /// - Seealso: `ConfigurationBuilder.clientCertificate`
         public let clientCertificate: CryptoContainer?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.clientKey`
+        /// - Seealso: `ConfigurationBuilder.clientKey`
         public let clientKey: CryptoContainer?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.tlsWrap`
+        /// - Seealso: `ConfigurationBuilder.tlsWrap`
         public let tlsWrap: TLSWrap?
 
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.tlsSecurityLevel`
+        /// - Seealso: `ConfigurationBuilder.tlsSecurityLevel`
         public let tlsSecurityLevel: Int?
 
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.keepAliveInterval`
+        /// - Seealso: `ConfigurationBuilder.keepAliveInterval`
         public let keepAliveInterval: TimeInterval?
 
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.renegotiatesAfter`
+        /// - Seealso: `ConfigurationBuilder.renegotiatesAfter`
         public let renegotiatesAfter: TimeInterval?
 
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.hostname`
+        /// - Seealso: `ConfigurationBuilder.hostname`
         public let hostname: String?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.endpointProtocols`
+        /// - Seealso: `ConfigurationBuilder.endpointProtocols`
         public let endpointProtocols: [EndpointProtocol]?
 
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.checksEKU`
+        /// - Seealso: `ConfigurationBuilder.checksEKU`
         public let checksEKU: Bool?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.randomizeEndpoint`
+        /// - Seealso: `ConfigurationBuilder.randomizeEndpoint`
         public let randomizeEndpoint: Bool?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.usesPIAPatches`
+        /// - Seealso: `ConfigurationBuilder.usesPIAPatches`
         public let usesPIAPatches: Bool?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.authToken`
+        /// - Seealso: `ConfigurationBuilder.authToken`
         public let authToken: String?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.peerId`
+        /// - Seealso: `ConfigurationBuilder.peerId`
         public let peerId: UInt32?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.ipv4`
+        /// - Seealso: `ConfigurationBuilder.ipv4`
         public let ipv4: IPv4Settings?
 
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.ipv6`
+        /// - Seealso: `ConfigurationBuilder.ipv6`
         public let ipv6: IPv6Settings?
 
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.dnsServers`
+        /// - Seealso: `ConfigurationBuilder.dnsServers`
         public let dnsServers: [String]?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.searchDomain`
+        /// - Seealso: `ConfigurationBuilder.searchDomain`
         public let searchDomain: String?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.httpProxy`
+        /// - Seealso: `ConfigurationBuilder.httpProxy`
         public let httpProxy: Proxy?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.httpsProxy`
+        /// - Seealso: `ConfigurationBuilder.httpsProxy`
         public let httpsProxy: Proxy?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.proxyBypassDomains`
+        /// - Seealso: `ConfigurationBuilder.proxyBypassDomains`
         public let proxyBypassDomains: [String]?
         
-        /// - Seealso: `SessionProxy.ConfigurationBuilder.routingPolicies`
+        /// - Seealso: `ConfigurationBuilder.routingPolicies`
         public let routingPolicies: [RoutingPolicy]?
         
         // MARK: Shortcuts
@@ -416,15 +416,15 @@ extension SessionProxy {
 
 // MARK: Modification
 
-extension SessionProxy.Configuration {
+extension OpenVPN.Configuration {
     
     /**
-     Returns a `SessionProxy.ConfigurationBuilder` to use this configuration as a starting point for a new one.
+     Returns a `ConfigurationBuilder` to use this configuration as a starting point for a new one.
      
-     - Returns: An editable `SessionProxy.ConfigurationBuilder` initialized with this configuration.
+     - Returns: An editable `ConfigurationBuilder` initialized with this configuration.
      */
-    public func builder() -> SessionProxy.ConfigurationBuilder {
+    public func builder() -> OpenVPN.ConfigurationBuilder {
-        var builder = SessionProxy.ConfigurationBuilder()
+        var builder = OpenVPN.ConfigurationBuilder()
         builder.cipher = cipher
         builder.digest = digest
         builder.compressionFraming = compressionFraming

TunnelKit/Sources/OpenVPN/ConfigurationParser.swift

@@ -29,7 +29,9 @@ import __TunnelKitCore
 
 private let log = SwiftyBeaver.self
 
-/// Provides methods to parse a `SessionProxy.Configuration` from an .ovpn configuration file.
+extension OpenVPN {
+
+    /// Provides methods to parse a `Configuration` from an .ovpn configuration file.
     public class ConfigurationParser {
 
         // XXX: parsing is very optimistic
@@ -146,8 +148,8 @@ public class ConfigurationParser {
             /// Original URL of the configuration file, if parsed from an URL.
             public let url: URL?
 
-        /// The overall parsed `SessionProxy.Configuration`.
+            /// The overall parsed `Configuration`.
-        public let configuration: SessionProxy.Configuration
+            public let configuration: Configuration
 
             /// The lines of the configuration file stripped of any sensitive data. Lines that
             /// the parser does not recognize are discarded in the first place.
@@ -190,16 +192,16 @@ public class ConfigurationParser {
             var currentBlockName: String?
             var currentBlock: [String] = []
             
-        var optCipher: SessionProxy.Cipher?
+            var optCipher: Cipher?
-        var optDigest: SessionProxy.Digest?
+            var optDigest: Digest?
-        var optCompressionFraming: SessionProxy.CompressionFraming?
+            var optCompressionFraming: CompressionFraming?
-        var optCompressionAlgorithm: SessionProxy.CompressionAlgorithm?
+            var optCompressionAlgorithm: CompressionAlgorithm?
             var optCA: CryptoContainer?
             var optClientCertificate: CryptoContainer?
             var optClientKey: CryptoContainer?
             var optKeyDirection: StaticKey.Direction?
             var optTLSKeyLines: [Substring]?
-        var optTLSStrategy: SessionProxy.TLSWrap.Strategy?
+            var optTLSStrategy: TLSWrap.Strategy?
             var optKeepAliveSeconds: TimeInterval?
             var optRenegotiateAfterSeconds: TimeInterval?
             //
@@ -332,7 +334,7 @@ public class ConfigurationParser {
                     guard let rawValue = $0.first else {
                         return
                     }
-                optCipher = SessionProxy.Cipher(rawValue: rawValue.uppercased())
+                    optCipher = Cipher(rawValue: rawValue.uppercased())
                     if optCipher == nil {
                         unsupportedError = ConfigurationError.unsupportedConfiguration(option: "cipher \(rawValue)")
                     }
@@ -342,7 +344,7 @@ public class ConfigurationParser {
                     guard let rawValue = $0.first else {
                         return
                     }
-                optDigest = SessionProxy.Digest(rawValue: rawValue.uppercased())
+                    optDigest = Digest(rawValue: rawValue.uppercased())
                     if optDigest == nil {
                         unsupportedError = ConfigurationError.unsupportedConfiguration(option: "auth \(rawValue)")
                     }
@@ -558,7 +560,7 @@ public class ConfigurationParser {
             
             //
             
-        var sessionBuilder = SessionProxy.ConfigurationBuilder()
+            var sessionBuilder = ConfigurationBuilder()
             
             // MARK: General
             
@@ -592,7 +594,7 @@ public class ConfigurationParser {
                     optKey = StaticKey(lines: keyLines, direction: .client)
                 }
                 if let key = optKey {
-                sessionBuilder.tlsWrap = SessionProxy.TLSWrap(strategy: strategy, key: key)
+                    sessionBuilder.tlsWrap = TLSWrap(strategy: strategy, key: key)
                 }
             }
             
@@ -715,7 +717,7 @@ public class ConfigurationParser {
             sessionBuilder.proxyBypassDomains = optProxyBypass
 
             if let flags = optRedirectGateway {
-            var policies: Set<SessionProxy.RoutingPolicy> = []
+                var policies: Set<RoutingPolicy> = []
                 for opt in flags {
                     switch opt {
                     case .def1:
@@ -735,7 +737,7 @@ public class ConfigurationParser {
                 if flags.contains(.noIPv4) {
                     policies.remove(.IPv4)
                 }
-            sessionBuilder.routingPolicies = [SessionProxy.RoutingPolicy](policies)
+                sessionBuilder.routingPolicies = [RoutingPolicy](policies)
             }
 
             //
@@ -761,6 +763,7 @@ public class ConfigurationParser {
     //        return false
         }
     }
+}
 
 private extension String {
     func trimmedLines() -> [String] {

TunnelKit/Sources/OpenVPN/ControlChannel.swift

@@ -30,6 +30,7 @@ import __TunnelKitOpenVPN
 
 private let log = SwiftyBeaver.self
 
+extension OpenVPN {
     class ControlChannelError: Error, CustomStringConvertible {
         let description: String
         
@@ -65,7 +66,7 @@ class ControlChannel {
             self.init(serializer: PlainSerializer())
         }
         
-    convenience init(withAuthKey key: StaticKey, digest: SessionProxy.Digest) throws {
+        convenience init(withAuthKey key: StaticKey, digest: Digest) throws {
             self.init(serializer: try AuthSerializer(withKey: key, digest: digest))
         }
 
@@ -237,3 +238,4 @@ class ControlChannel {
             return dataCount.pair
         }
     }
+}

TunnelKit/Sources/OpenVPN/ControlChannelSerializer.swift

@@ -38,7 +38,7 @@ protocol ControlChannelSerializer {
     func deserialize(data: Data, start: Int, end: Int?) throws -> ControlPacket
 }
 
-extension ControlChannel {
+extension OpenVPN.ControlChannel {
     class PlainSerializer: ControlChannelSerializer {
         func reset() {
         }
@@ -52,11 +52,11 @@ extension ControlChannel {
             let end = end ?? packet.count
             
             guard end >= offset + PacketOpcodeLength else {
-                throw ControlChannelError("Missing opcode")
+                throw OpenVPN.ControlChannelError("Missing opcode")
             }
             let codeValue = packet[offset] >> 3
             guard let code = PacketCode(rawValue: codeValue) else {
-                throw ControlChannelError("Unknown code: \(codeValue))")
+                throw OpenVPN.ControlChannelError("Unknown code: \(codeValue))")
             }
             let key = packet[offset] & 0b111
             offset += PacketOpcodeLength
@@ -64,13 +64,13 @@ extension ControlChannel {
             log.debug("Control: Try read packet with code \(code) and key \(key)")
             
             guard end >= offset + PacketSessionIdLength else {
-                throw ControlChannelError("Missing sessionId")
+                throw OpenVPN.ControlChannelError("Missing sessionId")
             }
             let sessionId = packet.subdata(offset: offset, count: PacketSessionIdLength)
             offset += PacketSessionIdLength
 
             guard end >= offset + 1 else {
-                throw ControlChannelError("Missing ackSize")
+                throw OpenVPN.ControlChannelError("Missing ackSize")
             }
             let ackSize = packet[offset]
             offset += 1
@@ -79,7 +79,7 @@ extension ControlChannel {
             var ackRemoteSessionId: Data?
             if ackSize > 0 {
                 guard end >= (offset + Int(ackSize) * PacketIdLength) else {
-                    throw ControlChannelError("Missing acks")
+                    throw OpenVPN.ControlChannelError("Missing acks")
                 }
                 var ids: [UInt32] = []
                 for _ in 0..<ackSize {
@@ -89,7 +89,7 @@ extension ControlChannel {
                 }
 
                 guard end >= offset + PacketSessionIdLength else {
-                    throw ControlChannelError("Missing remoteSessionId")
+                    throw OpenVPN.ControlChannelError("Missing remoteSessionId")
                 }
                 let remoteSessionId = packet.subdata(offset: offset, count: PacketSessionIdLength)
                 offset += PacketSessionIdLength
@@ -100,16 +100,16 @@ extension ControlChannel {
 
             if code == .ackV1 {
                 guard let ackIds = ackIds else {
-                    throw ControlChannelError("Ack packet without ids")
+                    throw OpenVPN.ControlChannelError("Ack packet without ids")
                 }
                 guard let ackRemoteSessionId = ackRemoteSessionId else {
-                    throw ControlChannelError("Ack packet without remoteSessionId")
+                    throw OpenVPN.ControlChannelError("Ack packet without remoteSessionId")
                 }
                 return ControlPacket(key: key, sessionId: sessionId, ackIds: ackIds as [NSNumber], ackRemoteSessionId: ackRemoteSessionId)
             }
 
             guard end >= offset + PacketIdLength else {
-                throw ControlChannelError("Missing packetId")
+                throw OpenVPN.ControlChannelError("Missing packetId")
             }
             let packetId = packet.networkUInt32Value(from: offset)
             offset += PacketIdLength
@@ -129,7 +129,7 @@ extension ControlChannel {
     }
 }
 
-extension ControlChannel {
+extension OpenVPN.ControlChannel {
     class AuthSerializer: ControlChannelSerializer {
         private let encrypter: Encrypter
         
@@ -149,7 +149,7 @@ extension ControlChannel {
         
         private let plain: PlainSerializer
         
-        init(withKey key: StaticKey, digest: SessionProxy.Digest) throws {
+        init(withKey key: OpenVPN.StaticKey, digest: OpenVPN.Digest) throws {
             let crypto = CryptoBox(cipherAlgorithm: nil, digestAlgorithm: digest.rawValue)
             try crypto.configure(
                 withCipherEncKey: nil,
@@ -190,7 +190,7 @@ extension ControlChannel {
             
             // data starts with (prefix=(header + sessionId) + auth=(hmac + replayId))
             guard end >= preambleLength else {
-                throw ControlChannelError("Missing HMAC")
+                throw OpenVPN.ControlChannelError("Missing HMAC")
             }
             
             // needs a copy for swapping
@@ -209,7 +209,7 @@ extension ControlChannel {
     }
 }
 
-extension ControlChannel {
+extension OpenVPN.ControlChannel {
     class CryptSerializer: ControlChannelSerializer {
         private let encrypter: Encrypter
         
@@ -227,7 +227,7 @@ extension ControlChannel {
         
         private let plain: PlainSerializer
 
-        init(withKey key: StaticKey) throws {
+        init(withKey key: OpenVPN.StaticKey) throws {
             let crypto = CryptoBox(cipherAlgorithm: "AES-256-CTR", digestAlgorithm: "SHA256")
             try crypto.configure(
                 withCipherEncKey: key.cipherEncryptKey,
@@ -267,7 +267,7 @@ extension ControlChannel {
             
             // data starts with (ad=(header + sessionId + replayId) + tag)
             guard end >= start + adLength + tagLength else {
-                throw ControlChannelError("Missing AD+TAG")
+                throw OpenVPN.ControlChannelError("Missing AD+TAG")
             }
             
             let encryptedCount = packet.count - adLength

TunnelKit/Sources/OpenVPN/CryptoContainer.swift

@@ -37,8 +37,10 @@
 import Foundation
 import __TunnelKitOpenVPN
 
+extension OpenVPN {
+
     /// Represents a cryptographic container in PEM format.
-public struct CryptoContainer: Equatable {
+    public struct CryptoContainer: Codable, Equatable {
         private static let begin = "-----BEGIN "
 
         private static let end = "-----END "
@@ -46,6 +48,10 @@ public struct CryptoContainer: Equatable {
         /// The content in PEM format (ASCII).
         public let pem: String
         
+        var isEncrypted: Bool {
+            return pem.contains("ENCRYPTED")
+        }
+        
         /// :nodoc:
         public init(pem: String) {
             guard let beginRange = pem.range(of: CryptoContainer.begin) else {
@@ -59,36 +65,31 @@ public struct CryptoContainer: Equatable {
             try pem.write(to: url, atomically: true, encoding: .ascii)
         }
 
+        func decrypted(with passphrase: String) throws -> CryptoContainer {
+            let decryptedPEM = try TLSBox.decryptedPrivateKey(fromPEM: pem, passphrase: passphrase)
+            return CryptoContainer(pem: decryptedPEM)
+        }
+
         // MARK: Equatable
         
         /// :nodoc:
         public static func ==(lhs: CryptoContainer, rhs: CryptoContainer) -> Bool {
             return lhs.pem == rhs.pem
         }
-}
+
+        // MARK: Codable
         
         /// :nodoc:
-extension CryptoContainer: Codable {
         public init(from decoder: Decoder) throws {
             let container = try decoder.singleValueContainer()
             let pem = try container.decode(String.self)
             self.init(pem: pem)
         }
         
+        /// :nodoc:
         public func encode(to encoder: Encoder) throws {
             var container = encoder.singleValueContainer()
             try container.encode(pem)
         }
     }
-
-/// :nodoc:
-public extension CryptoContainer {
-    var isEncrypted: Bool {
-        return pem.contains("ENCRYPTED")
-    }
-    
-    func decrypted(with passphrase: String) throws -> CryptoContainer {
-        let decryptedPEM = try TLSBox.decryptedPrivateKey(fromPEM: pem, passphrase: passphrase)
-        return CryptoContainer(pem: decryptedPEM)
-    }
 }

TunnelKit/Sources/OpenVPN/EncryptionBridge.swift

@@ -1,5 +1,5 @@
 //
-//  SessionProxy+EncryptionBridge.swift
+//  EncryptionBridge.swift
 //  TunnelKit
 //
 //  Created by Davide De Rosa on 2/8/17.
@@ -38,7 +38,7 @@ import Foundation
 import __TunnelKitCore
 import __TunnelKitOpenVPN
 
-extension SessionProxy {
+extension OpenVPN {
 
     /// Bridges native encryption for high-level operations.
     public class EncryptionBridge {
@@ -127,7 +127,7 @@ extension SessionProxy {
             return buffer.withOffset(0, count: length)
         }
         
-        convenience init(_ cipher: SessionProxy.Cipher, _ digest: SessionProxy.Digest, _ auth: SessionProxy.Authenticator,
+        convenience init(_ cipher: Cipher, _ digest: Digest, _ auth: Authenticator,
                          _ sessionId: Data, _ remoteSessionId: Data) throws {
             
             guard let serverRandom1 = auth.serverRandom1, let serverRandom2 = auth.serverRandom2 else {
@@ -161,7 +161,7 @@ extension SessionProxy {
             try self.init(cipher, digest, cipherEncKey, cipherDecKey, hmacEncKey, hmacDecKey)
         }
         
-        init(_ cipher: SessionProxy.Cipher, _ digest: SessionProxy.Digest, _ cipherEncKey: ZeroingData, _ cipherDecKey: ZeroingData, _ hmacEncKey: ZeroingData, _ hmacDecKey: ZeroingData) throws {
+        init(_ cipher: Cipher, _ digest: Digest, _ cipherEncKey: ZeroingData, _ cipherDecKey: ZeroingData, _ hmacEncKey: ZeroingData, _ hmacDecKey: ZeroingData) throws {
             box = CryptoBox(cipherAlgorithm: cipher.rawValue, digestAlgorithm: digest.rawValue)
             try box.configure(
                 withCipherEncKey: cipherEncKey,

TunnelKit/Sources/OpenVPN/OpenVPN.swift

@@ -0,0 +1,30 @@
+//
+//  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/>.
+//
+
+import Foundation
+
+/// Container for OpenVPN classes.
+public class OpenVPN {
+}

TunnelKit/Sources/OpenVPN/Packet.swift

@@ -37,66 +37,6 @@
 import Foundation
 import __TunnelKitOpenVPN
 
-///// Reads and writes packets as a stream. Useful for stream-oriented links (e.g TCP/IP).
-//public class PacketStream {
-//    
-//    /**
-//     Parses packets from a stream.
-//     
-//     - Parameter stream: The data stream.
-//     - Returns: A pair where the first value is the `Int` offset up to which
-//     the stream could be parsed, and the second value is an array containing
-//     the parsed packets up to such offset.
-//     */
-//    public static func packets(from stream: Data) -> (Int, [Data]) {
-//        var ni = 0
-//        var parsed: [Data] = []
-//        while (ni + 2 <= stream.count) {
-//            let packlen = Int(stream.networkUInt16Value(from: ni))
-//            let start = ni + 2
-//            let end = start + packlen
-//            guard (end <= stream.count) else {
-//                break
-//            }
-//            let packet = stream.subdata(offset: start, count: end - start)
-//            parsed.append(packet)
-//            ni = end
-//        }
-//        return (ni, parsed)
-//    }
-//    
-//    /**
-//     Creates a contiguous stream of packets.
-//     
-//     - Parameter packet: The packet.
-//     - Returns: A stream made of the packet.
-//     */
-//    public static func stream(from packet: Data) -> Data {
-//        var raw = Data(capacity: 2 + packet.count)
-//        raw.append(UInt16(packet.count).bigEndian)
-//        raw.append(contentsOf: packet)
-//        return raw
-//    }
-//    
-//    /**
-//     Creates a contiguous stream of packets.
-//     
-//     - Parameter packets: The array of packets.
-//     - Returns: A stream made of the array of packets.
-//     */
-//    public static func stream(from packets: [Data]) -> Data {
-//        var raw = Data()
-//        for payload in packets {
-//            raw.append(UInt16(payload.count).bigEndian)
-//            raw.append(payload)
-//        }
-//        return raw
-//    }
-//    
-//    private init() {
-//    }
-//}
-
 /// :nodoc:
 extension ControlPacket {
 
@@ -121,6 +61,7 @@ extension ControlPacket {
     }
 }
 
+extension OpenVPN {
     class DataPacket {
         static let pingString = Data(hex: "2a187bf3641eb4cb07ed2d0a981fc748")
     }
@@ -140,6 +81,7 @@ enum OCCPacket: UInt8 {
             return data
         }
     }
+}
 
 /// :nodoc:
 extension PacketCode: CustomStringConvertible {

TunnelKit/Sources/OpenVPN/ProtocolMacros.swift

@@ -36,6 +36,7 @@
 
 import Foundation
 
+extension OpenVPN {
     class ProtocolMacros {
         
         // UInt32(0) + UInt8(KeyMethod = 2)
@@ -43,3 +44,4 @@ class ProtocolMacros {
 
         static let numberOfKeys = UInt8(8) // 3-bit
     }
+}

TunnelKit/Sources/OpenVPN/SessionKey.swift

@@ -1,5 +1,5 @@
 //
-//  SessionProxy+SessionKey.swift
+//  SessionKey.swift
 //  TunnelKit
 //
 //  Created by Davide De Rosa on 4/12/17.
@@ -41,7 +41,7 @@ import __TunnelKitOpenVPN
 
 private let log = SwiftyBeaver.self
 
-extension SessionProxy {
+extension OpenVPN {
     class SessionKey {
         enum State {
             case invalid, hardReset, softReset, tls

TunnelKit/Sources/OpenVPN/SessionProxy+PIA.swift

@@ -36,7 +36,7 @@
 
 import Foundation
 
-extension SessionProxy {
+extension OpenVPN.SessionProxy {
     struct PIAHardReset {
         private static let obfuscationKeyLength = 3
         
@@ -50,7 +50,7 @@ extension SessionProxy {
         
         private let digestName: String
         
-        init(caMd5Digest: String, cipher: Cipher, digest: Digest) {
+        init(caMd5Digest: String, cipher: OpenVPN.Cipher, digest: OpenVPN.Digest) {
             self.caMd5Digest = caMd5Digest
             cipherName = cipher.rawValue.lowercased()
             digestName = digest.rawValue.lowercased()

TunnelKit/Sources/OpenVPN/SessionProxy.swift

@@ -50,7 +50,7 @@ public protocol SessionProxyDelegate: class {
      - Parameter remoteAddress: The address of the VPN server.
      - Parameter reply: The compound `SessionReply` containing tunnel settings.
      */
-    func sessionDidStart(_: SessionProxy, remoteAddress: String, reply: SessionReply)
+    func sessionDidStart(_: OpenVPN.SessionProxy, remoteAddress: String, reply: SessionReply)
     
     /**
      Called after stopping a session.
@@ -58,9 +58,11 @@ public protocol SessionProxyDelegate: class {
      - Parameter shouldReconnect: When `true`, the session can/should be restarted. Usually because the stop reason was recoverable.
      - Seealso: `SessionProxy.reconnect(...)`
      */
-    func sessionDidStop(_: SessionProxy, shouldReconnect: Bool)
+    func sessionDidStop(_: OpenVPN.SessionProxy, shouldReconnect: Bool)
 }
 
+extension OpenVPN {
+
     /// Provides methods to set up and maintain an OpenVPN session.
     public class SessionProxy {
         private enum StopMethod {
@@ -181,7 +183,7 @@ public class SessionProxy {
          Creates a VPN session.
          
          - Parameter queue: The `DispatchQueue` where to run the session loop.
-     - Parameter configuration: The `SessionProxy.Configuration` to use for this session.
+         - Parameter configuration: The `Configuration` to use for this session.
          */
         public init(queue: DispatchQueue, configuration: Configuration, cachesURL: URL) throws {
             guard let ca = configuration.ca else {
@@ -1277,3 +1279,4 @@ public class SessionProxy {
             delegate?.sessionDidStop(self, shouldReconnect: true)
         }
     }
+}

TunnelKit/Sources/OpenVPN/SessionReply.swift

@@ -1,5 +1,5 @@
 //
-//  SessionProxy+SessionReply.swift
+//  SessionReply.swift
 //  TunnelKit
 //
 //  Created by Davide De Rosa on 7/25/18.
@@ -40,16 +40,16 @@ import Foundation
 public protocol SessionReply {
 
     /// The returned options.
-    var options: SessionProxy.Configuration { get }
+    var options: OpenVPN.Configuration { get }
 }
 
-extension SessionProxy {
+extension OpenVPN {
     struct PushReply: SessionReply, CustomStringConvertible {
         private static let prefix = "PUSH_REPLY,"
         
         private let original: String
 
-        let options: SessionProxy.Configuration
+        let options: Configuration
         
         init?(message: String) throws {
             guard message.hasPrefix(PushReply.prefix) else {

TunnelKit/Sources/OpenVPN/StaticKey.swift

@@ -26,6 +26,8 @@
 import Foundation
 import __TunnelKitCore
 
+extension OpenVPN {
+
     /// Represents an OpenVPN static key file (as generated with --genkey)
     public class StaticKey: Codable {
         enum CodingKeys: CodingKey {
@@ -63,7 +65,7 @@ public class StaticKey: Codable {
         /// Returns the encryption key.
         ///
         /// - Precondition: `direction` must be non-nil.
-    /// - Seealso: `SessionProxy.ConfigurationBuilder.tlsWrap`
+        /// - Seealso: `ConfigurationBuilder.tlsWrap`
         public var cipherEncryptKey: ZeroingData {
             guard let direction = direction else {
                 preconditionFailure()
@@ -80,7 +82,7 @@ public class StaticKey: Codable {
         /// Returns the decryption key.
         ///
         /// - Precondition: `direction` must be non-nil.
-    /// - Seealso: `SessionProxy.ConfigurationBuilder.tlsWrap`
+        /// - Seealso: `ConfigurationBuilder.tlsWrap`
         public var cipherDecryptKey: ZeroingData {
             guard let direction = direction else {
                 preconditionFailure()
@@ -96,7 +98,7 @@ public class StaticKey: Codable {
         
         /// Returns the HMAC sending key.
         ///
-    /// - Seealso: `SessionProxy.ConfigurationBuilder.tlsWrap`
+        /// - Seealso: `ConfigurationBuilder.tlsWrap`
         public var hmacSendKey: ZeroingData {
             guard let direction = direction else {
                 return key(at: 1)
@@ -112,7 +114,7 @@ public class StaticKey: Codable {
         
         /// Returns the HMAC receiving key.
         ///
-    /// - Seealso: `SessionProxy.ConfigurationBuilder.tlsWrap`
+        /// - Seealso: `ConfigurationBuilder.tlsWrap`
         public var hmacReceiveKey: ZeroingData {
             guard let direction = direction else {
                 return key(at: 1)
@@ -230,3 +232,4 @@ public class StaticKey: Codable {
             try container.encodeIfPresent(direction, forKey: .dir)
         }
     }
+}

TunnelKit/Sources/OpenVPN/TLSWrap.swift

@@ -1,5 +1,5 @@
 //
-//  SessionProxy+TLSWrap.swift
+//  TLSWrap.swift
 //  TunnelKit
 //
 //  Created by Davide De Rosa on 9/11/18.
@@ -25,7 +25,7 @@
 
 import Foundation
 
-extension SessionProxy {
+extension OpenVPN {
 
     /// Holds parameters for TLS wrapping.
     public class TLSWrap: Codable {
@@ -53,8 +53,8 @@ extension SessionProxy {
         }
 
         /// :nodoc:
-        public static func deserialized(_ data: Data) throws -> SessionProxy.TLSWrap {
+        public static func deserialized(_ data: Data) throws -> TLSWrap {
-            return try JSONDecoder().decode(SessionProxy.TLSWrap.self, from: data)
+            return try JSONDecoder().decode(TLSWrap.self, from: data)
         }
         
         /// :nodoc:

TunnelKitTests/AppExtensionTests.swift

@@ -57,9 +57,9 @@ class AppExtensionTests: XCTestCase {
         let identifier = "com.example.Provider"
         let appGroup = "group.com.algoritmico.TunnelKit"
         let hostname = "example.com"
-        let credentials = SessionProxy.Credentials("foo", "bar")
+        let credentials = Credentials("foo", "bar")
 
-        var sessionBuilder = SessionProxy.ConfigurationBuilder()
+        var sessionBuilder = ConfigurationBuilder()
         sessionBuilder.ca = CryptoContainer(pem: "abcdef")
         sessionBuilder.cipher = .aes128cbc
         sessionBuilder.digest = .sha256

TunnelKitTests/ConfigurationParserTests.swift

@@ -40,14 +40,13 @@ class ConfigurationParserTests: XCTestCase {
     // from lines
     
     func testCompression() throws {
-//        XCTAssertNotNil(try OptionsBundle.parsed(fromLines: ["comp-lzo"]).warning)
+        XCTAssertNil(try OpenVPN.ConfigurationParser.parsed(fromLines: ["comp-lzo"]).warning)
-        XCTAssertNil(try ConfigurationParser.parsed(fromLines: ["comp-lzo"]).warning)
+        XCTAssertNoThrow(try OpenVPN.ConfigurationParser.parsed(fromLines: ["comp-lzo no"]))
-        XCTAssertNoThrow(try ConfigurationParser.parsed(fromLines: ["comp-lzo no"]))
+        XCTAssertNoThrow(try OpenVPN.ConfigurationParser.parsed(fromLines: ["comp-lzo yes"]))
-        XCTAssertNoThrow(try ConfigurationParser.parsed(fromLines: ["comp-lzo yes"]))
+//        XCTAssertThrowsError(try OpenVPN.ConfigurationParser.parsed(fromLines: ["comp-lzo yes"]))
-//        XCTAssertThrowsError(try ConfigurationParser.parsed(fromLines: ["comp-lzo yes"]))
         
-        XCTAssertNoThrow(try ConfigurationParser.parsed(fromLines: ["compress"]))
+        XCTAssertNoThrow(try OpenVPN.ConfigurationParser.parsed(fromLines: ["compress"]))
-        XCTAssertNoThrow(try ConfigurationParser.parsed(fromLines: ["compress lzo"]))
+        XCTAssertNoThrow(try OpenVPN.ConfigurationParser.parsed(fromLines: ["compress lzo"]))
     }
     
     func testDHCPOption() throws {
@@ -72,7 +71,7 @@ class ConfigurationParserTests: XCTestCase {
     }
     
     func testRedirectGateway() throws {
-        var parsed: SessionProxy.Configuration
+        var parsed: Configuration
 
         parsed = try! ConfigurationParser.parsed(fromLines: []).configuration
         XCTAssertEqual(parsed.routingPolicies, nil)

TunnelKitTests/ControlChannelTests.swift

@@ -50,7 +50,7 @@ class ControlChannelTests: XCTestCase {
 //    00000000 // message packet_id (HARD_RESET -> UInt32(0))
     func testHMAC() {
         let key = StaticKey(biData: Data(hex: hex))
-        let server = CryptoBox(cipherAlgorithm: nil, digestAlgorithm: SessionProxy.Digest.sha1.rawValue)
+        let server = CryptoBox(cipherAlgorithm: nil, digestAlgorithm: Digest.sha1.rawValue)
         XCTAssertNoThrow(try server.configure(withCipherEncKey: nil, cipherDecKey: nil, hmacEncKey: key.hmacReceiveKey, hmacDecKey: key.hmacSendKey))
         
 //        let original = Data(hex: "38858fe14742fdae40e67c9137933a412a711c0d0514aca6db6476d17d000000015b96c9470000000000")

TunnelKitTests/DataPathPerformanceTests.swift

@@ -49,7 +49,7 @@ class DataPathPerformanceTests: XCTestCase {
         let ck = try! SecureRandom.safeData(length: 32)
         let hk = try! SecureRandom.safeData(length: 32)
         
-        let crypto = try! SessionProxy.EncryptionBridge(.aes128cbc, .sha1, ck, ck, hk, hk)
+        let crypto = try! EncryptionBridge(.aes128cbc, .sha1, ck, ck, hk, hk)
         encrypter = crypto.encrypter()
         decrypter = crypto.decrypter()
         

TunnelKitTests/PushTests.swift

@@ -48,7 +48,7 @@ class PushTests: XCTestCase {
     
     func testNet30() {
         let msg = "PUSH_REPLY,redirect-gateway def1,dhcp-option DNS 209.222.18.222,dhcp-option DNS 209.222.18.218,ping 10,comp-lzo no,route 10.5.10.1,topology net30,ifconfig 10.5.10.6 10.5.10.5,auth-token AUkQf/b3nj3L+CH4RJPP0Vuq8/gpntr7uPqzjQhncig="
-        let reply = try! SessionProxy.PushReply(message: msg)!
+        let reply = try! PushReply(message: msg)!
         reply.debug()
 
         XCTAssertEqual(reply.options.ipv4?.address, "10.5.10.6")
@@ -59,7 +59,7 @@ class PushTests: XCTestCase {
     
     func testSubnet() {
         let msg = "PUSH_REPLY,dhcp-option DNS 8.8.8.8,dhcp-option DNS 4.4.4.4,route-gateway 10.8.0.1,topology subnet,ping 10,ping-restart 120,ifconfig 10.8.0.2 255.255.255.0,peer-id 0"
-        let reply = try! SessionProxy.PushReply(message: msg)!
+        let reply = try! PushReply(message: msg)!
         reply.debug()
         
         XCTAssertEqual(reply.options.ipv4?.address, "10.8.0.2")
@@ -70,7 +70,7 @@ class PushTests: XCTestCase {
     
     func testRoute() {
         let msg = "PUSH_REPLY,dhcp-option DNS 8.8.8.8,dhcp-option DNS 4.4.4.4,route-gateway 10.8.0.1,route 192.168.0.0 255.255.255.0 10.8.0.12,topology subnet,ping 10,ping-restart 120,ifconfig 10.8.0.2 255.255.255.0,peer-id 0"
-        let reply = try! SessionProxy.PushReply(message: msg)!
+        let reply = try! PushReply(message: msg)!
         reply.debug()
         
         let route = reply.options.ipv4!.routes.first!
@@ -82,7 +82,7 @@ class PushTests: XCTestCase {
 
     func testIPv6() {
         let msg = "PUSH_REPLY,dhcp-option DNS6 2001:4860:4860::8888,dhcp-option DNS6 2001:4860:4860::8844,tun-ipv6,route-gateway 10.8.0.1,topology subnet,ping 10,ping-restart 120,ifconfig-ipv6 fe80::601:30ff:feb7:ec01/64 fe80::601:30ff:feb7:dc02,ifconfig 10.8.0.2 255.255.255.0,peer-id 0"
-        let reply = try! SessionProxy.PushReply(message: msg)!
+        let reply = try! PushReply(message: msg)!
         reply.debug()
         
         XCTAssertEqual(reply.options.ipv4?.address, "10.8.0.2")
@@ -96,7 +96,7 @@ class PushTests: XCTestCase {
     
     func testCompressionFraming() {
         let msg = "PUSH_REPLY,dhcp-option DNS 8.8.8.8,dhcp-option DNS 4.4.4.4,comp-lzo no,route 10.8.0.1,topology net30,ping 10,ping-restart 120,ifconfig 10.8.0.6 10.8.0.5,peer-id 0,cipher AES-256-CBC"
-        let reply = try! SessionProxy.PushReply(message: msg)!
+        let reply = try! PushReply(message: msg)!
         reply.debug()
         
         XCTAssertEqual(reply.options.compressionFraming, .compLZO)
@@ -106,27 +106,27 @@ class PushTests: XCTestCase {
         let msg = "PUSH_REPLY,dhcp-option DNS 8.8.8.8,dhcp-option DNS 4.4.4.4,route 10.8.0.1,topology net30,ping 10,ping-restart 120,ifconfig 10.8.0.6 10.8.0.5,peer-id 0,cipher AES-256-CBC"
         var reply: SessionReply
         
-        reply = try! SessionProxy.PushReply(message: msg.appending(",comp-lzo no"))!
+        reply = try! PushReply(message: msg.appending(",comp-lzo no"))!
         reply.debug()
         XCTAssertEqual(reply.options.compressionFraming, .compLZO)
         XCTAssertEqual(reply.options.compressionAlgorithm, .disabled)
 
-        reply = try! SessionProxy.PushReply(message: msg.appending(",comp-lzo"))!
+        reply = try! PushReply(message: msg.appending(",comp-lzo"))!
         reply.debug()
         XCTAssertEqual(reply.options.compressionFraming, .compLZO)
         XCTAssertEqual(reply.options.compressionAlgorithm, .LZO)
 
-        reply = try! SessionProxy.PushReply(message: msg.appending(",comp-lzo yes"))!
+        reply = try! PushReply(message: msg.appending(",comp-lzo yes"))!
         reply.debug()
         XCTAssertEqual(reply.options.compressionFraming, .compLZO)
         XCTAssertEqual(reply.options.compressionAlgorithm, .LZO)
 
-        reply = try! SessionProxy.PushReply(message: msg.appending(",compress"))!
+        reply = try! PushReply(message: msg.appending(",compress"))!
         reply.debug()
         XCTAssertEqual(reply.options.compressionFraming, .compress)
         XCTAssertEqual(reply.options.compressionAlgorithm, .disabled)
 
-        reply = try! SessionProxy.PushReply(message: msg.appending(",compress lz4"))!
+        reply = try! PushReply(message: msg.appending(",compress lz4"))!
         reply.debug()
         XCTAssertEqual(reply.options.compressionFraming, .compress)
         XCTAssertEqual(reply.options.compressionAlgorithm, .other)
@@ -134,7 +134,7 @@ class PushTests: XCTestCase {
     
     func testNCP() {
         let msg = "PUSH_REPLY,dhcp-option DNS 8.8.8.8,dhcp-option DNS 4.4.4.4,comp-lzo no,route 10.8.0.1,topology net30,ping 10,ping-restart 120,ifconfig 10.8.0.6 10.8.0.5,peer-id 0,cipher AES-256-GCM"
-        let reply = try! SessionProxy.PushReply(message: msg)!
+        let reply = try! PushReply(message: msg)!
         reply.debug()
 
         XCTAssertEqual(reply.options.cipher, .aes256gcm)
@@ -142,7 +142,7 @@ class PushTests: XCTestCase {
 
     func testNCPTrailing() {
         let msg = "PUSH_REPLY,dhcp-option DNS 8.8.8.8,dhcp-option DNS 4.4.4.4,comp-lzo no,route 10.8.0.1,topology net30,ping 10,ping-restart 120,ifconfig 10.8.0.18 10.8.0.17,peer-id 3,cipher AES-256-GCM,auth-token"
-        let reply = try! SessionProxy.PushReply(message: msg)!
+        let reply = try! PushReply(message: msg)!
         reply.debug()
         
         XCTAssertEqual(reply.options.cipher, .aes256gcm)
@@ -150,7 +150,7 @@ class PushTests: XCTestCase {
     
     func testPing() {
         let msg = "PUSH_REPLY,route 192.168.1.0 255.255.255.0,route 10.0.2.0 255.255.255.0,dhcp-option DNS 192.168.1.99,dhcp-option DNS 176.103.130.130,route 10.0.2.1,topology net30,ping 10,ping-restart 60,ifconfig 10.0.2.14 10.0.2.13"
-        let reply = try! SessionProxy.PushReply(message: msg)!
+        let reply = try! PushReply(message: msg)!
         reply.debug()
         
         XCTAssertEqual(reply.options.keepAliveInterval, 10)
@@ -158,7 +158,7 @@ class PushTests: XCTestCase {
     
     func testProvost() {
         let msg = "PUSH_REPLY,route 87.233.192.218,route 87.233.192.219,route 87.233.192.220,route 87.248.186.252,route 92.241.171.245,route 103.246.200.0 255.255.252.0,route 109.239.140.0 255.255.255.0,route 128.199.0.0 255.255.0.0,route 13.125.0.0 255.255.0.0,route 13.230.0.0 255.254.0.0,route 13.56.0.0 255.252.0.0,route 149.154.160.0 255.255.252.0,route 149.154.164.0 255.255.252.0,route 149.154.168.0 255.255.252.0,route 149.154.172.0 255.255.252.0,route 159.122.128.0 255.255.192.0,route 159.203.0.0 255.255.0.0,route 159.65.0.0 255.255.0.0,route 159.89.0.0 255.255.0.0,route 165.227.0.0 255.255.0.0,route 167.99.0.0 255.255.0.0,route 174.138.0.0 255.255.128.0,route 176.67.169.0 255.255.255.0,route 178.239.88.0 255.255.248.0,route 178.63.0.0 255.255.0.0,route 18.130.0.0 255.255.0.0,route 18.144.0.0 255.255.0.0,route 18.184.0.0 255.254.0.0,route 18.194.0.0 255.254.0.0,route 18.196.0.0 255.254.0.0,route 18.204.0.0 255.252.0.0,push-continuation 2"
-        let reply = try? SessionProxy.PushReply(message: msg)!
+        let reply = try? PushReply(message: msg)!
         reply?.debug()
     }
 }