Merge branch 'rebrand'

.github/ISSUE_TEMPLATE.md

@@ -4,31 +4,8 @@
 
 ### What is the current bug behavior?
 
-(What actually happens)
-
 ### What is the expected correct behavior?
 
-(What you should see instead)
-
 ### Relevant logs and/or screenshots
 
 ### Possible fixes suggested remediation
-
-### Assignees and labels
-
-(delete as applicable)
-
-~bug  ~confirmed  ~regression  ~suggestion
-
-~blocker ~major ~minor
-
-~tablet  ~mobile  ~tv
-
-~ios9 ~ios10 ~ios11
-
-%@ms
-    
-/cc @Dev /assign @Tester
-
-* [ ] Patched    
-* [ ] Verified patch

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,40 +0,0 @@
-A similar PR may already be submitted!
-Please search among the Pull requests before creating one.
-
-Thanks for submitting a pull request! Please provide enough information so that others can review your pull request:
-
-For more information, see the [CONTRIBUTING](/.github/CONTRIBUTING.md) readme.
-
-
-**Summary**
-
-<!-- Summary of the PR -->
-
-This PR fixes/implements the following **bugs/features**
-
-* [ ] Bug 1
-* [ ] Bug 2
-* [ ] Feature 1
-* [ ] Feature 2
-* [ ] Breaking changes
-
-<!-- You can skip this if you're fixing a typo or adding an app to the Showcase. -->
-
-Explain the **motivation** for making this change. What existing problem does the pull request solve?
-
-<!-- Example: When "Adding a function to do X", explain why it is necessary to have a way to do X. -->
-
-**Test plan (required)**
-
-Demonstrate the code is solid. Example: The exact commands you ran and their output, screenshots / videos if the pull request changes UI.
-
-<!-- Make sure tests pass on both Travis and Circle CI. -->
-
-**Code formatting**
-
-<!-- See the simple style guide. -->
-
-**Closing issues**
-
-<!-- Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes (if such). -->
-Fixes #

.jazzy.yaml

@@ -1,15 +1,15 @@
 clean:
-module: "PIATunnel"
+module: "TunnelKit"
-author: "Davide De Rosa @ London Trust Media, Inc."
+author: "Davide De Rosa"
-author_url: "https://www.privateinternetaccess.com"
+author_url: "https://github.com/keeshux/TunnelKit"
 
 theme: fullwidth
 
 xcodebuild_arguments:
     - "-workspace"
-    - "PIATunnel.xcworkspace"
+    - "TunnelKit.xcworkspace"
     - "-scheme"
-    - "PIATunnel-iOS"
+    - "TunnelKit-iOS"
 
 custom_categories:
     - name: Core
@@ -23,4 +23,5 @@ custom_categories:
         - SessionError
     - name: AppExtension
       children:
-        - PIATunnelProvider
+        - Certificate
+        - TunnelKitProvider

CLA.rst

@@ -1,12 +0,0 @@
-
-# Contributor agreement
-
-By contributing any improvement, modification, or change to this project, I hereby certify that:
-
-(a) The contribution was authored or created in whole or in part by me and I have the full and unrestricted ownership right and title to submit the contribution under the MIT license; or
-
-(b) The contribution is based upon previously authored work that, to the best of my knowledge, is licensed appropriately under an open source license and I have the full and unrestricted right under that open source license to submit that work with modifications, whether created in whole or in part by me, under the MIT license; or
-
-(c) The contribution was lawfully provided to me by a licensed third-party who certified (a), (b) or (c) and I have not modified the contribution.
-
-I understand and agree that the contents of this project and the contents of this contribution are considered to be part of the public record and that a record of the contribution (including all personal information I submit with it) shall be maintained indefinitely and may be redistributed to third-parties consistent with this terms of this project or the open source license(s) involved.

CONTRIBUTING.md

@@ -1,22 +1,8 @@
-# Contribution Guidelines
+## Contributing
-Private Internet Access welcomes community contributions, and are always looking for ways in which to improve. Please take a look at our contribution guidelines, and get involved with the PIA community.
 
-## Bugs and Issues
+- Use imperative commit messages.
-Have you found a bug? Is our software behaving in an unexpected way? Please check the open issues for duplicates -- perhaps a fix is already in development, or maybe a solution has already been published.
+	- GOOD: "Add new feature"
-If not then please submit a bug report using our [template](/.github/ISSUE_TEMPLATE.md)
+	- BAD: "Added new feature"
-
+- Rebase your branch to `master` and possibly squash unrelevant commits.
-## Feature Requests
+- Make sure to pass the unit tests, as long as CI doesn't automate them yet.
-Feature requests can also be submitted as issues. We’d be grateful if you checked for duplicates also before submitting a feature request.
+- Submit the PR.
-
-## Working with our Code
-* Fork the repository. Make sure to keep your repository synced with the source repo.
-* When you are ready to start working on a new feature, cut a new branch from “develop” with the prefix “feature/” (e.g. “feature/name-of-feature”).
-* Refer to the [README](/README.md) for instructions on how to install and build.
-
-## Making Pull Requests
-* Sync the develop branch in your fork with the develop branch in the source repo.
-* Make your pull request from “feature” in your fork to “develop” in the source.
-* Use short and concise commit messages.
-* Lint your code before committing and making a pull request.
-* Write unit tests for new features and make sure all tests are passing.
-* If your pull request contains multiple commits or commits that are not meaningful, consider squashing them.

Demo/BasicTunnel-iOS/Base.lproj/Main.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14269.14" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14252.5"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -55,7 +55,7 @@
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Teo-8d-LYJ">
-                                <rect key="frame" x="20" y="240" width="237" height="70"/>
+                                <rect key="frame" x="20" y="240" width="276" height="70"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="48"/>
                                 <state key="normal" title="Connect"/>
                                 <connections>
@@ -74,22 +74,8 @@
                                     <action selector="tcpClicked:" destination="BYZ-38-t0r" eventType="valueChanged" id="ZJI-Jw-pow"/>
                                 </connections>
                             </switch>
-                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gg2-18-Pq8">
-                                <rect key="frame" x="267" y="257" width="88" height="36"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="20"/>
-                                <state key="normal" title="Download"/>
-                                <connections>
-                                    <action selector="download" destination="BYZ-38-t0r" eventType="touchUpInside" id="D3u-Dg-Bcd"/>
-                                </connections>
-                            </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="??" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b1e-IE-2kv">
-                                <rect key="frame" x="179" y="318" width="17" height="20.5"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                             <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6dU-fF-FSg">
-                                <rect key="frame" x="20" y="310" width="78" height="41"/>
+                                <rect key="frame" x="20" y="310" width="335" height="41"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="24"/>
                                 <state key="normal" title="See log"/>
                                 <connections>
@@ -113,35 +99,30 @@
                             <constraint firstItem="WZf-S5-SqC" firstAttribute="bottom" secondItem="Teo-8d-LYJ" secondAttribute="bottom" id="HGt-O3-p5F"/>
                             <constraint firstItem="ONL-vF-iUY" firstAttribute="trailing" secondItem="bc6-yT-aty" secondAttribute="trailing" id="OS0-Uz-cCz"/>
                             <constraint firstItem="6dU-fF-FSg" firstAttribute="leading" secondItem="Teo-8d-LYJ" secondAttribute="leading" id="P9y-bj-2tC"/>
+                            <constraint firstItem="WZf-S5-SqC" firstAttribute="leading" secondItem="Teo-8d-LYJ" secondAttribute="trailing" constant="10" id="QqJ-GR-aGp"/>
                             <constraint firstItem="XwE-sE-aPN" firstAttribute="top" secondItem="ONL-vF-iUY" secondAttribute="bottom" constant="20" id="XvO-b0-4Pl"/>
                             <constraint firstItem="UNN-CR-rdr" firstAttribute="trailing" secondItem="bc6-yT-aty" secondAttribute="trailing" id="Zep-Ze-DNM"/>
                             <constraint firstItem="UNN-CR-rdr" firstAttribute="leading" secondItem="bc6-yT-aty" secondAttribute="leading" id="Zix-pG-8bU"/>
+                            <constraint firstItem="6dU-fF-FSg" firstAttribute="trailing" secondItem="WZf-S5-SqC" secondAttribute="trailing" id="a7z-pJ-hKf"/>
                             <constraint firstAttribute="trailing" secondItem="bc6-yT-aty" secondAttribute="trailing" constant="20" id="cR0-Np-zTX"/>
                             <constraint firstItem="dQS-Ma-dYP" firstAttribute="trailing" secondItem="bc6-yT-aty" secondAttribute="trailing" id="eNP-iD-wgR"/>
                             <constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="UNN-CR-rdr" secondAttribute="bottom" constant="20" id="efh-iS-51K"/>
                             <constraint firstItem="XwE-sE-aPN" firstAttribute="leading" secondItem="ONL-vF-iUY" secondAttribute="leading" id="fJB-38-JYZ"/>
-                            <constraint firstItem="b1e-IE-2kv" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="fuR-6q-fd6"/>
                             <constraint firstItem="sA4-W9-jxo" firstAttribute="top" secondItem="Teo-8d-LYJ" secondAttribute="top" id="grl-36-NDr"/>
                             <constraint firstItem="ONL-vF-iUY" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" constant="20" id="lNh-0d-b3b"/>
                             <constraint firstItem="dQS-Ma-dYP" firstAttribute="top" secondItem="XwE-sE-aPN" secondAttribute="bottom" constant="20" id="lxB-za-cHQ"/>
                             <constraint firstItem="7LH-tE-it9" firstAttribute="leading" secondItem="XwE-sE-aPN" secondAttribute="trailing" constant="10" id="oYJ-8E-Ieq"/>
                             <constraint firstItem="6dU-fF-FSg" firstAttribute="top" secondItem="Teo-8d-LYJ" secondAttribute="bottom" id="pAc-Ee-Ryj"/>
                             <constraint firstItem="Teo-8d-LYJ" firstAttribute="top" secondItem="bc6-yT-aty" secondAttribute="bottom" constant="20" id="qnB-Iz-Gbp"/>
-                            <constraint firstItem="b1e-IE-2kv" firstAttribute="top" secondItem="Teo-8d-LYJ" secondAttribute="bottom" constant="8" id="rCG-di-kDu"/>
                             <constraint firstItem="ONL-vF-iUY" firstAttribute="leading" secondItem="bc6-yT-aty" secondAttribute="leading" id="sez-Cv-mp9"/>
-                            <constraint firstItem="Gg2-18-Pq8" firstAttribute="centerY" secondItem="Teo-8d-LYJ" secondAttribute="centerY" id="tHU-1i-TyC"/>
                             <constraint firstItem="bc6-yT-aty" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" constant="20" id="tZc-ru-OTc"/>
                             <constraint firstItem="7LH-tE-it9" firstAttribute="trailing" secondItem="ONL-vF-iUY" secondAttribute="trailing" id="tlD-XS-qwO"/>
                             <constraint firstItem="sA4-W9-jxo" firstAttribute="centerX" secondItem="WZf-S5-SqC" secondAttribute="centerX" id="v80-dG-aB7"/>
-                            <constraint firstAttribute="trailing" secondItem="Gg2-18-Pq8" secondAttribute="trailing" constant="20" id="vzB-UP-pVi"/>
                             <constraint firstAttribute="trailing" secondItem="WZf-S5-SqC" secondAttribute="trailing" constant="20" id="wMy-Qf-9Bi"/>
-                            <constraint firstItem="Gg2-18-Pq8" firstAttribute="leading" secondItem="Teo-8d-LYJ" secondAttribute="trailing" constant="10" id="yWA-EY-Qao"/>
                         </constraints>
                     </view>
                     <connections>
                         <outlet property="buttonConnection" destination="Teo-8d-LYJ" id="evE-2I-13A"/>
-                        <outlet property="buttonDownload" destination="Gg2-18-Pq8" id="3u5-YL-8tg"/>
-                        <outlet property="labelDownload" destination="b1e-IE-2kv" id="AXL-Lj-KVd"/>
                         <outlet property="switchTCP" destination="WZf-S5-SqC" id="UyR-J2-iX0"/>
                         <outlet property="textDomain" destination="XwE-sE-aPN" id="byL-Ai-eAD"/>
                         <outlet property="textLog" destination="UNN-CR-rdr" id="a9o-b3-nHT"/>

Demo/BasicTunnel-iOS/BasicTunnel-iOS.entitlements

@@ -8,7 +8,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.privateinternetaccess.ios.demo.BasicTunnel</string>
+		<string>group.com.algoritmico.ios.demo.BasicTunnel</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array>

Demo/BasicTunnel-iOS/ViewController.swift

@@ -3,28 +3,52 @@
 //  BasicTunnel-iOS
 //
 //  Created by Davide De Rosa on 2/11/17.
-//  Copyright © 2018 London Trust Media. All rights reserved.
+//  Copyright © 2018 Davide De Rosa. All rights reserved.
 //
 
 import UIKit
 import NetworkExtension
-import PIATunnel
+import TunnelKit
+
+extension ViewController {
+    private static let appGroup = "group.com.algoritmico.ios.demo.BasicTunnel"
+    
+    private static let bundleIdentifier = "com.algoritmico.ios.demo.BasicTunnel.BasicTunnelExtension"
+    
+    private func makeProtocol() -> NETunnelProviderProtocol {
+        let server = textServer.text!
+        let domain = textDomain.text!
+        
+        let hostname = ((domain == "") ? server : [server, domain].joined(separator: "."))
+        let port = UInt16(textPort.text!)!
+        let username = textUsername.text!
+        let password = textPassword.text!
+        
+        let endpoint = TunnelKitProvider.AuthenticatedEndpoint(
+            hostname: hostname,
+            username: username,
+            password: password
+        )
+        
+        var builder = TunnelKitProvider.ConfigurationBuilder(appGroup: ViewController.appGroup)
+        let socketType: TunnelKitProvider.SocketType = switchTCP.isOn ? .tcp : .udp
+        builder.endpointProtocols = [TunnelKitProvider.EndpointProtocol(socketType, port)]
+        builder.cipher = .aes128cbc
+        builder.digest = .sha1
+        builder.mtu = 1350
+        builder.renegotiatesAfterSeconds = nil
+        builder.shouldDebug = true
+        builder.debugLogKey = "Log"
+        
+        let configuration = builder.build()
+        return try! configuration.generatedTunnelProtocol(
+            withBundleIdentifier: ViewController.bundleIdentifier,
+            endpoint: endpoint
+        )
+    }
+}
 
 class ViewController: UIViewController, URLSessionDataDelegate {
-    static let APP_GROUP = "group.com.privateinternetaccess.ios.demo.BasicTunnel"
-    
-    static let VPN_BUNDLE = "com.privateinternetaccess.ios.demo.BasicTunnel.BasicTunnelExtension"
-
-    static let CIPHER: PIATunnelProvider.Cipher = .aes128cbc
-
-    static let DIGEST: PIATunnelProvider.Digest = .sha1
-
-    static let HANDSHAKE: PIATunnelProvider.Handshake = .rsa2048
-    
-    static let RENEG: Int? = nil
-    
-    static let DOWNLOAD_COUNT = 5
-    
     @IBOutlet var textUsername: UITextField!
     
     @IBOutlet var textPassword: UITextField!
@@ -43,20 +67,10 @@ class ViewController: UIViewController, URLSessionDataDelegate {
 
     //
     
-    @IBOutlet var buttonDownload: UIButton!
-
-    @IBOutlet var labelDownload: UILabel!
-    
     var currentManager: NETunnelProviderManager?
     
     var status = NEVPNStatus.invalid
     
-    var downloadTask: URLSessionDataTask!
-    
-    var downloadCount = 0
-
-    var downloadTimes = [TimeInterval]()
-
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -114,37 +128,8 @@ class ViewController: UIViewController, URLSessionDataDelegate {
     }
     
     func connect() {
-        let server = textServer.text!
-        let domain = textDomain.text!
-        
-        let hostname = ((domain == "") ? server : [server, domain].joined(separator: "."))
-        let port = UInt16(textPort.text!)!
-        let username = textUsername.text!
-        let password = textPassword.text!
-
         configureVPN({ (manager) in
-//            manager.isOnDemandEnabled = true
+            return self.makeProtocol()
-//            manager.onDemandRules = [NEOnDemandRuleConnect()]
-            
-            let endpoint = PIATunnelProvider.AuthenticatedEndpoint(
-                hostname: hostname,
-                username: username,
-                password: password
-            )
-
-            var builder = PIATunnelProvider.ConfigurationBuilder(appGroup: ViewController.APP_GROUP)
-            let socketType: PIATunnelProvider.SocketType = (self.switchTCP.isOn ? .tcp : .udp)
-            builder.endpointProtocols = [PIATunnelProvider.EndpointProtocol(socketType, port, .vanilla)]
-            builder.cipher = ViewController.CIPHER
-            builder.digest = ViewController.DIGEST
-            builder.handshake = ViewController.HANDSHAKE
-            builder.mtu = 1350
-            builder.renegotiatesAfterSeconds = ViewController.RENEG
-            builder.shouldDebug = true
-            builder.debugLogKey = "Log"
-            
-            let configuration = builder.build()
-            return try! configuration.generatedTunnelProtocol(withBundleIdentifier: ViewController.VPN_BUNDLE, endpoint: endpoint)
         }, completionHandler: { (error) in
             if let error = error {
                 print("configure error: \(error)")
@@ -161,7 +146,6 @@ class ViewController: UIViewController, URLSessionDataDelegate {
     
     func disconnect() {
         configureVPN({ (manager) in
-//            manager.isOnDemandEnabled = false
             return nil
         }, completionHandler: { (error) in
             self.currentManager?.connection.stopVPNTunnel()
@@ -172,7 +156,7 @@ class ViewController: UIViewController, URLSessionDataDelegate {
         guard let vpn = currentManager?.connection as? NETunnelProviderSession else {
             return
         }
-        try? vpn.sendProviderMessage(PIATunnelProvider.Message.requestLog.data) { (data) in
+        try? vpn.sendProviderMessage(TunnelKitProvider.Message.requestLog.data) { (data) in
             guard let log = String(data: data!, encoding: .utf8) else {
                 return
             }
@@ -180,57 +164,6 @@ class ViewController: UIViewController, URLSessionDataDelegate {
         }
     }
 
-    @IBAction func download() {
-        downloadCount = ViewController.DOWNLOAD_COUNT
-        downloadTimes.removeAll()
-        buttonDownload.isEnabled = false
-        labelDownload.text = ""
-
-        doDownload()
-    }
-    
-    func doDownload() {
-        let url = URL(string: "https://example.bogus/test/100mb")!
-        var req = URLRequest(url: url)
-        req.httpMethod = "GET"
-        let cfg = URLSessionConfiguration.ephemeral
-        let sess = URLSession(configuration: cfg, delegate: self, delegateQueue: nil)
-        
-        let start = Date()
-        downloadTask = sess.dataTask(with: req) { (data, response, error) in
-            if let error = error {
-                print("error downloading: \(error)")
-                return
-            }
-            
-            let elapsed = -start.timeIntervalSinceNow
-            print("download finished: \(elapsed) seconds")
-            self.downloadTimes.append(elapsed)
-            
-            DispatchQueue.main.async {
-                self.downloadCount -= 1
-                if (self.downloadCount > 0) {
-                    self.labelDownload.text = "\(self.labelDownload.text!)\(elapsed) seconds\n"
-                    self.doDownload()
-                } else {
-                    var avg = 0.0
-                    for n in self.downloadTimes {
-                        avg += n
-                    }
-                    avg /= Double(ViewController.DOWNLOAD_COUNT)
-                    
-                    self.labelDownload.text = "\(avg) seconds"
-                    self.buttonDownload.isEnabled = true
-                }
-            }
-        }
-        downloadTask.resume()
-    }
-    
-    func urlSession(_ session: URLSession, dataTask: URLSessionDataTask, didReceive data: Data) {
-        print("received \(data.count) bytes")
-    }
-    
     func configureVPN(_ configure: @escaping (NETunnelProviderManager) -> NETunnelProviderProtocol?, completionHandler: @escaping (Error?) -> Void) {
         reloadCurrentManager { (error) in
             if let error = error {
@@ -268,7 +201,7 @@ class ViewController: UIViewController, URLSessionDataDelegate {
             
             for m in managers! {
                 if let p = m.protocolConfiguration as? NETunnelProviderProtocol {
-                    if (p.providerBundleIdentifier == ViewController.VPN_BUNDLE) {
+                    if (p.providerBundleIdentifier == ViewController.bundleIdentifier) {
                         manager = m
                         break
                     }

Demo/BasicTunnel-macOS/ViewController.swift

@@ -3,28 +3,53 @@
 //  BasicTunnel-macOS
 //
 //  Created by Davide De Rosa on 10/15/17.
-//  Copyright © 2018 London Trust Media. All rights reserved.
+//  Copyright © 2018 Davide De Rosa. All rights reserved.
 //
 
 import Cocoa
 import NetworkExtension
-import PIATunnel
+import TunnelKit
+
+extension ViewController {
+    private static let appGroup = "group.com.algoritmico.macos.demo.BasicTunnel"
+    
+    private static let bundleIdentifier = "com.algoritmico.macos.demo.BasicTunnel.BasicTunnelExtension"
+    
+    private func makeProtocol() -> NETunnelProviderProtocol {
+        let server = textServer.stringValue
+        let domain = textDomain.stringValue
+        
+        let hostname = ((domain == "") ? server : [server, domain].joined(separator: "."))
+        let port = UInt16(textPort.stringValue)!
+        let username = textUsername.stringValue
+        let password = textPassword.stringValue
+
+        let endpoint = TunnelKitProvider.AuthenticatedEndpoint(
+            hostname: hostname,
+            username: username,
+            password: password
+        )
+
+        var builder = TunnelKitProvider.ConfigurationBuilder(appGroup: ViewController.appGroup)
+//        let socketType: TunnelKitProvider.SocketType = isTCP ? .tcp : .udp
+        let socketType: TunnelKitProvider.SocketType = .udp
+        builder.endpointProtocols = [TunnelKitProvider.EndpointProtocol(socketType, port)]
+        builder.cipher = .aes128cbc
+        builder.digest = .sha1
+        builder.mtu = 1350
+        builder.renegotiatesAfterSeconds = nil
+        builder.shouldDebug = true
+        builder.debugLogKey = "Log"
+        
+        let configuration = builder.build()
+        return try! configuration.generatedTunnelProtocol(
+            withBundleIdentifier: ViewController.bundleIdentifier,
+            endpoint: endpoint
+        )
+    }
+}
 
 class ViewController: NSViewController {
-    static let APP_GROUP = "group.com.privateinternetaccess.macos.demo.BasicTunnel"
-
-    static let VPN_BUNDLE = "com.privateinternetaccess.macos.demo.BasicTunnel.BasicTunnelExtension"
-    
-    static let CIPHER: PIATunnelProvider.Cipher = .aes128cbc
-    
-    static let DIGEST: PIATunnelProvider.Digest = .sha1
-    
-    static let HANDSHAKE: PIATunnelProvider.Handshake = .rsa2048
-    
-    static let RENEG: Int? = nil
-    
-    static let DOWNLOAD_COUNT = 5
-    
     @IBOutlet var textUsername: NSTextField!
     
     @IBOutlet var textPassword: NSTextField!
@@ -41,12 +66,6 @@ class ViewController: NSViewController {
     
     var status = NEVPNStatus.invalid
     
-    var downloadTask: URLSessionDataTask!
-    
-    var downloadCount = 0
-    
-    var downloadTimes = [TimeInterval]()
-    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -59,10 +78,12 @@ class ViewController: NSViewController {
         textUsername.stringValue = "myusername"
         textPassword.stringValue = "mypassword"
         
-        NotificationCenter.default.addObserver(self,
+        NotificationCenter.default.addObserver(
-                                               selector: #selector(VPNStatusDidChange(notification:)),
+            self,
-                                               name: .NEVPNStatusDidChange,
+            selector: #selector(VPNStatusDidChange(notification:)),
-                                               object: nil)
+            name: .NEVPNStatusDidChange,
+            object: nil
+        )
         
         reloadCurrentManager(nil)
         
@@ -96,38 +117,8 @@ class ViewController: NSViewController {
     }
     
     func connect() {
-        let server = textServer.stringValue
-        let domain = textDomain.stringValue
-        
-        let hostname = ((domain == "") ? server : [server, domain].joined(separator: "."))
-        let port = UInt16(textPort.stringValue)!
-        let username = textUsername.stringValue
-        let password = textPassword.stringValue
-        
         configureVPN({ (manager) in
-//            manager.isOnDemandEnabled = true
+            return self.makeProtocol()
-//            manager.onDemandRules = [NEOnDemandRuleConnect()]
-            
-            let endpoint = PIATunnelProvider.AuthenticatedEndpoint(
-                hostname: hostname,
-                username: username,
-                password: password
-            )
-            
-            var builder = PIATunnelProvider.ConfigurationBuilder(appGroup: ViewController.APP_GROUP)
-//            let socketType: PIATunnelProvider.SocketType = (self.switchTCP.isOn ? .tcp : .udp)
-            let socketType: PIATunnelProvider.SocketType = .udp
-            builder.endpointProtocols = [PIATunnelProvider.EndpointProtocol(socketType, port, .vanilla)]
-            builder.cipher = ViewController.CIPHER
-            builder.digest = ViewController.DIGEST
-            builder.handshake = ViewController.HANDSHAKE
-            builder.mtu = 1350
-            builder.renegotiatesAfterSeconds = ViewController.RENEG
-            builder.shouldDebug = true
-            builder.debugLogKey = "Log"
-            
-            let configuration = builder.build()
-            return try! configuration.generatedTunnelProtocol(withBundleIdentifier: ViewController.VPN_BUNDLE, endpoint: endpoint)
         }, completionHandler: { (error) in
             if let error = error {
                 print("configure error: \(error)")
@@ -144,7 +135,6 @@ class ViewController: NSViewController {
     
     func disconnect() {
         configureVPN({ (manager) in
-            //            manager.isOnDemandEnabled = false
             return nil
         }, completionHandler: { (error) in
             self.currentManager?.connection.stopVPNTunnel()
@@ -188,7 +178,7 @@ class ViewController: NSViewController {
             
             for m in managers! {
                 if let p = m.protocolConfiguration as? NETunnelProviderProtocol {
-                    if (p.providerBundleIdentifier == ViewController.VPN_BUNDLE) {
+                    if (p.providerBundleIdentifier == ViewController.bundleIdentifier) {
                         manager = m
                         break
                     }

Demo/BasicTunnelExtension-iOS/BasicTunnelExtension-iOS.entitlements

@@ -8,7 +8,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.privateinternetaccess.ios.demo.BasicTunnel</string>
+		<string>group.com.algoritmico.ios.demo.BasicTunnel</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array>

Demo/BasicTunnelExtension-iOS/PacketTunnelProvider.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2018 London Trust Media. All rights reserved.
 //
 
-import PIATunnel
+import TunnelKit
 
-class PacketTunnelProvider: PIATunnelProvider {
+class PacketTunnelProvider: TunnelKitProvider {
 }

Demo/BasicTunnelExtension-macOS/PacketTunnelProvider.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2018 London Trust Media. All rights reserved.
 //
 
-import PIATunnel
+import TunnelKit
 
-class PacketTunnelProvider: PIATunnelProvider {
+class PacketTunnelProvider: TunnelKitProvider {
 }

Demo/Demo.xcodeproj/project.pbxproj

@@ -22,10 +22,10 @@
 		0EB6EED41F92D43D005F6221 /* BasicTunnelExtension-macOS.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 0EB6EECB1F92D43D005F6221 /* BasicTunnelExtension-macOS.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		0EB6EEDA1F92D4BA005F6221 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EB6EED91F92D4BA005F6221 /* NetworkExtension.framework */; };
 		0EE878F81F936469002A0D58 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EB6EED91F92D4BA005F6221 /* NetworkExtension.framework */; };
-		3908146517D6E4FB2A9D937D /* Pods_iOS_BasicTunnelExtension_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 793C61EE3021675F5E1E7851 /* Pods_iOS_BasicTunnelExtension_iOS.framework */; };
+		1980C130D3B43C0024E59939 /* Pods_iOS_BasicTunnel_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 775CEE5DD8FFC11266A4D7F9 /* Pods_iOS_BasicTunnel_iOS.framework */; };
-		7A8E24264F7886297FF7360E /* Pods_iOS_BasicTunnel_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 58CD8D66DB993CAA3D95BF58 /* Pods_iOS_BasicTunnel_iOS.framework */; };
+		39CD1A9C1AE5F4ABF30C4F97 /* Pods_macOS_BasicTunnelExtension_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 62EFD8BCD07B20EF83F42763 /* Pods_macOS_BasicTunnelExtension_macOS.framework */; };
-		DDB7740C50825D06A90A8F85 /* Pods_macOS_BasicTunnel_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE4702495E15F3783163A9DD /* Pods_macOS_BasicTunnel_macOS.framework */; };
+		3FB7C2F3C8148BF145FD2EF5 /* Pods_iOS_BasicTunnelExtension_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61E77EB097E4DC1610F5E50F /* Pods_iOS_BasicTunnelExtension_iOS.framework */; };
-		ED81344C597F479F327D005F /* Pods_macOS_BasicTunnelExtension_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64C5E38D0BFB111803E5B140 /* Pods_macOS_BasicTunnelExtension_macOS.framework */; };
+		F66522FC3C8356D4AE7D2428 /* Pods_macOS_BasicTunnel_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4F71774745704B9CF8E36C1 /* Pods_macOS_BasicTunnel_macOS.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -95,18 +95,18 @@
 		0EB6EECF1F92D43D005F6221 /* PacketTunnelProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PacketTunnelProvider.swift; sourceTree = "<group>"; };
 		0EB6EED11F92D43D005F6221 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		0EB6EED91F92D4BA005F6221 /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks/NetworkExtension.framework; sourceTree = DEVELOPER_DIR; };
-		5052DB12F617640E1D481436 /* Pods-iOS-BasicTunnel-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS-BasicTunnel-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iOS-BasicTunnel-iOS/Pods-iOS-BasicTunnel-iOS.debug.xcconfig"; sourceTree = "<group>"; };
+		484C87261073EF01BDC404F8 /* Pods-iOS-BasicTunnel-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS-BasicTunnel-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iOS-BasicTunnel-iOS/Pods-iOS-BasicTunnel-iOS.debug.xcconfig"; sourceTree = "<group>"; };
-		58CD8D66DB993CAA3D95BF58 /* Pods_iOS_BasicTunnel_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iOS_BasicTunnel_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		51B469FAC04F49DA76B86299 /* Pods-iOS-BasicTunnel-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS-BasicTunnel-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-iOS-BasicTunnel-iOS/Pods-iOS-BasicTunnel-iOS.release.xcconfig"; sourceTree = "<group>"; };
-		6435864DB434E6A2405C0A03 /* Pods-iOS-BasicTunnelExtension-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS-BasicTunnelExtension-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iOS-BasicTunnelExtension-iOS/Pods-iOS-BasicTunnelExtension-iOS.debug.xcconfig"; sourceTree = "<group>"; };
+		5900D83A429B34C1A705C5B7 /* Pods-iOS-BasicTunnelExtension-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS-BasicTunnelExtension-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iOS-BasicTunnelExtension-iOS/Pods-iOS-BasicTunnelExtension-iOS.debug.xcconfig"; sourceTree = "<group>"; };
-		644A04AFE7563DC48EFAF754 /* Pods-macOS-BasicTunnelExtension-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOS-BasicTunnelExtension-macOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-macOS-BasicTunnelExtension-macOS/Pods-macOS-BasicTunnelExtension-macOS.release.xcconfig"; sourceTree = "<group>"; };
+		61E77EB097E4DC1610F5E50F /* Pods_iOS_BasicTunnelExtension_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iOS_BasicTunnelExtension_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		64C5E38D0BFB111803E5B140 /* Pods_macOS_BasicTunnelExtension_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_macOS_BasicTunnelExtension_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		62EFD8BCD07B20EF83F42763 /* Pods_macOS_BasicTunnelExtension_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_macOS_BasicTunnelExtension_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		793C61EE3021675F5E1E7851 /* Pods_iOS_BasicTunnelExtension_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iOS_BasicTunnelExtension_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		775CEE5DD8FFC11266A4D7F9 /* Pods_iOS_BasicTunnel_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iOS_BasicTunnel_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		86573C14FDBC5268162C4955 /* Pods-macOS-BasicTunnel-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOS-BasicTunnel-macOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-macOS-BasicTunnel-macOS/Pods-macOS-BasicTunnel-macOS.release.xcconfig"; sourceTree = "<group>"; };
+		B87BC309D14310866825A4CE /* Pods-macOS-BasicTunnel-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOS-BasicTunnel-macOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-macOS-BasicTunnel-macOS/Pods-macOS-BasicTunnel-macOS.debug.xcconfig"; sourceTree = "<group>"; };
-		9E2D2F7DF58A0C0F6427E281 /* Pods-iOS-BasicTunnel-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS-BasicTunnel-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-iOS-BasicTunnel-iOS/Pods-iOS-BasicTunnel-iOS.release.xcconfig"; sourceTree = "<group>"; };
+		BBFD61FA7BC0A2E0FE7FD2D5 /* Pods-macOS-BasicTunnelExtension-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOS-BasicTunnelExtension-macOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-macOS-BasicTunnelExtension-macOS/Pods-macOS-BasicTunnelExtension-macOS.release.xcconfig"; sourceTree = "<group>"; };
-		A288006EEDE2BE66F8448A44 /* Pods-macOS-BasicTunnelExtension-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOS-BasicTunnelExtension-macOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-macOS-BasicTunnelExtension-macOS/Pods-macOS-BasicTunnelExtension-macOS.debug.xcconfig"; sourceTree = "<group>"; };
+		D1271C71EB65C3EA62965A19 /* Pods-macOS-BasicTunnel-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOS-BasicTunnel-macOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-macOS-BasicTunnel-macOS/Pods-macOS-BasicTunnel-macOS.release.xcconfig"; sourceTree = "<group>"; };
-		D43202F48A06F897845BB823 /* Pods-macOS-BasicTunnel-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOS-BasicTunnel-macOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-macOS-BasicTunnel-macOS/Pods-macOS-BasicTunnel-macOS.debug.xcconfig"; sourceTree = "<group>"; };
+		DC82CED2F66990DD0622CC78 /* Pods-iOS-BasicTunnelExtension-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS-BasicTunnelExtension-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-iOS-BasicTunnelExtension-iOS/Pods-iOS-BasicTunnelExtension-iOS.release.xcconfig"; sourceTree = "<group>"; };
-		EACBBF6B797755CE91FFFE75 /* Pods-iOS-BasicTunnelExtension-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iOS-BasicTunnelExtension-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-iOS-BasicTunnelExtension-iOS/Pods-iOS-BasicTunnelExtension-iOS.release.xcconfig"; sourceTree = "<group>"; };
+		E4A33190602EEF05A835166A /* Pods-macOS-BasicTunnelExtension-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-macOS-BasicTunnelExtension-macOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-macOS-BasicTunnelExtension-macOS/Pods-macOS-BasicTunnelExtension-macOS.debug.xcconfig"; sourceTree = "<group>"; };
-		FE4702495E15F3783163A9DD /* Pods_macOS_BasicTunnel_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_macOS_BasicTunnel_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		E4F71774745704B9CF8E36C1 /* Pods_macOS_BasicTunnel_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_macOS_BasicTunnel_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -114,7 +114,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7A8E24264F7886297FF7360E /* Pods_iOS_BasicTunnel_iOS.framework in Frameworks */,
+				1980C130D3B43C0024E59939 /* Pods_iOS_BasicTunnel_iOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -122,7 +122,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3908146517D6E4FB2A9D937D /* Pods_iOS_BasicTunnelExtension_iOS.framework in Frameworks */,
+				3FB7C2F3C8148BF145FD2EF5 /* Pods_iOS_BasicTunnelExtension_iOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -131,7 +131,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				0EB6EEDA1F92D4BA005F6221 /* NetworkExtension.framework in Frameworks */,
-				DDB7740C50825D06A90A8F85 /* Pods_macOS_BasicTunnel_macOS.framework in Frameworks */,
+				F66522FC3C8356D4AE7D2428 /* Pods_macOS_BasicTunnel_macOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -140,7 +140,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				0EE878F81F936469002A0D58 /* NetworkExtension.framework in Frameworks */,
-				ED81344C597F479F327D005F /* Pods_macOS_BasicTunnelExtension_macOS.framework in Frameworks */,
+				39CD1A9C1AE5F4ABF30C4F97 /* Pods_macOS_BasicTunnelExtension_macOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -156,7 +156,7 @@
 				0EB6EECC1F92D43D005F6221 /* BasicTunnelExtension-macOS */,
 				0EB39FCE1F7424580023AFFC /* Products */,
 				B850E57E641AD1B37E79BAB5 /* Frameworks */,
-				34D3F90470498D814E74A5C6 /* Pods */,
+				94C1D7B5B11C6CCE74B21D93 /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -250,17 +250,17 @@
 			name = "Supporting files";
 			sourceTree = "<group>";
 		};
-		34D3F90470498D814E74A5C6 /* Pods */ = {
+		94C1D7B5B11C6CCE74B21D93 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				5052DB12F617640E1D481436 /* Pods-iOS-BasicTunnel-iOS.debug.xcconfig */,
+				484C87261073EF01BDC404F8 /* Pods-iOS-BasicTunnel-iOS.debug.xcconfig */,
-				9E2D2F7DF58A0C0F6427E281 /* Pods-iOS-BasicTunnel-iOS.release.xcconfig */,
+				51B469FAC04F49DA76B86299 /* Pods-iOS-BasicTunnel-iOS.release.xcconfig */,
-				6435864DB434E6A2405C0A03 /* Pods-iOS-BasicTunnelExtension-iOS.debug.xcconfig */,
+				5900D83A429B34C1A705C5B7 /* Pods-iOS-BasicTunnelExtension-iOS.debug.xcconfig */,
-				EACBBF6B797755CE91FFFE75 /* Pods-iOS-BasicTunnelExtension-iOS.release.xcconfig */,
+				DC82CED2F66990DD0622CC78 /* Pods-iOS-BasicTunnelExtension-iOS.release.xcconfig */,
-				D43202F48A06F897845BB823 /* Pods-macOS-BasicTunnel-macOS.debug.xcconfig */,
+				B87BC309D14310866825A4CE /* Pods-macOS-BasicTunnel-macOS.debug.xcconfig */,
-				86573C14FDBC5268162C4955 /* Pods-macOS-BasicTunnel-macOS.release.xcconfig */,
+				D1271C71EB65C3EA62965A19 /* Pods-macOS-BasicTunnel-macOS.release.xcconfig */,
-				A288006EEDE2BE66F8448A44 /* Pods-macOS-BasicTunnelExtension-macOS.debug.xcconfig */,
+				E4A33190602EEF05A835166A /* Pods-macOS-BasicTunnelExtension-macOS.debug.xcconfig */,
-				644A04AFE7563DC48EFAF754 /* Pods-macOS-BasicTunnelExtension-macOS.release.xcconfig */,
+				BBFD61FA7BC0A2E0FE7FD2D5 /* Pods-macOS-BasicTunnelExtension-macOS.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
@@ -269,10 +269,10 @@
 			isa = PBXGroup;
 			children = (
 				0EB6EED91F92D4BA005F6221 /* NetworkExtension.framework */,
-				58CD8D66DB993CAA3D95BF58 /* Pods_iOS_BasicTunnel_iOS.framework */,
+				775CEE5DD8FFC11266A4D7F9 /* Pods_iOS_BasicTunnel_iOS.framework */,
-				793C61EE3021675F5E1E7851 /* Pods_iOS_BasicTunnelExtension_iOS.framework */,
+				61E77EB097E4DC1610F5E50F /* Pods_iOS_BasicTunnelExtension_iOS.framework */,
-				FE4702495E15F3783163A9DD /* Pods_macOS_BasicTunnel_macOS.framework */,
+				E4F71774745704B9CF8E36C1 /* Pods_macOS_BasicTunnel_macOS.framework */,
-				64C5E38D0BFB111803E5B140 /* Pods_macOS_BasicTunnelExtension_macOS.framework */,
+				62EFD8BCD07B20EF83F42763 /* Pods_macOS_BasicTunnelExtension_macOS.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -284,12 +284,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 0EB39FF51F7424F80023AFFC /* Build configuration list for PBXNativeTarget "BasicTunnel-iOS" */;
 			buildPhases = (
-				8654E3AEB3A2369E83089DE1 /* [CP] Check Pods Manifest.lock */,
+				C772E0EE406756CD998F1DFD /* [CP] Check Pods Manifest.lock */,
 				0EB39FE21F7424F80023AFFC /* Sources */,
 				0EB39FE31F7424F80023AFFC /* Frameworks */,
 				0EB39FE41F7424F80023AFFC /* Resources */,
 				0EB3A0091F7425140023AFFC /* Embed App Extensions */,
-				C01795F3F1E523D48472410F /* [CP] Embed Pods Frameworks */,
+				A3C198CD449DD5434CB4A22E /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -305,7 +305,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 0EB3A0061F7425140023AFFC /* Build configuration list for PBXNativeTarget "BasicTunnelExtension-iOS" */;
 			buildPhases = (
-				D83479D2193DDBE1F61F7994 /* [CP] Check Pods Manifest.lock */,
+				1D6B4C41FD2B3C5D8E3FA076 /* [CP] Check Pods Manifest.lock */,
 				0EB39FF81F7425140023AFFC /* Sources */,
 				0EB39FF91F7425140023AFFC /* Frameworks */,
 				0EB39FFA1F7425140023AFFC /* Resources */,
@@ -323,12 +323,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 0EB6EEC61F92D417005F6221 /* Build configuration list for PBXNativeTarget "BasicTunnel-macOS" */;
 			buildPhases = (
-				52FA651791DFCB2780F05CC0 /* [CP] Check Pods Manifest.lock */,
+				F1880CC3FE9FC942D0F802BA /* [CP] Check Pods Manifest.lock */,
 				0EB6EEB31F92D417005F6221 /* Sources */,
 				0EB6EEB41F92D417005F6221 /* Frameworks */,
 				0EB6EEB51F92D417005F6221 /* Resources */,
 				0EB6EED81F92D43D005F6221 /* Embed App Extensions */,
-				C808C600FAEEFF648BCD5A99 /* [CP] Embed Pods Frameworks */,
+				AC2C3BCB219270755C04C726 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -344,7 +344,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 0EB6EED51F92D43D005F6221 /* Build configuration list for PBXNativeTarget "BasicTunnelExtension-macOS" */;
 			buildPhases = (
-				EEDE45EF0F6328D22A7732F5 /* [CP] Check Pods Manifest.lock */,
+				6A664C6A5F9D3538B3DA1207 /* [CP] Check Pods Manifest.lock */,
 				0EB6EEC71F92D43D005F6221 /* Sources */,
 				0EB6EEC81F92D43D005F6221 /* Frameworks */,
 				0EB6EEC91F92D43D005F6221 /* Resources */,
@@ -488,96 +488,20 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		52FA651791DFCB2780F05CC0 /* [CP] Check Pods Manifest.lock */ = {
+		1D6B4C41FD2B3C5D8E3FA076 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
 				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
 				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
-			outputPaths = (
+			outputFileListPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-macOS-BasicTunnel-macOS-checkManifestLockResult.txt",
 			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		8654E3AEB3A2369E83089DE1 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-iOS-BasicTunnel-iOS-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		C01795F3F1E523D48472410F /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-iOS-BasicTunnel-iOS/Pods-iOS-BasicTunnel-iOS-frameworks.sh",
-				"${PODS_ROOT}/OpenSSL-Apple/frameworks/iPhone/openssl.framework",
-				"${BUILT_PRODUCTS_DIR}/PIATunnel-iOS/PIATunnel.framework",
-				"${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PIATunnel.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS-BasicTunnel-iOS/Pods-iOS-BasicTunnel-iOS-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		C808C600FAEEFF648BCD5A99 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-macOS-BasicTunnel-macOS/Pods-macOS-BasicTunnel-macOS-frameworks.sh",
-				"${PODS_ROOT}/OpenSSL-Apple/frameworks/MacOSX/openssl.framework",
-				"${BUILT_PRODUCTS_DIR}/PIATunnel-macOS/PIATunnel.framework",
-				"${BUILT_PRODUCTS_DIR}/SwiftyBeaver-macOS/SwiftyBeaver.framework",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PIATunnel.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-macOS-BasicTunnel-macOS/Pods-macOS-BasicTunnel-macOS-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		D83479D2193DDBE1F61F7994 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/Pods-iOS-BasicTunnelExtension-iOS-checkManifestLockResult.txt",
 			);
@@ -586,16 +510,20 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		EEDE45EF0F6328D22A7732F5 /* [CP] Check Pods Manifest.lock */ = {
+		6A664C6A5F9D3538B3DA1207 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
 				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
 				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/Pods-macOS-BasicTunnelExtension-macOS-checkManifestLockResult.txt",
 			);
@@ -604,6 +532,102 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		A3C198CD449DD5434CB4A22E /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-iOS-BasicTunnel-iOS/Pods-iOS-BasicTunnel-iOS-frameworks.sh",
+				"${PODS_ROOT}/OpenSSL-Apple/frameworks/iPhone/openssl.framework",
+				"${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework",
+				"${BUILT_PRODUCTS_DIR}/TunnelKit-iOS/TunnelKit.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TunnelKit.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS-BasicTunnel-iOS/Pods-iOS-BasicTunnel-iOS-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		AC2C3BCB219270755C04C726 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-macOS-BasicTunnel-macOS/Pods-macOS-BasicTunnel-macOS-frameworks.sh",
+				"${PODS_ROOT}/OpenSSL-Apple/frameworks/MacOSX/openssl.framework",
+				"${BUILT_PRODUCTS_DIR}/SwiftyBeaver-macOS/SwiftyBeaver.framework",
+				"${BUILT_PRODUCTS_DIR}/TunnelKit-macOS/TunnelKit.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TunnelKit.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-macOS-BasicTunnel-macOS/Pods-macOS-BasicTunnel-macOS-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		C772E0EE406756CD998F1DFD /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-iOS-BasicTunnel-iOS-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		F1880CC3FE9FC942D0F802BA /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-macOS-BasicTunnel-macOS-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -797,15 +821,15 @@
 		};
 		0EB39FF61F7424F80023AFFC /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5052DB12F617640E1D481436 /* Pods-iOS-BasicTunnel-iOS.debug.xcconfig */;
+			baseConfigurationReference = 484C87261073EF01BDC404F8 /* Pods-iOS-BasicTunnel-iOS.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "BasicTunnel-iOS/BasicTunnel-iOS.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 5357M5NW9W;
+				DEVELOPMENT_TEAM = DTDYD63ZX9;
 				INFOPLIST_FILE = "BasicTunnel-iOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.ios.demo.BasicTunnel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.ios.demo.BasicTunnel;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -813,15 +837,15 @@
 		};
 		0EB39FF71F7424F80023AFFC /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9E2D2F7DF58A0C0F6427E281 /* Pods-iOS-BasicTunnel-iOS.release.xcconfig */;
+			baseConfigurationReference = 51B469FAC04F49DA76B86299 /* Pods-iOS-BasicTunnel-iOS.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "BasicTunnel-iOS/BasicTunnel-iOS.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 5357M5NW9W;
+				DEVELOPMENT_TEAM = DTDYD63ZX9;
 				INFOPLIST_FILE = "BasicTunnel-iOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.ios.demo.BasicTunnel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.ios.demo.BasicTunnel;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -829,14 +853,14 @@
 		};
 		0EB3A0071F7425140023AFFC /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 6435864DB434E6A2405C0A03 /* Pods-iOS-BasicTunnelExtension-iOS.debug.xcconfig */;
+			baseConfigurationReference = 5900D83A429B34C1A705C5B7 /* Pods-iOS-BasicTunnelExtension-iOS.debug.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "BasicTunnelExtension-iOS/BasicTunnelExtension-iOS.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 5357M5NW9W;
+				DEVELOPMENT_TEAM = DTDYD63ZX9;
 				INFOPLIST_FILE = "BasicTunnelExtension-iOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.ios.demo.BasicTunnel.BasicTunnelExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.ios.demo.BasicTunnel.BasicTunnelExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -845,14 +869,14 @@
 		};
 		0EB3A0081F7425140023AFFC /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = EACBBF6B797755CE91FFFE75 /* Pods-iOS-BasicTunnelExtension-iOS.release.xcconfig */;
+			baseConfigurationReference = DC82CED2F66990DD0622CC78 /* Pods-iOS-BasicTunnelExtension-iOS.release.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "BasicTunnelExtension-iOS/BasicTunnelExtension-iOS.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 5357M5NW9W;
+				DEVELOPMENT_TEAM = DTDYD63ZX9;
 				INFOPLIST_FILE = "BasicTunnelExtension-iOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.ios.demo.BasicTunnel.BasicTunnelExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.ios.demo.BasicTunnel.BasicTunnelExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -861,17 +885,17 @@
 		};
 		0EB6EEC41F92D417005F6221 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D43202F48A06F897845BB823 /* Pods-macOS-BasicTunnel-macOS.debug.xcconfig */;
+			baseConfigurationReference = B87BC309D14310866825A4CE /* Pods-macOS-BasicTunnel-macOS.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "BasicTunnel-macOS/BasicTunnel-macOS.entitlements";
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = 5357M5NW9W;
+				DEVELOPMENT_TEAM = DTDYD63ZX9;
 				INFOPLIST_FILE = "BasicTunnel-macOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.macos.demo.BasicTunnel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.macos.demo.BasicTunnel;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
@@ -880,17 +904,17 @@
 		};
 		0EB6EEC51F92D417005F6221 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 86573C14FDBC5268162C4955 /* Pods-macOS-BasicTunnel-macOS.release.xcconfig */;
+			baseConfigurationReference = D1271C71EB65C3EA62965A19 /* Pods-macOS-BasicTunnel-macOS.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "BasicTunnel-macOS/BasicTunnel-macOS.entitlements";
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = 5357M5NW9W;
+				DEVELOPMENT_TEAM = DTDYD63ZX9;
 				INFOPLIST_FILE = "BasicTunnel-macOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.macos.demo.BasicTunnel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.macos.demo.BasicTunnel;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
@@ -899,15 +923,15 @@
 		};
 		0EB6EED61F92D43D005F6221 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = A288006EEDE2BE66F8448A44 /* Pods-macOS-BasicTunnelExtension-macOS.debug.xcconfig */;
+			baseConfigurationReference = E4A33190602EEF05A835166A /* Pods-macOS-BasicTunnelExtension-macOS.debug.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "BasicTunnelExtension-macOS/BasicTunnelExtension-macOS.entitlements";
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 5357M5NW9W;
+				DEVELOPMENT_TEAM = DTDYD63ZX9;
 				INFOPLIST_FILE = "BasicTunnelExtension-macOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.macos.demo.BasicTunnel.BasicTunnelExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.macos.demo.BasicTunnel.BasicTunnelExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
@@ -917,15 +941,15 @@
 		};
 		0EB6EED71F92D43D005F6221 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 644A04AFE7563DC48EFAF754 /* Pods-macOS-BasicTunnelExtension-macOS.release.xcconfig */;
+			baseConfigurationReference = BBFD61FA7BC0A2E0FE7FD2D5 /* Pods-macOS-BasicTunnelExtension-macOS.release.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "BasicTunnelExtension-macOS/BasicTunnelExtension-macOS.entitlements";
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 5357M5NW9W;
+				DEVELOPMENT_TEAM = DTDYD63ZX9;
 				INFOPLIST_FILE = "BasicTunnelExtension-macOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.macos.demo.BasicTunnel.BasicTunnelExtension;
+				PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.macos.demo.BasicTunnel.BasicTunnelExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;

Demo/Podfile

@@ -5,7 +5,7 @@ abstract_target 'iOS' do
     platform :ios, '9.0'
 
     target 'BasicTunnelExtension-iOS' do
-        pod 'PIATunnel', :path => '..'
+        pod 'TunnelKit', :path => '..'
     end
     target 'BasicTunnel-iOS' do
     end
@@ -15,7 +15,7 @@ abstract_target 'macOS' do
     platform :osx, '10.11'
 
     target 'BasicTunnelExtension-macOS' do
-        pod 'PIATunnel', :path => '..'
+        pod 'TunnelKit', :path => '..'
     end
     target 'BasicTunnel-macOS' do
     end

Demo/Podfile.lock

@@ -1,18 +1,18 @@
 PODS:
   - OpenSSL-Apple (1.1.0h)
-  - PIATunnel (1.1.6):
+  - SwiftyBeaver (1.6.0)
-    - PIATunnel/AppExtension (= 1.1.6)
+  - TunnelKit (1.0.0):
-    - PIATunnel/Core (= 1.1.6)
+    - TunnelKit/AppExtension (= 1.0.0)
-  - PIATunnel/AppExtension (1.1.6):
+    - TunnelKit/Core (= 1.0.0)
-    - PIATunnel/Core
+  - TunnelKit/AppExtension (1.0.0):
     - SwiftyBeaver
-  - PIATunnel/Core (1.1.6):
+    - TunnelKit/Core
+  - TunnelKit/Core (1.0.0):
     - OpenSSL-Apple (~> 1.1.0h)
     - SwiftyBeaver
-  - SwiftyBeaver (1.6.0)
 
 DEPENDENCIES:
-  - PIATunnel (from `..`)
+  - TunnelKit (from `..`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -20,14 +20,14 @@ SPEC REPOS:
     - SwiftyBeaver
 
 EXTERNAL SOURCES:
-  PIATunnel:
+  TunnelKit:
     :path: ".."
 
 SPEC CHECKSUMS:
   OpenSSL-Apple: cd153d705ef350eb834ae7ff5f21f792b51ed208
-  PIATunnel: b98780a58c8826bd82f1e15878078997ed172680
   SwiftyBeaver: e45759613e50b522b0e6f53b1f0f14389b45ca34
+  TunnelKit: 79e018dba82d9a2335daf5c55c473527cff52b73
 
-PODFILE CHECKSUM: 1199e89f72f37e986463243abe5442ffdc81274c
+PODFILE CHECKSUM: dbd445ce3249028c60f04276181924bb9bfc726d
 
 COCOAPODS: 1.5.3

LICENSE

@@ -1,7 +1,674 @@
-Copyright (c) 2018-Present Private Internet Access
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+                            Preamble
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program 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.
+
+    This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

PIATunnel.podspec

@@ -1,33 +0,0 @@
-Pod::Spec.new do |s|
-    s.name              = "PIATunnel"
-    s.version           = "1.1.6"
-    s.summary           = "PIA tunnel implementation in Swift."
-
-    s.homepage          = "https://www.privateinternetaccess.com/"
-    s.license           = { :type => "MIT", :file => "LICENSE" }
-    s.author            = { "Davide De Rosa" => "davide@londontrustmedia.com" }
-    s.source            = { :git => "https://github.com/pia-foss/tunnel-apple.git", :tag => "v#{s.version}" }
-
-    s.ios.deployment_target = "9.0"
-    s.osx.deployment_target = "10.11"
-
-    s.subspec "Core" do |p|
-        p.source_files          = "PIATunnel/Sources/Core/**/*.{h,m,swift}"
-        p.private_header_files  = "PIATunnel/Sources/Core/**/*.h"
-        p.preserve_paths        = "PIATunnel/Sources/Core/*.modulemap"
-        p.pod_target_xcconfig   = { "SWIFT_INCLUDE_PATHS" => "${PODS_TARGET_SRCROOT}/PIATunnel/Sources/Core",
-                                    "APPLICATION_EXTENSION_API_ONLY" => "YES" }
-        p.dependency "SwiftyBeaver"
-        p.dependency "OpenSSL-Apple", "~> 1.1.0h"
-    end
-
-    s.subspec "AppExtension" do |p|
-        p.source_files          = "PIATunnel/Sources/AppExtension/**/*.swift"
-        p.resources             = "PIATunnel/Resources/AppExtension/**/*"
-        p.frameworks            = "NetworkExtension"
-        p.pod_target_xcconfig   = { "APPLICATION_EXTENSION_API_ONLY" => "YES" }
-
-        p.dependency "PIATunnel/Core"
-        p.dependency "SwiftyBeaver"
-    end
-end

PIATunnel/Sources/AppExtension/Transport/LinkInterface+Strategy.swift

@@ -1,30 +0,0 @@
-//
-//  LinkInterface+Strategy.swift
-//  PIATunnel
-//
-//  Created by Davide De Rosa on 6/28/18.
-//  Copyright © 2018 London Trust Media. All rights reserved.
-//
-
-import Foundation
-
-extension LinkInterface {
-    func hardReset(with encryption: SessionProxy.EncryptionParameters) -> Data? {
-        switch communicationType {
-        case .pia:
-            guard let caDigest = encryption.caDigest else {
-                fatalError("PIA communication requires CA MD5 digest")
-            }
-            let settings = TunnelSettings(
-                caMd5Digest: caDigest,
-                cipherName: encryption.cipherName,
-                digestName: encryption.digestName
-            )
-            return (try? settings.encodedData()) ?? Data()
-            
-        default:
-            break
-        }
-        return nil
-    }
-}

PIATunnel/Sources/Core/CommunicationType.swift

@@ -1,19 +0,0 @@
-//
-//  CommunicationType.swift
-//  PIATunnel
-//
-//  Created by Davide De Rosa on 6/28/18.
-//  Copyright © 2018 London Trust Media. All rights reserved.
-//
-
-import Foundation
-
-/// The language spoken over a link.
-public enum CommunicationType: String {
-    
-    /// PIA-patched OpenVPN server.
-    case pia
-    
-    /// Stock OpenVPN server.
-    case vanilla
-}

PIATunnel/Sources/Core/Errors.h

@@ -1,27 +0,0 @@
-//
-//  Errors.h
-//  PIATunnel
-//
-//  Created by Davide De Rosa on 10/10/17.
-//  Copyright © 2018 London Trust Media. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-extern NSString *const PIATunnelErrorDomain;
-
-typedef NS_ENUM(NSInteger, PIATunnelErrorCode) {
-    PIATunnelErrorCodeCryptoBoxRandomGenerator = 101,
-    PIATunnelErrorCodeCryptoBoxHMAC,
-    PIATunnelErrorCodeCryptoBoxEncryption,
-    PIATunnelErrorCodeCryptoBoxAlgorithm,
-    PIATunnelErrorCodeTLSBoxCA = 201,
-    PIATunnelErrorCodeTLSBoxHandshake,
-    PIATunnelErrorCodeTLSBoxGeneric,
-    PIATunnelErrorCodeDataPathOverflow = 301,
-    PIATunnelErrorCodeDataPathPeerIdMismatch
-};
-
-static inline NSError *PIATunnelErrorWithCode(PIATunnelErrorCode code) {
-    return [NSError errorWithDomain:PIATunnelErrorDomain code:code userInfo:nil];
-}

PIATunnel/Sources/Core/TunnelSettings.swift

@@ -1,50 +0,0 @@
-//
-//  TunnelSettings.swift
-//  PIATunnel
-//
-//  Created by Davide De Rosa on 2/7/17.
-//  Copyright © 2018 London Trust Media. All rights reserved.
-//
-
-import Foundation
-
-enum TunnelSettingsError: Error {
-    case encoding
-}
-
-struct TunnelSettings {
-    private static let obfuscationKeyLength = 3
-    
-    private static let magic = "53eo0rk92gxic98p1asgl5auh59r1vp4lmry1e3chzi100qntd"
-    
-    private static let encodedFormat = "\(magic)crypto\t%@|%@\tca\t%@"
-    
-    private let caMd5Digest: String
-    
-    private let cipherName: String
-    
-    private let digestName: String
-
-    init(caMd5Digest: String, cipherName: String, digestName: String) {
-        self.caMd5Digest = caMd5Digest
-        self.cipherName = cipherName
-        self.digestName = digestName
-    }
-
-    // Ruby: pia_settings
-    func encodedData() throws -> Data {
-        guard let plainData = String(format: TunnelSettings.encodedFormat, cipherName, digestName, caMd5Digest).data(using: .ascii) else {
-            throw TunnelSettingsError.encoding
-        }
-        let keyBytes = try SecureRandom.data(length: TunnelSettings.obfuscationKeyLength)
-
-        var encodedData = Data(keyBytes)
-        for (i, b) in plainData.enumerated() {
-            let keyChar = keyBytes[i % keyBytes.count]
-            let xorredB = b ^ keyChar
-            
-            encodedData.append(xorredB)
-        }
-        return encodedData
-    }
-}

Podfile

@@ -1,18 +1,18 @@
 source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks!
 
-abstract_target 'PIATunnel' do
+abstract_target 'TunnelKit' do
     pod 'SwiftyBeaver'
     pod 'OpenSSL-Apple', '~> 1.1.0h'
 
-    target 'PIATunnel-iOS' do
+    target 'TunnelKit-iOS' do
         platform :ios, '9.0'
     end
-    target 'PIATunnelHost' do
+    target 'TunnelKitHost' do
         platform :ios, '9.0'
     end
 
-    target 'PIATunnel-macOS' do
+    target 'TunnelKit-macOS' do
         platform :osx, '10.11'
     end
 end

Podfile.lock

@@ -15,6 +15,6 @@ SPEC CHECKSUMS:
   OpenSSL-Apple: cd153d705ef350eb834ae7ff5f21f792b51ed208
   SwiftyBeaver: e45759613e50b522b0e6f53b1f0f14389b45ca34
 
-PODFILE CHECKSUM: d93463e96c0da9f94811327c6e2b123c6453c591
+PODFILE CHECKSUM: db783bdfb06f72df39d3c99df20aafdb51e0f7c6
 
 COCOAPODS: 1.5.3

README.md

@@ -1,12 +1,12 @@
-[![PIA logo][pia-image]][pia-url]
+# TunnelKit
 
-# Private Internet Access
+This library provides a simplified Swift/Obj-C implementation of the OpenVPN® protocol for the Apple platforms. The crypto layer is built on top of [OpenSSL][dep-openssl] 1.1.0h, which in turn enables support for a certain range of encryption and digest algorithms.
 
-Private Internet Access is the world's leading consumer VPN service. At Private Internet Access we believe in unfettered access for all, and as a firm supporter of the open source ecosystem we have made the decision to open source our VPN clients. For more information about the PIA service, please visit our website [privateinternetaccess.com][pia-url] or check out the [Wiki][pia-wiki].
+## Contacts
 
-# Tunnel for Apple platforms
+Twitter: [@keeshux][me-twitter]
 
-This library provides a simplified Swift/Obj-C implementation of the OpenVPN® protocol for the Apple platforms, while also taking advantage of the Private Internet Access [client patch customizations](https://www.privateinternetaccess.com/forum/discussion/9093/pia-openvpn-client-encryption-patch). The crypto layer is built on top of [OpenSSL][dep-openssl] 1.1.0h, which in turn enables support for a certain range of encryption and digest algorithms.
+Website: [davidederosa.com][me-website]
 
 ## Getting started
 
@@ -22,9 +22,6 @@ The client is known to work with [OpenVPN®][openvpn] 2.3+ servers. Key renegoti
     - SHA-1
     - SHA-256
 - [x] TLS CA validation
-    - RSA (2048, 3072 and 4096 bit)
-    - ECC (secp256r1, secp521r1, secp256k1)
-    - Custom certificate
 
 ## Installation
 
@@ -44,20 +41,20 @@ It's highly recommended to use the Git and Ruby packages provided by [Homebrew][
 To use with CocoaPods just add this to your Podfile:
 
 ```ruby
-pod 'PIATunnel'
+pod 'TunnelKit'
 ```
 
 ### Testing
 
 Download the library codebase locally:
 
-    $ git clone https://github.com/pia-foss/tunnel-apple.git
+    $ git clone https://github.com/keeshux/TunnelKit.git
 
 Assuming you have a [working CocoaPods environment][dep-cocoapods], setting up the library workspace only requires installing the pod dependencies:
 
     $ pod install
 
-After that, open `PIATunnel.xcworkspace` in Xcode and run the unit tests found in the `PIATunnelTests` target. A simple CMD+U while on `PIATunnel-iOS` should do that as well.
+After that, open `TunnelKit.xcworkspace` in Xcode and run the unit tests found in the `TunnelKitTests` target. A simple CMD+U while on `TunnelKit-iOS` should do that as well.
 
 #### Demo
 
@@ -74,16 +71,11 @@ For the VPN to work properly, the `BasicTunnel` demo requires:
 
 both in the main app and the tunnel extension target.
 
-In order to test connection to your own server rather than a PIA server, modify the file `Demo/BasicTunnel-[iOS|macOS]/ViewController.swift` and make sure to:
+In order to test connection to your own server, modify the file `Demo/BasicTunnel-[iOS|macOS]/ViewController.swift` and make sure to set `builder.ca` to the PEM encoded certificate of your VPN server's CA (or `nil` if none).
-
-- Replace `.pia` with `.vanilla` in `builder.endpointProtocols`.
-- Set `builder.handshake` to `.custom`.
-- Set `builder.ca` to the PEM formatted certificate of your VPN server's CA.
 
 Example:
 
-    builder.endpointProtocols = [PIATunnelProvider.EndpointProtocol(.udp, 1194, .vanilla)]
+    builder.endpointProtocols = [TunnelKitProvider.EndpointProtocol(.udp, 1194)]
-    builder.handshake = .custom
     builder.ca = """
     -----BEGIN CERTIFICATE-----
     MIIFJDCC...
@@ -112,38 +104,36 @@ The entry point is the `SessionProxy` class. The networking layer is fully abstr
 
 ### AppExtension
 
-The goal of this module is packaging up a black box implementation of a [NEPacketTunnelProvider][ne-ptp], which is the essential part of a Packet Tunnel Provider app extension. You will find the main implementation in the `PIATunnelProvider` class.
+The goal of this module is packaging up a black box implementation of a [NEPacketTunnelProvider][ne-ptp], which is the essential part of a Packet Tunnel Provider app extension. You will find the main implementation in the `TunnelKitProvider` class.
 
 Currently, the extension supports VPN over both [UDP][ne-udp] and [TCP][ne-tcp] sockets. A debug log snapshot is optionally maintained and shared to host apps via `UserDefaults` in a shared App Group.
 
 ## Contributing
 
-By contributing to this project you are agreeing to the terms stated in the Contributor License Agreement (CLA) [here](/CLA.rst).
-
 For more details please see [CONTRIBUTING](/CONTRIBUTING.md).
 
-Issues and Pull Requests should use these templates: [ISSUE](/.github/ISSUE_TEMPLATE.md) and [PULL REQUEST](/.github/PULL_REQUEST_TEMPLATE.md).
-
-## Authors
-
-- Davide De Rosa - [keeshux](https://github.com/keeshux)
-- Steve
-
 ## License
 
-This project is licensed under the [MIT (Expat) license](https://choosealicense.com/licenses/mit/), which can be found [here](/LICENSE).
+This project is licensed under the [GPLv3 license][license-gpl3], which can be found [here](/LICENSE).
 
-## Acknowledgements
+## Credits
 
-- SwiftyBeaver - © 2015 Sebastian Kreutzberger
+- [PIATunnel][dep-piatunnel-repo] - TunnelKit is a hard fork of PIATunnel that repurposes it substantially. PIATunnel is licensed under the [MIT (Expat) license][license-mit], which can be found [here][dep-piatunnel-license].
+- [SwiftyBeaver][dep-swiftybeaver-repo] - A convenient logging library.
 
 This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit. ([https://www.openssl.org/][dep-openssl])
 
 © 2002-2018 OpenVPN Inc. - OpenVPN is a registered trademark of OpenVPN Inc.
 
-[pia-image]: https://www.privateinternetaccess.com/assets/PIALogo2x-0d1e1094ac909ea4c93df06e2da3db4ee8a73d8b2770f0f7d768a8603c62a82f.png
+## Donations
-[pia-url]: https://www.privateinternetaccess.com/
+
-[pia-wiki]: https://en.wikipedia.org/wiki/Private_Internet_Access
+TunnelKit is free software, donations are extremely welcome.
+
+Bitcoin address: [16w2AWamiH2SS68NYSMDcrbh5MnZ1c5eju][me-btc]
+
+[me-twitter]: https://twitter.com/keeshux
+[me-website]: https://davidederosa.com
+[me-btc]: bitcoin:16w2AWamiH2SS68NYSMDcrbh5MnZ1c5eju
 
 [openvpn]: https://openvpn.net/index.php/open-source/overview.html
 [dep-cocoapods]: https://guides.cocoapods.org/using/getting-started.html
@@ -155,3 +145,10 @@ This product includes software developed by the OpenSSL Project for use in the O
 [ne-ptp]: https://developer.apple.com/documentation/networkextension/nepackettunnelprovider
 [ne-udp]: https://developer.apple.com/documentation/networkextension/nwudpsession
 [ne-tcp]: https://developer.apple.com/documentation/networkextension/nwtcpconnection
+
+[license-gpl3]: https://choosealicense.com/licenses/gpl-3.0/
+[license-mit]: https://choosealicense.com/licenses/mit/
+
+[dep-piatunnel-repo]: https://github.com/pia-foss/tunnel-apple
+[dep-piatunnel-license]: https://github.com/pia-foss/tunnel-apple/blob/master/LICENSE
+[dep-swiftybeaver-repo]: https://github.com/SwiftyBeaver/SwiftyBeaver

TunnelKit-macOS/Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

TunnelKit.podspec

@@ -0,0 +1,32 @@
+Pod::Spec.new do |s|
+    s.name              = "TunnelKit"
+    s.version           = "1.0.0"
+    s.summary           = "VPN framework for Apple platforms."
+
+    s.homepage          = "https://github.com/keeshux/TunnelKit"
+    s.license           = { :type => "GPLv3", :file => "LICENSE" }
+    s.author            = { "Davide De Rosa" => "keeshux@gmail.com" }
+    s.source            = { :git => "https://github.com/keeshux/TunnelKit.git", :tag => "v#{s.version}" }
+
+    s.ios.deployment_target = "9.0"
+    s.osx.deployment_target = "10.11"
+
+    s.subspec "Core" do |p|
+        p.source_files          = "TunnelKit/Sources/Core/**/*.{h,m,swift}"
+        p.private_header_files  = "TunnelKit/Sources/Core/**/*.h"
+        p.preserve_paths        = "TunnelKit/Sources/Core/*.modulemap"
+        p.pod_target_xcconfig   = { "SWIFT_INCLUDE_PATHS" => "${PODS_TARGET_SRCROOT}/TunnelKit/Sources/Core",
+                                    "APPLICATION_EXTENSION_API_ONLY" => "YES" }
+        p.dependency "SwiftyBeaver"
+        p.dependency "OpenSSL-Apple", "~> 1.1.0h"
+    end
+
+    s.subspec "AppExtension" do |p|
+        p.source_files          = "TunnelKit/Sources/AppExtension/**/*.swift"
+        p.frameworks            = "NetworkExtension"
+        p.pod_target_xcconfig   = { "APPLICATION_EXTENSION_API_ONLY" => "YES" }
+
+        p.dependency "TunnelKit/Core"
+        p.dependency "SwiftyBeaver"
+    end
+end

TunnelKit.xcodeproj/project.pbxproj

@@ -19,7 +19,7 @@
 		0E07597F20F0060E00F38FD8 /* CryptoAEAD.h in Headers */ = {isa = PBXBuildFile; fileRef = 0E07597C20F0060E00F38FD8 /* CryptoAEAD.h */; };
 		0E07598020F0060E00F38FD8 /* CryptoAEAD.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E07597D20F0060E00F38FD8 /* CryptoAEAD.m */; };
 		0E07598120F0060E00F38FD8 /* CryptoAEAD.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E07597D20F0060E00F38FD8 /* CryptoAEAD.m */; };
-		0E11089F1F77B9E800A92462 /* PIATunnel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E17D7F91F730D9F009EE129 /* PIATunnel.framework */; };
+		0E11089F1F77B9E800A92462 /* TunnelKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E17D7F91F730D9F009EE129 /* TunnelKit.framework */; };
 		0E1108AC1F77B9F900A92462 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E1108AB1F77B9F900A92462 /* AppDelegate.swift */; };
 		0E1108AE1F77B9F900A92462 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E1108AD1F77B9F900A92462 /* ViewController.swift */; };
 		0E1108B11F77B9F900A92462 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0E1108AF1F77B9F900A92462 /* Main.storyboard */; };
@@ -28,7 +28,7 @@
 		0E3E0F212108A8CC00B371C1 /* PushReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E3E0F202108A8CC00B371C1 /* PushReply.swift */; };
 		0E3E0F222108A8CC00B371C1 /* PushReply.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E3E0F202108A8CC00B371C1 /* PushReply.swift */; };
 		0E85A25A202CC5AF0059E9F9 /* AppExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E85A259202CC5AE0059E9F9 /* AppExtensionTests.swift */; };
-		0E9379C91F819A4300CE91B6 /* PIATunnel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E17D7F91F730D9F009EE129 /* PIATunnel.framework */; };
+		0E9379C91F819A4300CE91B6 /* TunnelKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E17D7F91F730D9F009EE129 /* TunnelKit.framework */; };
 		0EA8E2072024D4B200A92DB6 /* PIA-ECC-256k1.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0EA8E2042024D4B100A92DB6 /* PIA-ECC-256k1.pem */; };
 		0EA8E2082024D4B200A92DB6 /* PIA-ECC-256r1.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0EA8E2052024D4B100A92DB6 /* PIA-ECC-256r1.pem */; };
 		0EA8E2092024D4B200A92DB6 /* PIA-ECC-521r1.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0EA8E2062024D4B200A92DB6 /* PIA-ECC-521r1.pem */; };
@@ -38,10 +38,6 @@
 		0EA8E20D2024D5D500A92DB6 /* PIA-RSA-2048.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0EFEB4822006D3D000F81029 /* PIA-RSA-2048.pem */; };
 		0EA8E20E2024D5D500A92DB6 /* PIA-RSA-3072.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0EFEB4802006D3D000F81029 /* PIA-RSA-3072.pem */; };
 		0EA8E20F2024D5D500A92DB6 /* PIA-RSA-4096.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0EFEB4812006D3D000F81029 /* PIA-RSA-4096.pem */; };
-		0EAAD70920E4F2BC0088754A /* CommunicationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EAAD70820E4F2BC0088754A /* CommunicationType.swift */; };
-		0EAAD70A20E4F2BC0088754A /* CommunicationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EAAD70820E4F2BC0088754A /* CommunicationType.swift */; };
-		0EAAD70C20E4F85A0088754A /* LinkInterface+Strategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EAAD70B20E4F85A0088754A /* LinkInterface+Strategy.swift */; };
-		0EAAD70D20E4F85A0088754A /* LinkInterface+Strategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EAAD70B20E4F85A0088754A /* LinkInterface+Strategy.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 */; };
@@ -66,6 +62,8 @@
 		0EC1BBA620D712DE007C4C7B /* DNSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EC1BBA420D71190007C4C7B /* DNSResolver.swift */; };
 		0EC1BBA820D7D803007C4C7B /* ConnectionStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EC1BBA720D7D803007C4C7B /* ConnectionStrategy.swift */; };
 		0EC1BBA920D7D803007C4C7B /* ConnectionStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EC1BBA720D7D803007C4C7B /* ConnectionStrategy.swift */; };
+		0ECE3528212EB7770040F253 /* Certificate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ECE3527212EB7770040F253 /* Certificate.swift */; };
+		0ECE352A212EB88E0040F253 /* Certificate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0ECE3527212EB7770040F253 /* Certificate.swift */; };
 		0EE7A79520F61EDC00B42E6A /* PacketMacros.h in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7A79420F61EDC00B42E6A /* PacketMacros.h */; };
 		0EE7A79620F61EDC00B42E6A /* PacketMacros.h in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7A79420F61EDC00B42E6A /* PacketMacros.h */; };
 		0EE7A79820F6296F00B42E6A /* PacketMacros.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7A79720F6296F00B42E6A /* PacketMacros.m */; };
@@ -105,21 +103,20 @@
 		0EFEB46E2006D3C800F81029 /* TLSBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 0EFEB4442006D3C800F81029 /* TLSBox.h */; };
 		0EFEB46F2006D3C800F81029 /* IOInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4452006D3C800F81029 /* IOInterface.swift */; };
 		0EFEB4702006D3C800F81029 /* Allocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4462006D3C800F81029 /* Allocation.m */; };
-		0EFEB4712006D3C800F81029 /* TunnelSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4472006D3C800F81029 /* TunnelSettings.swift */; };
 		0EFEB4722006D3C800F81029 /* ReplayProtector.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4482006D3C800F81029 /* ReplayProtector.m */; };
 		0EFEB4732006D3C800F81029 /* LinkInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4492006D3C800F81029 /* LinkInterface.swift */; };
 		0EFEB4742006D3C800F81029 /* CoreConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44A2006D3C800F81029 /* CoreConfiguration.swift */; };
 		0EFEB4752006D3C800F81029 /* Errors.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44B2006D3C800F81029 /* Errors.m */; };
 		0EFEB4762006D3C800F81029 /* DataPath.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44C2006D3C800F81029 /* DataPath.m */; };
-		0EFEB4782006D3C800F81029 /* PIATunnelProvider+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44F2006D3C800F81029 /* PIATunnelProvider+Configuration.swift */; };
+		0EFEB4782006D3C800F81029 /* TunnelKitProvider+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44F2006D3C800F81029 /* TunnelKitProvider+Configuration.swift */; };
-		0EFEB4792006D3C800F81029 /* PIATunnelProvider+Interaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4502006D3C800F81029 /* PIATunnelProvider+Interaction.swift */; };
+		0EFEB4792006D3C800F81029 /* TunnelKitProvider+Interaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4502006D3C800F81029 /* TunnelKitProvider+Interaction.swift */; };
-		0EFEB47B2006D3C800F81029 /* PIATunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4522006D3C800F81029 /* PIATunnelProvider.swift */; };
+		0EFEB47B2006D3C800F81029 /* TunnelKitProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4522006D3C800F81029 /* TunnelKitProvider.swift */; };
 		0EFEB4832006D3D000F81029 /* PIA-RSA-3072.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0EFEB4802006D3D000F81029 /* PIA-RSA-3072.pem */; };
 		0EFEB4842006D3D000F81029 /* PIA-RSA-4096.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0EFEB4812006D3D000F81029 /* PIA-RSA-4096.pem */; };
 		0EFEB4852006D3D000F81029 /* PIA-RSA-2048.pem in Resources */ = {isa = PBXBuildFile; fileRef = 0EFEB4822006D3D000F81029 /* PIA-RSA-2048.pem */; };
-		0EFEB4872006D7C400F81029 /* PIATunnelProvider+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44F2006D3C800F81029 /* PIATunnelProvider+Configuration.swift */; };
+		0EFEB4872006D7C400F81029 /* TunnelKitProvider+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44F2006D3C800F81029 /* TunnelKitProvider+Configuration.swift */; };
-		0EFEB4882006D7C400F81029 /* PIATunnelProvider+Interaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4502006D3C800F81029 /* PIATunnelProvider+Interaction.swift */; };
+		0EFEB4882006D7C400F81029 /* TunnelKitProvider+Interaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4502006D3C800F81029 /* TunnelKitProvider+Interaction.swift */; };
-		0EFEB48A2006D7C400F81029 /* PIATunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4522006D3C800F81029 /* PIATunnelProvider.swift */; };
+		0EFEB48A2006D7C400F81029 /* TunnelKitProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4522006D3C800F81029 /* TunnelKitProvider.swift */; };
 		0EFEB48D2006D7F300F81029 /* EncryptionProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42A2006D3C800F81029 /* EncryptionProxy.swift */; };
 		0EFEB48E2006D7F300F81029 /* SessionKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42B2006D3C800F81029 /* SessionKey.swift */; };
 		0EFEB4902006D7F300F81029 /* TunnelInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB42F2006D3C800F81029 /* TunnelInterface.swift */; };
@@ -136,7 +133,6 @@
 		0EFEB49C2006D7F300F81029 /* Data+Manipulation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4432006D3C800F81029 /* Data+Manipulation.swift */; };
 		0EFEB49D2006D7F300F81029 /* IOInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4452006D3C800F81029 /* IOInterface.swift */; };
 		0EFEB49E2006D7F300F81029 /* Allocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4462006D3C800F81029 /* Allocation.m */; };
-		0EFEB49F2006D7F300F81029 /* TunnelSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4472006D3C800F81029 /* TunnelSettings.swift */; };
 		0EFEB4A02006D7F300F81029 /* ReplayProtector.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4482006D3C800F81029 /* ReplayProtector.m */; };
 		0EFEB4A12006D7F300F81029 /* LinkInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4492006D3C800F81029 /* LinkInterface.swift */; };
 		0EFEB4A22006D7F300F81029 /* CoreConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB44A2006D3C800F81029 /* CoreConfiguration.swift */; };
@@ -148,9 +144,9 @@
 		0EFEB4AF2007627700F81029 /* InterfaceObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4AA200760EC00F81029 /* InterfaceObserver.swift */; };
 		0EFEB4B02007627700F81029 /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4AD2007625E00F81029 /* Keychain.swift */; };
 		0EFEB4B12007627700F81029 /* MemoryDestination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EFEB4A9200760EB00F81029 /* MemoryDestination.swift */; };
-		7824F3587AB5DCEE2EC390DB /* Pods_PIATunnel_PIATunnelHost.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EA91073AAC5BE66714244D3 /* Pods_PIATunnel_PIATunnelHost.framework */; };
+		205A79DD5EDF645063CDBC16 /* Pods_TunnelKit_TunnelKit_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73F2594DBE84DB9DCF22DCE8 /* Pods_TunnelKit_TunnelKit_iOS.framework */; };
-		82BA0AEEFB1911C6CF99E721 /* Pods_PIATunnel_PIATunnel_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C017D38784E2EBDA13B546A9 /* Pods_PIATunnel_PIATunnel_macOS.framework */; };
+		78CA21E0B83D03BFD7FC2E03 /* Pods_TunnelKit_TunnelKit_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E0A783BE29E5C5654FE2F58D /* Pods_TunnelKit_TunnelKit_macOS.framework */; };
-		FBDC1B556E0886795C1FCAF6 /* Pods_PIATunnel_PIATunnel_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47F39D305605C29A803DF509 /* Pods_PIATunnel_PIATunnel_iOS.framework */; };
+		C1CBB3B61F20AD9CE46CA754 /* Pods_TunnelKit_TunnelKitHost.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 875A5271D7B3E0AAAE5C1816 /* Pods_TunnelKit_TunnelKitHost.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -184,26 +180,25 @@
 		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>"; };
-		0E11089A1F77B9E800A92462 /* PIATunnelTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PIATunnelTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		0E11089A1F77B9E800A92462 /* TunnelKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TunnelKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		0E11089E1F77B9E800A92462 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		0E1108A91F77B9F900A92462 /* PIATunnelHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PIATunnelHost.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		0E1108A91F77B9F900A92462 /* TunnelKitHost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TunnelKitHost.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		0E1108AB1F77B9F900A92462 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		0E1108AD1F77B9F900A92462 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
 		0E1108B01F77B9F900A92462 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		0E1108B21F77B9F900A92462 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		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>"; };
-		0E17D7F91F730D9F009EE129 /* PIATunnel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PIATunnel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		0E17D7F91F730D9F009EE129 /* TunnelKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TunnelKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		0E17D7FD1F730D9F009EE129 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		0E3251C51F95770D00C108D9 /* TunnelKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TunnelKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		0E3251C51F95770D00C108D9 /* PIATunnel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PIATunnel.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0E3E0F202108A8CC00B371C1 /* PushReply.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushReply.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>"; };
 		0E85A259202CC5AE0059E9F9 /* AppExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppExtensionTests.swift; sourceTree = "<group>"; };
-		0E85A25B202CCA3D0059E9F9 /* PIATunnelHost.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PIATunnelHost.entitlements; sourceTree = "<group>"; };
+		0E85A25B202CCA3D0059E9F9 /* TunnelKitHost.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = TunnelKitHost.entitlements; sourceTree = "<group>"; };
 		0EA8E2042024D4B100A92DB6 /* PIA-ECC-256k1.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "PIA-ECC-256k1.pem"; sourceTree = "<group>"; };
 		0EA8E2052024D4B100A92DB6 /* PIA-ECC-256r1.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "PIA-ECC-256r1.pem"; sourceTree = "<group>"; };
 		0EA8E2062024D4B200A92DB6 /* PIA-ECC-521r1.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "PIA-ECC-521r1.pem"; sourceTree = "<group>"; };
-		0EAAD70820E4F2BC0088754A /* CommunicationType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunicationType.swift; sourceTree = "<group>"; };
-		0EAAD70B20E4F85A0088754A /* LinkInterface+Strategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "LinkInterface+Strategy.swift"; 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>"; };
@@ -220,6 +215,7 @@
 		0EBBF2FF2085196000E36B40 /* NWTCPConnectionState+Description.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NWTCPConnectionState+Description.swift"; sourceTree = "<group>"; };
 		0EC1BBA420D71190007C4C7B /* DNSResolver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DNSResolver.swift; sourceTree = "<group>"; };
 		0EC1BBA720D7D803007C4C7B /* ConnectionStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionStrategy.swift; sourceTree = "<group>"; };
+		0ECE3527212EB7770040F253 /* Certificate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Certificate.swift; sourceTree = "<group>"; };
 		0EE7A79420F61EDC00B42E6A /* PacketMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PacketMacros.h; sourceTree = "<group>"; };
 		0EE7A79720F6296F00B42E6A /* PacketMacros.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PacketMacros.m; sourceTree = "<group>"; };
 		0EE7A79D20F6488400B42E6A /* DataPathEncryption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DataPathEncryption.h; sourceTree = "<group>"; };
@@ -250,30 +246,29 @@
 		0EFEB4442006D3C800F81029 /* TLSBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TLSBox.h; sourceTree = "<group>"; };
 		0EFEB4452006D3C800F81029 /* IOInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IOInterface.swift; sourceTree = "<group>"; };
 		0EFEB4462006D3C800F81029 /* Allocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Allocation.m; sourceTree = "<group>"; };
-		0EFEB4472006D3C800F81029 /* TunnelSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TunnelSettings.swift; sourceTree = "<group>"; };
 		0EFEB4482006D3C800F81029 /* ReplayProtector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReplayProtector.m; sourceTree = "<group>"; };
 		0EFEB4492006D3C800F81029 /* LinkInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LinkInterface.swift; sourceTree = "<group>"; };
 		0EFEB44A2006D3C800F81029 /* CoreConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoreConfiguration.swift; sourceTree = "<group>"; };
 		0EFEB44B2006D3C800F81029 /* Errors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Errors.m; sourceTree = "<group>"; };
 		0EFEB44C2006D3C800F81029 /* DataPath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataPath.m; sourceTree = "<group>"; };
-		0EFEB44F2006D3C800F81029 /* PIATunnelProvider+Configuration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "PIATunnelProvider+Configuration.swift"; sourceTree = "<group>"; };
+		0EFEB44F2006D3C800F81029 /* TunnelKitProvider+Configuration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TunnelKitProvider+Configuration.swift"; sourceTree = "<group>"; };
-		0EFEB4502006D3C800F81029 /* PIATunnelProvider+Interaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "PIATunnelProvider+Interaction.swift"; sourceTree = "<group>"; };
+		0EFEB4502006D3C800F81029 /* TunnelKitProvider+Interaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "TunnelKitProvider+Interaction.swift"; sourceTree = "<group>"; };
-		0EFEB4522006D3C800F81029 /* PIATunnelProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PIATunnelProvider.swift; sourceTree = "<group>"; };
+		0EFEB4522006D3C800F81029 /* TunnelKitProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TunnelKitProvider.swift; sourceTree = "<group>"; };
 		0EFEB4802006D3D000F81029 /* PIA-RSA-3072.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "PIA-RSA-3072.pem"; sourceTree = "<group>"; };
 		0EFEB4812006D3D000F81029 /* PIA-RSA-4096.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "PIA-RSA-4096.pem"; sourceTree = "<group>"; };
 		0EFEB4822006D3D000F81029 /* PIA-RSA-2048.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "PIA-RSA-2048.pem"; sourceTree = "<group>"; };
 		0EFEB4A9200760EB00F81029 /* MemoryDestination.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MemoryDestination.swift; sourceTree = "<group>"; };
 		0EFEB4AA200760EC00F81029 /* InterfaceObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InterfaceObserver.swift; sourceTree = "<group>"; };
 		0EFEB4AD2007625E00F81029 /* Keychain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Keychain.swift; sourceTree = "<group>"; };
-		2EA91073AAC5BE66714244D3 /* Pods_PIATunnel_PIATunnelHost.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PIATunnel_PIATunnelHost.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		73F2594DBE84DB9DCF22DCE8 /* Pods_TunnelKit_TunnelKit_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TunnelKit_TunnelKit_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		47F39D305605C29A803DF509 /* Pods_PIATunnel_PIATunnel_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PIATunnel_PIATunnel_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		875A5271D7B3E0AAAE5C1816 /* Pods_TunnelKit_TunnelKitHost.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TunnelKit_TunnelKitHost.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		4EF01042B93805901ADF144F /* Pods-PIATunnel-PIATunnel-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PIATunnel-PIATunnel-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PIATunnel-PIATunnel-iOS/Pods-PIATunnel-PIATunnel-iOS.debug.xcconfig"; sourceTree = "<group>"; };
+		88EE5F29451989D2EDB7FBA6 /* Pods-TunnelKit-TunnelKitHost.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TunnelKit-TunnelKitHost.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost.debug.xcconfig"; sourceTree = "<group>"; };
-		4FCEB45EA990C21162F820EE /* Pods-PIATunnel-PIATunnelHost.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PIATunnel-PIATunnelHost.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PIATunnel-PIATunnelHost/Pods-PIATunnel-PIATunnelHost.debug.xcconfig"; sourceTree = "<group>"; };
+		89BF199CD1F1B6804FB8008E /* Pods-TunnelKit-TunnelKit-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TunnelKit-TunnelKit-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TunnelKit-TunnelKit-iOS/Pods-TunnelKit-TunnelKit-iOS.debug.xcconfig"; sourceTree = "<group>"; };
-		5CCF5EF1B897AB67ECDE05D0 /* Pods-PIATunnel-PIATunnel-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PIATunnel-PIATunnel-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-PIATunnel-PIATunnel-iOS/Pods-PIATunnel-PIATunnel-iOS.release.xcconfig"; sourceTree = "<group>"; };
+		D3B922EA953EA9716301A292 /* Pods-TunnelKit-TunnelKit-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TunnelKit-TunnelKit-macOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-TunnelKit-TunnelKit-macOS/Pods-TunnelKit-TunnelKit-macOS.release.xcconfig"; sourceTree = "<group>"; };
-		889C502914303CDCADF8C2B9 /* Pods-PIATunnel-PIATunnel-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PIATunnel-PIATunnel-macOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-PIATunnel-PIATunnel-macOS/Pods-PIATunnel-PIATunnel-macOS.release.xcconfig"; sourceTree = "<group>"; };
+		D4E677B9AAC8BA7EA19CCDFB /* Pods-TunnelKit-TunnelKit-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TunnelKit-TunnelKit-macOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TunnelKit-TunnelKit-macOS/Pods-TunnelKit-TunnelKit-macOS.debug.xcconfig"; sourceTree = "<group>"; };
-		99F9C9FAEB7F699A60047D42 /* Pods-PIATunnel-PIATunnelHost.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PIATunnel-PIATunnelHost.release.xcconfig"; path = "Pods/Target Support Files/Pods-PIATunnel-PIATunnelHost/Pods-PIATunnel-PIATunnelHost.release.xcconfig"; sourceTree = "<group>"; };
+		DD36CD5917CA219F98EB17C8 /* Pods-TunnelKit-TunnelKitHost.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TunnelKit-TunnelKitHost.release.xcconfig"; path = "Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost.release.xcconfig"; sourceTree = "<group>"; };
-		C017D38784E2EBDA13B546A9 /* Pods_PIATunnel_PIATunnel_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PIATunnel_PIATunnel_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		E0A783BE29E5C5654FE2F58D /* Pods_TunnelKit_TunnelKit_macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TunnelKit_TunnelKit_macOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		D65AFCC4FA1CB9B85E7B1451 /* Pods-PIATunnel-PIATunnel-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PIATunnel-PIATunnel-macOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PIATunnel-PIATunnel-macOS/Pods-PIATunnel-PIATunnel-macOS.debug.xcconfig"; sourceTree = "<group>"; };
+		ED46392C2330B34CA0838A71 /* Pods-TunnelKit-TunnelKit-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TunnelKit-TunnelKit-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-TunnelKit-TunnelKit-iOS/Pods-TunnelKit-TunnelKit-iOS.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -281,7 +276,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0E11089F1F77B9E800A92462 /* PIATunnel.framework in Frameworks */,
+				0E11089F1F77B9E800A92462 /* TunnelKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -289,8 +284,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0E9379C91F819A4300CE91B6 /* PIATunnel.framework in Frameworks */,
+				0E9379C91F819A4300CE91B6 /* TunnelKit.framework in Frameworks */,
-				7824F3587AB5DCEE2EC390DB /* Pods_PIATunnel_PIATunnelHost.framework in Frameworks */,
+				C1CBB3B61F20AD9CE46CA754 /* Pods_TunnelKit_TunnelKitHost.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -298,7 +293,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				FBDC1B556E0886795C1FCAF6 /* Pods_PIATunnel_PIATunnel_iOS.framework in Frameworks */,
+				205A79DD5EDF645063CDBC16 /* Pods_TunnelKit_TunnelKit_iOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -306,14 +301,14 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				82BA0AEEFB1911C6CF99E721 /* Pods_PIATunnel_PIATunnel_macOS.framework in Frameworks */,
+				78CA21E0B83D03BFD7FC2E03 /* Pods_TunnelKit_TunnelKit_macOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		0E11089B1F77B9E800A92462 /* PIATunnelTests */ = {
+		0E11089B1F77B9E800A92462 /* TunnelKitTests */ = {
 			isa = PBXGroup;
 			children = (
 				0E11089E1F77B9E800A92462 /* Info.plist */,
@@ -328,13 +323,13 @@
 				0EB2B45C20F0BF41004233D7 /* RawPerformanceTests.swift */,
 				0EB2B45A20F0BE4C004233D7 /* TestUtils.swift */,
 			);
-			path = PIATunnelTests;
+			path = TunnelKitTests;
 			sourceTree = "<group>";
 		};
-		0E1108AA1F77B9F900A92462 /* PIATunnelHost */ = {
+		0E1108AA1F77B9F900A92462 /* TunnelKitHost */ = {
 			isa = PBXGroup;
 			children = (
-				0E85A25B202CCA3D0059E9F9 /* PIATunnelHost.entitlements */,
+				0E85A25B202CCA3D0059E9F9 /* TunnelKitHost.entitlements */,
 				0E1108AB1F77B9F900A92462 /* AppDelegate.swift */,
 				0E1108AD1F77B9F900A92462 /* ViewController.swift */,
 				0E1108AF1F77B9F900A92462 /* Main.storyboard */,
@@ -342,40 +337,41 @@
 				0E1108B41F77B9F900A92462 /* LaunchScreen.storyboard */,
 				0E1108B71F77B9F900A92462 /* Info.plist */,
 			);
-			path = PIATunnelHost;
+			path = TunnelKitHost;
 			sourceTree = "<group>";
 		};
 		0E17D7EF1F730D9F009EE129 = {
 			isa = PBXGroup;
 			children = (
-				0E17D7FB1F730D9F009EE129 /* PIATunnel */,
+				0E17D7FB1F730D9F009EE129 /* TunnelKit */,
-				0E11089B1F77B9E800A92462 /* PIATunnelTests */,
+				0E6479DC212EAC96008E6888 /* TunnelKit-iOS */,
-				0E1108AA1F77B9F900A92462 /* PIATunnelHost */,
+				0E6479DE212EAC96008E6888 /* TunnelKit-macOS */,
+				0E11089B1F77B9E800A92462 /* TunnelKitTests */,
+				0E1108AA1F77B9F900A92462 /* TunnelKitHost */,
 				0E17D7FA1F730D9F009EE129 /* Products */,
-				CC09E28B727F735539F4CBE9 /* Pods */,
+				6D72A12EF3BD3F60205E4F36 /* Pods */,
-				8C8D529E2705C98E32A8218E /* Frameworks */,
+				FDD1C536E3EF0E70EFF9396A /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
 		0E17D7FA1F730D9F009EE129 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				0E17D7F91F730D9F009EE129 /* PIATunnel.framework */,
+				0E17D7F91F730D9F009EE129 /* TunnelKit.framework */,
-				0E11089A1F77B9E800A92462 /* PIATunnelTests.xctest */,
+				0E11089A1F77B9E800A92462 /* TunnelKitTests.xctest */,
-				0E1108A91F77B9F900A92462 /* PIATunnelHost.app */,
+				0E1108A91F77B9F900A92462 /* TunnelKitHost.app */,
-				0E3251C51F95770D00C108D9 /* PIATunnel.framework */,
+				0E3251C51F95770D00C108D9 /* TunnelKit.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		0E17D7FB1F730D9F009EE129 /* PIATunnel */ = {
+		0E17D7FB1F730D9F009EE129 /* TunnelKit */ = {
 			isa = PBXGroup;
 			children = (
 				0EFEB47E2006D3D000F81029 /* Resources */,
 				0E17D8041F730DDD009EE129 /* Sources */,
-				0E17D7FD1F730D9F009EE129 /* Info.plist */,
 			);
-			path = PIATunnel;
+			path = TunnelKit;
 			sourceTree = "<group>";
 		};
 		0E17D8041F730DDD009EE129 /* Sources */ = {
@@ -387,10 +383,25 @@
 			path = Sources;
 			sourceTree = "<group>";
 		};
+		0E6479DC212EAC96008E6888 /* TunnelKit-iOS */ = {
+			isa = PBXGroup;
+			children = (
+				0E6479E0212EACD6008E6888 /* Info.plist */,
+			);
+			path = "TunnelKit-iOS";
+			sourceTree = "<group>";
+		};
+		0E6479DE212EAC96008E6888 /* TunnelKit-macOS */ = {
+			isa = PBXGroup;
+			children = (
+				0E6479DD212EAC96008E6888 /* Info.plist */,
+			);
+			path = "TunnelKit-macOS";
+			sourceTree = "<group>";
+		};
 		0EBBF2E32084FDF400E36B40 /* Transport */ = {
 			isa = PBXGroup;
 			children = (
-				0EAAD70B20E4F85A0088754A /* LinkInterface+Strategy.swift */,
 				0EBBF2F92085061600E36B40 /* NETCPInterface.swift */,
 				0EBBF2EB2085055100E36B40 /* NETunnelInterface.swift */,
 				0EBBF2EC2085055100E36B40 /* NEUDPInterface.swift */,
@@ -406,7 +417,6 @@
 				0EFEB42E2006D3C800F81029 /* Allocation.h */,
 				0EFEB4462006D3C800F81029 /* Allocation.m */,
 				0EFEB43A2006D3C800F81029 /* Authenticator.swift */,
-				0EAAD70820E4F2BC0088754A /* CommunicationType.swift */,
 				0EFEB44A2006D3C800F81029 /* CoreConfiguration.swift */,
 				0E07597C20F0060E00F38FD8 /* CryptoAEAD.h */,
 				0E07597D20F0060E00F38FD8 /* CryptoAEAD.m */,
@@ -441,7 +451,6 @@
 				0EFEB4442006D3C800F81029 /* TLSBox.h */,
 				0EFEB4302006D3C800F81029 /* TLSBox.m */,
 				0EFEB42F2006D3C800F81029 /* TunnelInterface.swift */,
-				0EFEB4472006D3C800F81029 /* TunnelSettings.swift */,
 				0EFEB4412006D3C800F81029 /* ZeroingData.h */,
 				0EFEB4312006D3C800F81029 /* ZeroingData.m */,
 				0EFEB43B2006D3C800F81029 /* ZeroingData.swift */,
@@ -453,15 +462,16 @@
 			isa = PBXGroup;
 			children = (
 				0EBBF2E32084FDF400E36B40 /* Transport */,
+				0ECE3527212EB7770040F253 /* Certificate.swift */,
 				0EC1BBA720D7D803007C4C7B /* ConnectionStrategy.swift */,
 				0EC1BBA420D71190007C4C7B /* DNSResolver.swift */,
 				0EBBF2E42084FE6F00E36B40 /* GenericSocket.swift */,
 				0EFEB4AA200760EC00F81029 /* InterfaceObserver.swift */,
 				0EFEB4AD2007625E00F81029 /* Keychain.swift */,
 				0EFEB4A9200760EB00F81029 /* MemoryDestination.swift */,
-				0EFEB4522006D3C800F81029 /* PIATunnelProvider.swift */,
+				0EFEB4522006D3C800F81029 /* TunnelKitProvider.swift */,
-				0EFEB44F2006D3C800F81029 /* PIATunnelProvider+Configuration.swift */,
+				0EFEB44F2006D3C800F81029 /* TunnelKitProvider+Configuration.swift */,
-				0EFEB4502006D3C800F81029 /* PIATunnelProvider+Interaction.swift */,
+				0EFEB4502006D3C800F81029 /* TunnelKitProvider+Interaction.swift */,
 				0EEC49DB20B5E732008FEB91 /* Utils.swift */,
 			);
 			path = AppExtension;
@@ -488,29 +498,29 @@
 			path = AppExtension;
 			sourceTree = "<group>";
 		};
-		8C8D529E2705C98E32A8218E /* Frameworks */ = {
+		6D72A12EF3BD3F60205E4F36 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				47F39D305605C29A803DF509 /* Pods_PIATunnel_PIATunnel_iOS.framework */,
+				89BF199CD1F1B6804FB8008E /* Pods-TunnelKit-TunnelKit-iOS.debug.xcconfig */,
-				C017D38784E2EBDA13B546A9 /* Pods_PIATunnel_PIATunnel_macOS.framework */,
+				ED46392C2330B34CA0838A71 /* Pods-TunnelKit-TunnelKit-iOS.release.xcconfig */,
-				2EA91073AAC5BE66714244D3 /* Pods_PIATunnel_PIATunnelHost.framework */,
+				D4E677B9AAC8BA7EA19CCDFB /* Pods-TunnelKit-TunnelKit-macOS.debug.xcconfig */,
-			);
+				D3B922EA953EA9716301A292 /* Pods-TunnelKit-TunnelKit-macOS.release.xcconfig */,
-			name = Frameworks;
+				88EE5F29451989D2EDB7FBA6 /* Pods-TunnelKit-TunnelKitHost.debug.xcconfig */,
-			sourceTree = "<group>";
+				DD36CD5917CA219F98EB17C8 /* Pods-TunnelKit-TunnelKitHost.release.xcconfig */,
-		};
-		CC09E28B727F735539F4CBE9 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				4EF01042B93805901ADF144F /* Pods-PIATunnel-PIATunnel-iOS.debug.xcconfig */,
-				5CCF5EF1B897AB67ECDE05D0 /* Pods-PIATunnel-PIATunnel-iOS.release.xcconfig */,
-				D65AFCC4FA1CB9B85E7B1451 /* Pods-PIATunnel-PIATunnel-macOS.debug.xcconfig */,
-				889C502914303CDCADF8C2B9 /* Pods-PIATunnel-PIATunnel-macOS.release.xcconfig */,
-				4FCEB45EA990C21162F820EE /* Pods-PIATunnel-PIATunnelHost.debug.xcconfig */,
-				99F9C9FAEB7F699A60047D42 /* Pods-PIATunnel-PIATunnelHost.release.xcconfig */,
 			);
 			name = Pods;
 			sourceTree = "<group>";
 		};
+		FDD1C536E3EF0E70EFF9396A /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				73F2594DBE84DB9DCF22DCE8 /* Pods_TunnelKit_TunnelKit_iOS.framework */,
+				E0A783BE29E5C5654FE2F58D /* Pods_TunnelKit_TunnelKit_macOS.framework */,
+				875A5271D7B3E0AAAE5C1816 /* Pods_TunnelKit_TunnelKitHost.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -555,9 +565,9 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		0E1108991F77B9E800A92462 /* PIATunnelTests */ = {
+		0E1108991F77B9E800A92462 /* TunnelKitTests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 0E1108A41F77B9E800A92462 /* Build configuration list for PBXNativeTarget "PIATunnelTests" */;
+			buildConfigurationList = 0E1108A41F77B9E800A92462 /* Build configuration list for PBXNativeTarget "TunnelKitTests" */;
 			buildPhases = (
 				0E1108961F77B9E800A92462 /* Sources */,
 				0E1108971F77B9E800A92462 /* Frameworks */,
@@ -569,36 +579,36 @@
 				0E1108A11F77B9E800A92462 /* PBXTargetDependency */,
 				0E1108BC1F77BA0200A92462 /* PBXTargetDependency */,
 			);
-			name = PIATunnelTests;
+			name = TunnelKitTests;
 			productName = PIATunnelTests;
-			productReference = 0E11089A1F77B9E800A92462 /* PIATunnelTests.xctest */;
+			productReference = 0E11089A1F77B9E800A92462 /* TunnelKitTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
-		0E1108A81F77B9F900A92462 /* PIATunnelHost */ = {
+		0E1108A81F77B9F900A92462 /* TunnelKitHost */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 0E1108B81F77B9F900A92462 /* Build configuration list for PBXNativeTarget "PIATunnelHost" */;
+			buildConfigurationList = 0E1108B81F77B9F900A92462 /* Build configuration list for PBXNativeTarget "TunnelKitHost" */;
 			buildPhases = (
-				E92F2EA8869D758CA069C089 /* [CP] Check Pods Manifest.lock */,
+				94AA64A70C6BF0AD8E5BA279 /* [CP] Check Pods Manifest.lock */,
 				0E1108A51F77B9F900A92462 /* Sources */,
 				0E1108A61F77B9F900A92462 /* Frameworks */,
 				0E1108A71F77B9F900A92462 /* Resources */,
-				D8CE7C5A74A8E75A0756E08F /* [CP] Embed Pods Frameworks */,
+				B90665BB6148F76EE6C7B876 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				0E9379CB1F819A4600CE91B6 /* PBXTargetDependency */,
 			);
-			name = PIATunnelHost;
+			name = TunnelKitHost;
 			productName = PIATunnelHost;
-			productReference = 0E1108A91F77B9F900A92462 /* PIATunnelHost.app */;
+			productReference = 0E1108A91F77B9F900A92462 /* TunnelKitHost.app */;
 			productType = "com.apple.product-type.application";
 		};
-		0E17D7F81F730D9F009EE129 /* PIATunnel-iOS */ = {
+		0E17D7F81F730D9F009EE129 /* TunnelKit-iOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 0E17D8011F730D9F009EE129 /* Build configuration list for PBXNativeTarget "PIATunnel-iOS" */;
+			buildConfigurationList = 0E17D8011F730D9F009EE129 /* Build configuration list for PBXNativeTarget "TunnelKit-iOS" */;
 			buildPhases = (
-				B81ED2229B05F6217EE28199 /* [CP] Check Pods Manifest.lock */,
+				0CF41397A3ED0F655784A1E9 /* [CP] Check Pods Manifest.lock */,
 				0E17D7F41F730D9F009EE129 /* Sources */,
 				0E17D7F51F730D9F009EE129 /* Frameworks */,
 				0E17D7F61F730D9F009EE129 /* Headers */,
@@ -608,16 +618,16 @@
 			);
 			dependencies = (
 			);
-			name = "PIATunnel-iOS";
+			name = "TunnelKit-iOS";
 			productName = PIATunnel;
-			productReference = 0E17D7F91F730D9F009EE129 /* PIATunnel.framework */;
+			productReference = 0E17D7F91F730D9F009EE129 /* TunnelKit.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		0E3251C41F95770D00C108D9 /* PIATunnel-macOS */ = {
+		0E3251C41F95770D00C108D9 /* TunnelKit-macOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 0E3251CA1F95770D00C108D9 /* Build configuration list for PBXNativeTarget "PIATunnel-macOS" */;
+			buildConfigurationList = 0E3251CA1F95770D00C108D9 /* Build configuration list for PBXNativeTarget "TunnelKit-macOS" */;
 			buildPhases = (
-				5578C17CB1FA354FB3939356 /* [CP] Check Pods Manifest.lock */,
+				B26C9A240EEC9E35A64B6EFA /* [CP] Check Pods Manifest.lock */,
 				0E3251C01F95770D00C108D9 /* Sources */,
 				0E3251C11F95770D00C108D9 /* Frameworks */,
 				0E3251C21F95770D00C108D9 /* Headers */,
@@ -627,9 +637,9 @@
 			);
 			dependencies = (
 			);
-			name = "PIATunnel-macOS";
+			name = "TunnelKit-macOS";
 			productName = "PIATunnel-macOS";
-			productReference = 0E3251C51F95770D00C108D9 /* PIATunnel.framework */;
+			productReference = 0E3251C51F95770D00C108D9 /* TunnelKit.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 /* End PBXNativeTarget section */
@@ -640,7 +650,7 @@
 			attributes = {
 				LastSwiftUpdateCheck = 0900;
 				LastUpgradeCheck = 0930;
-				ORGANIZATIONNAME = "London Trust Media";
+				ORGANIZATIONNAME = "Davide De Rosa";
 				TargetAttributes = {
 					0E1108991F77B9E800A92462 = {
 						CreatedOnToolsVersion = 9.0;
@@ -669,7 +679,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 0E17D7F31F730D9F009EE129 /* Build configuration list for PBXProject "PIATunnel" */;
+			buildConfigurationList = 0E17D7F31F730D9F009EE129 /* Build configuration list for PBXProject "TunnelKit" */;
 			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
@@ -682,10 +692,10 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				0E17D7F81F730D9F009EE129 /* PIATunnel-iOS */,
+				0E17D7F81F730D9F009EE129 /* TunnelKit-iOS */,
-				0E3251C41F95770D00C108D9 /* PIATunnel-macOS */,
+				0E3251C41F95770D00C108D9 /* TunnelKit-macOS */,
-				0E1108991F77B9E800A92462 /* PIATunnelTests */,
+				0E1108991F77B9E800A92462 /* TunnelKitTests */,
-				0E1108A81F77B9F900A92462 /* PIATunnelHost */,
+				0E1108A81F77B9F900A92462 /* TunnelKitHost */,
 			);
 		};
 /* End PBXProject section */
@@ -737,78 +747,94 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		5578C17CB1FA354FB3939356 /* [CP] Check Pods Manifest.lock */ = {
+		0CF41397A3ED0F655784A1E9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
 				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
 				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-PIATunnel-PIATunnel-macOS-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-TunnelKit-TunnelKit-iOS-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		B81ED2229B05F6217EE28199 /* [CP] Check Pods Manifest.lock */ = {
+		94AA64A70C6BF0AD8E5BA279 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
 				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
 				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-PIATunnel-PIATunnel-iOS-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-TunnelKit-TunnelKitHost-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D8CE7C5A74A8E75A0756E08F /* [CP] Embed Pods Frameworks */ = {
+		B26C9A240EEC9E35A64B6EFA /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-PIATunnel-PIATunnelHost/Pods-PIATunnel-PIATunnelHost-frameworks.sh",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-TunnelKit-TunnelKit-macOS-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		B90665BB6148F76EE6C7B876 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh",
 				"${PODS_ROOT}/OpenSSL-Apple/frameworks/iPhone/openssl.framework",
 				"${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+			);
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PIATunnel-PIATunnelHost/Pods-PIATunnel-PIATunnelHost-frameworks.sh\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		E92F2EA8869D758CA069C089 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-PIATunnel-PIATunnelHost-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -845,13 +871,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				0EBBF2F5208505D700E36B40 /* NETunnelInterface.swift in Sources */,
-				0EAAD70920E4F2BC0088754A /* CommunicationType.swift in Sources */,
 				0EFEB4732006D3C800F81029 /* LinkInterface.swift in Sources */,
 				0EBBF2F8208505DD00E36B40 /* NWUDPSessionState+Description.swift in Sources */,
 				0EFEB4652006D3C800F81029 /* Authenticator.swift in Sources */,
 				0EE7A79820F6296F00B42E6A /* PacketMacros.m in Sources */,
 				0EEC49DC20B5E732008FEB91 /* Utils.swift in Sources */,
-				0EAAD70C20E4F85A0088754A /* LinkInterface+Strategy.swift in Sources */,
 				0EFEB4562006D3C800F81029 /* SessionKey.swift in Sources */,
 				0EC1BBA520D71190007C4C7B /* DNSResolver.swift in Sources */,
 				0EFEB4AB200760EC00F81029 /* MemoryDestination.swift in Sources */,
@@ -866,7 +890,8 @@
 				0EFEB4632006D3C800F81029 /* ProtocolMacros.swift in Sources */,
 				0EFEB4AC200760EC00F81029 /* InterfaceObserver.swift in Sources */,
 				0EFEB46D2006D3C800F81029 /* Data+Manipulation.swift in Sources */,
-				0EFEB47B2006D3C800F81029 /* PIATunnelProvider.swift in Sources */,
+				0EFEB47B2006D3C800F81029 /* TunnelKitProvider.swift in Sources */,
+				0ECE3528212EB7770040F253 /* Certificate.swift in Sources */,
 				0EFEB4742006D3C800F81029 /* CoreConfiguration.swift in Sources */,
 				0E07595F20EF6D1400F38FD8 /* CryptoCBC.m in Sources */,
 				0EC1BBA820D7D803007C4C7B /* ConnectionStrategy.swift in Sources */,
@@ -876,12 +901,11 @@
 				0EBBF2F3208505D300E36B40 /* NEUDPInterface.swift in Sources */,
 				0EFEB4682006D3C800F81029 /* MSS.m in Sources */,
 				0EFEB45B2006D3C800F81029 /* TLSBox.m in Sources */,
-				0EFEB4792006D3C800F81029 /* PIATunnelProvider+Interaction.swift in Sources */,
+				0EFEB4792006D3C800F81029 /* TunnelKitProvider+Interaction.swift in Sources */,
 				0EFEB4702006D3C800F81029 /* Allocation.m in Sources */,
 				0EFEB4672006D3C800F81029 /* SessionProxy.swift in Sources */,
 				0EFEB4722006D3C800F81029 /* ReplayProtector.m in Sources */,
-				0EFEB4712006D3C800F81029 /* TunnelSettings.swift in Sources */,
+				0EFEB4782006D3C800F81029 /* TunnelKitProvider+Configuration.swift in Sources */,
-				0EFEB4782006D3C800F81029 /* PIATunnelProvider+Configuration.swift in Sources */,
 				0E3E0F212108A8CC00B371C1 /* PushReply.swift in Sources */,
 				0EFEB4752006D3C800F81029 /* Errors.m in Sources */,
 				0EBBF2E52084FE6F00E36B40 /* GenericSocket.swift in Sources */,
@@ -896,14 +920,12 @@
 			buildActionMask = 2147483647;
 			files = (
 				0EBBF2F6208505D700E36B40 /* NETunnelInterface.swift in Sources */,
-				0EAAD70A20E4F2BC0088754A /* CommunicationType.swift in Sources */,
 				0EFEB4A12006D7F300F81029 /* LinkInterface.swift in Sources */,
-				0EFEB4872006D7C400F81029 /* PIATunnelProvider+Configuration.swift in Sources */,
+				0EFEB4872006D7C400F81029 /* TunnelKitProvider+Configuration.swift in Sources */,
 				0EBBF2F7208505DD00E36B40 /* NWUDPSessionState+Description.swift in Sources */,
-				0EFEB4882006D7C400F81029 /* PIATunnelProvider+Interaction.swift in Sources */,
+				0EFEB4882006D7C400F81029 /* TunnelKitProvider+Interaction.swift in Sources */,
 				0EE7A79920F6296F00B42E6A /* PacketMacros.m in Sources */,
 				0EEC49DD20B5E732008FEB91 /* Utils.swift in Sources */,
-				0EAAD70D20E4F85A0088754A /* LinkInterface+Strategy.swift in Sources */,
 				0EFEB4B12007627700F81029 /* MemoryDestination.swift in Sources */,
 				0EC1BBA620D712DE007C4C7B /* DNSResolver.swift in Sources */,
 				0EFEB4A02006D7F300F81029 /* ReplayProtector.m in Sources */,
@@ -911,13 +933,14 @@
 				0EBBF3012085196000E36B40 /* NWTCPConnectionState+Description.swift in Sources */,
 				0EFEB4962006D7F300F81029 /* ProtocolMacros.swift in Sources */,
 				0EE7A79620F61EDC00B42E6A /* PacketMacros.h in Sources */,
-				0EFEB48A2006D7C400F81029 /* PIATunnelProvider.swift in Sources */,
+				0EFEB48A2006D7C400F81029 /* TunnelKitProvider.swift in Sources */,
 				0EBBF2FB2085061600E36B40 /* NETCPInterface.swift in Sources */,
 				0EFEB4982006D7F300F81029 /* ZeroingData.swift in Sources */,
 				0EFEB4A32006D7F300F81029 /* Errors.m in Sources */,
 				0EFEB4A22006D7F300F81029 /* CoreConfiguration.swift in Sources */,
 				0EFEB4952006D7F300F81029 /* SecureRandom.swift in Sources */,
 				0EFEB49A2006D7F300F81029 /* MSS.m in Sources */,
+				0ECE352A212EB88E0040F253 /* Certificate.swift in Sources */,
 				0EFEB48D2006D7F300F81029 /* EncryptionProxy.swift in Sources */,
 				0EFEB4922006D7F300F81029 /* ZeroingData.m in Sources */,
 				0E07596020EF6D1400F38FD8 /* CryptoCBC.m in Sources */,
@@ -937,7 +960,6 @@
 				0EFEB4912006D7F300F81029 /* TLSBox.m in Sources */,
 				0EFEB49D2006D7F300F81029 /* IOInterface.swift in Sources */,
 				0EFEB4972006D7F300F81029 /* Authenticator.swift in Sources */,
-				0EFEB49F2006D7F300F81029 /* TunnelSettings.swift in Sources */,
 				0EFEB49B2006D7F300F81029 /* Packet.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -947,17 +969,17 @@
 /* Begin PBXTargetDependency section */
 		0E1108A11F77B9E800A92462 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 0E17D7F81F730D9F009EE129 /* PIATunnel-iOS */;
+			target = 0E17D7F81F730D9F009EE129 /* TunnelKit-iOS */;
 			targetProxy = 0E1108A01F77B9E800A92462 /* PBXContainerItemProxy */;
 		};
 		0E1108BC1F77BA0200A92462 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 0E1108A81F77B9F900A92462 /* PIATunnelHost */;
+			target = 0E1108A81F77B9F900A92462 /* TunnelKitHost */;
 			targetProxy = 0E1108BB1F77BA0200A92462 /* PBXContainerItemProxy */;
 		};
 		0E9379CB1F819A4600CE91B6 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 0E17D7F81F730D9F009EE129 /* PIATunnel-iOS */;
+			target = 0E17D7F81F730D9F009EE129 /* TunnelKit-iOS */;
 			targetProxy = 0E9379CA1F819A4600CE91B6 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
@@ -987,13 +1009,12 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = DTDYD63ZX9;
-				INFOPLIST_FILE = PIATunnelTests/Info.plist;
+				INFOPLIST_FILE = TunnelKitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnelTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PIATunnelHost.app/PIATunnelHost";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TunnelKitHost.app/TunnelKitHost";
 			};
 			name = Debug;
 		};
@@ -1002,27 +1023,26 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = DTDYD63ZX9;
-				INFOPLIST_FILE = PIATunnelTests/Info.plist;
+				INFOPLIST_FILE = TunnelKitTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnelTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PIATunnelHost.app/PIATunnelHost";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TunnelKitHost.app/TunnelKitHost";
 			};
 			name = Release;
 		};
 		0E1108B91F77B9F900A92462 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4FCEB45EA990C21162F820EE /* Pods-PIATunnel-PIATunnelHost.debug.xcconfig */;
+			baseConfigurationReference = 88EE5F29451989D2EDB7FBA6 /* Pods-TunnelKit-TunnelKitHost.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_ENTITLEMENTS = PIATunnelHost/PIATunnelHost.entitlements;
+				CODE_SIGN_ENTITLEMENTS = TunnelKitHost/TunnelKitHost.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 5357M5NW9W;
+				DEVELOPMENT_TEAM = DTDYD63ZX9;
-				INFOPLIST_FILE = PIATunnelHost/Info.plist;
+				INFOPLIST_FILE = TunnelKitHost/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnelHost;
+				PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.ios.TunnelKitHost;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1030,15 +1050,15 @@
 		};
 		0E1108BA1F77B9F900A92462 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 99F9C9FAEB7F699A60047D42 /* Pods-PIATunnel-PIATunnelHost.release.xcconfig */;
+			baseConfigurationReference = DD36CD5917CA219F98EB17C8 /* Pods-TunnelKit-TunnelKitHost.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_ENTITLEMENTS = PIATunnelHost/PIATunnelHost.entitlements;
+				CODE_SIGN_ENTITLEMENTS = TunnelKitHost/TunnelKitHost.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 5357M5NW9W;
+				DEVELOPMENT_TEAM = DTDYD63ZX9;
-				INFOPLIST_FILE = PIATunnelHost/Info.plist;
+				INFOPLIST_FILE = TunnelKitHost/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnelHost;
+				PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.ios.TunnelKitHost;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -1167,7 +1187,7 @@
 		};
 		0E17D8021F730D9F009EE129 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4EF01042B93805901ADF144F /* Pods-PIATunnel-PIATunnel-iOS.debug.xcconfig */;
+			baseConfigurationReference = 89BF199CD1F1B6804FB8008E /* Pods-TunnelKit-TunnelKit-iOS.debug.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
@@ -1177,20 +1197,20 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
-				INFOPLIST_FILE = PIATunnel/Info.plist;
+				INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-iOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.apple.TunnelKit;
-				PRODUCT_NAME = PIATunnel;
+				PRODUCT_NAME = TunnelKit;
 				SKIP_INSTALL = YES;
-				SWIFT_INCLUDE_PATHS = "$(SRCROOT)/PIATunnel/Sources";
+				SWIFT_INCLUDE_PATHS = "$(SRCROOT)/TunnelKit/Sources";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
 		0E17D8031F730D9F009EE129 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5CCF5EF1B897AB67ECDE05D0 /* Pods-PIATunnel-PIATunnel-iOS.release.xcconfig */;
+			baseConfigurationReference = ED46392C2330B34CA0838A71 /* Pods-TunnelKit-TunnelKit-iOS.release.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
@@ -1200,20 +1220,20 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
-				INFOPLIST_FILE = PIATunnel/Info.plist;
+				INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-iOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.apple.TunnelKit;
-				PRODUCT_NAME = PIATunnel;
+				PRODUCT_NAME = TunnelKit;
 				SKIP_INSTALL = YES;
-				SWIFT_INCLUDE_PATHS = "$(SRCROOT)/PIATunnel/Sources";
+				SWIFT_INCLUDE_PATHS = "$(SRCROOT)/TunnelKit/Sources";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
 		0E3251CB1F95770D00C108D9 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D65AFCC4FA1CB9B85E7B1451 /* Pods-PIATunnel-PIATunnel-macOS.debug.xcconfig */;
+			baseConfigurationReference = D4E677B9AAC8BA7EA19CCDFB /* Pods-TunnelKit-TunnelKit-macOS.debug.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
@@ -1223,20 +1243,20 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = PIATunnel/Info.plist;
+				INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-macOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.apple.TunnelKit;
-				PRODUCT_NAME = PIATunnel;
+				PRODUCT_NAME = TunnelKit;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_INCLUDE_PATHS = "$(SRCROOT)/PIATunnel/Sources";
+				SWIFT_INCLUDE_PATHS = "$(SRCROOT)/TunnelKit/Sources";
 			};
 			name = Debug;
 		};
 		0E3251CC1F95770D00C108D9 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 889C502914303CDCADF8C2B9 /* Pods-PIATunnel-PIATunnel-macOS.release.xcconfig */;
+			baseConfigurationReference = D3B922EA953EA9716301A292 /* Pods-TunnelKit-TunnelKit-macOS.release.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
@@ -1246,21 +1266,21 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
-				INFOPLIST_FILE = PIATunnel/Info.plist;
+				INFOPLIST_FILE = "$(SRCROOT)/TunnelKit-macOS/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.privateinternetaccess.apple.PIATunnel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.algoritmico.apple.TunnelKit;
-				PRODUCT_NAME = PIATunnel;
+				PRODUCT_NAME = TunnelKit;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_INCLUDE_PATHS = "$(SRCROOT)/PIATunnel/Sources";
+				SWIFT_INCLUDE_PATHS = "$(SRCROOT)/TunnelKit/Sources";
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		0E1108A41F77B9E800A92462 /* Build configuration list for PBXNativeTarget "PIATunnelTests" */ = {
+		0E1108A41F77B9E800A92462 /* Build configuration list for PBXNativeTarget "TunnelKitTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				0E1108A21F77B9E800A92462 /* Debug */,
@@ -1269,7 +1289,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		0E1108B81F77B9F900A92462 /* Build configuration list for PBXNativeTarget "PIATunnelHost" */ = {
+		0E1108B81F77B9F900A92462 /* Build configuration list for PBXNativeTarget "TunnelKitHost" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				0E1108B91F77B9F900A92462 /* Debug */,
@@ -1278,7 +1298,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		0E17D7F31F730D9F009EE129 /* Build configuration list for PBXProject "PIATunnel" */ = {
+		0E17D7F31F730D9F009EE129 /* Build configuration list for PBXProject "TunnelKit" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				0E17D7FF1F730D9F009EE129 /* Debug */,
@@ -1287,7 +1307,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		0E17D8011F730D9F009EE129 /* Build configuration list for PBXNativeTarget "PIATunnel-iOS" */ = {
+		0E17D8011F730D9F009EE129 /* Build configuration list for PBXNativeTarget "TunnelKit-iOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				0E17D8021F730D9F009EE129 /* Debug */,
@@ -1296,7 +1316,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		0E3251CA1F95770D00C108D9 /* Build configuration list for PBXNativeTarget "PIATunnel-macOS" */ = {
+		0E3251CA1F95770D00C108D9 /* Build configuration list for PBXNativeTarget "TunnelKit-macOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				0E3251CB1F95770D00C108D9 /* Debug */,

TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKit-iOS.xcscheme

@@ -15,9 +15,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "0E17D7F81F730D9F009EE129"
-               BuildableName = "PIATunnel.framework"
+               BuildableName = "TunnelKit.framework"
-               BlueprintName = "PIATunnel-iOS"
+               BlueprintName = "TunnelKit-iOS"
-               ReferencedContainer = "container:PIATunnel.xcodeproj">
+               ReferencedContainer = "container:TunnelKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -33,9 +33,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "0E1108991F77B9E800A92462"
-               BuildableName = "PIATunnelTests.xctest"
+               BuildableName = "TunnelKitTests.xctest"
-               BlueprintName = "PIATunnelTests"
+               BlueprintName = "TunnelKitTests"
-               ReferencedContainer = "container:PIATunnel.xcodeproj">
+               ReferencedContainer = "container:TunnelKit.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -43,9 +43,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "0E17D7F81F730D9F009EE129"
-            BuildableName = "PIATunnel.framework"
+            BuildableName = "TunnelKit.framework"
-            BlueprintName = "PIATunnel-iOS"
+            BlueprintName = "TunnelKit-iOS"
-            ReferencedContainer = "container:PIATunnel.xcodeproj">
+            ReferencedContainer = "container:TunnelKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -65,9 +65,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "0E17D7F81F730D9F009EE129"
-            BuildableName = "PIATunnel.framework"
+            BuildableName = "TunnelKit.framework"
-            BlueprintName = "PIATunnel-iOS"
+            BlueprintName = "TunnelKit-iOS"
-            ReferencedContainer = "container:PIATunnel.xcodeproj">
+            ReferencedContainer = "container:TunnelKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -83,9 +83,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "0E17D7F81F730D9F009EE129"
-            BuildableName = "PIATunnel.framework"
+            BuildableName = "TunnelKit.framework"
-            BlueprintName = "PIATunnel-iOS"
+            BlueprintName = "TunnelKit-iOS"
-            ReferencedContainer = "container:PIATunnel.xcodeproj">
+            ReferencedContainer = "container:TunnelKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKit-macOS.xcscheme

@@ -15,9 +15,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "0E3251C41F95770D00C108D9"
-               BuildableName = "PIATunnel.framework"
+               BuildableName = "TunnelKit.framework"
-               BlueprintName = "PIATunnel-macOS"
+               BlueprintName = "TunnelKit-macOS"
-               ReferencedContainer = "container:PIATunnel.xcodeproj">
+               ReferencedContainer = "container:TunnelKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -29,6 +29,15 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0E3251C41F95770D00C108D9"
+            BuildableName = "TunnelKit.framework"
+            BlueprintName = "TunnelKit-macOS"
+            ReferencedContainer = "container:TunnelKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
@@ -46,9 +55,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "0E3251C41F95770D00C108D9"
-            BuildableName = "PIATunnel.framework"
+            BuildableName = "TunnelKit.framework"
-            BlueprintName = "PIATunnel-macOS"
+            BlueprintName = "TunnelKit-macOS"
-            ReferencedContainer = "container:PIATunnel.xcodeproj">
+            ReferencedContainer = "container:TunnelKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -64,9 +73,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "0E3251C41F95770D00C108D9"
-            BuildableName = "PIATunnel.framework"
+            BuildableName = "TunnelKit.framework"
-            BlueprintName = "PIATunnel-macOS"
+            BlueprintName = "TunnelKit-macOS"
-            ReferencedContainer = "container:PIATunnel.xcodeproj">
+            ReferencedContainer = "container:TunnelKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

TunnelKit.xcodeproj/xcshareddata/xcschemes/TunnelKitHost.xcscheme

@@ -15,9 +15,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "0E1108A81F77B9F900A92462"
-               BuildableName = "PIATunnelHost.app"
+               BuildableName = "TunnelKitHost.app"
-               BlueprintName = "PIATunnelHost"
+               BlueprintName = "TunnelKitHost"
-               ReferencedContainer = "container:PIATunnel.xcodeproj">
+               ReferencedContainer = "container:TunnelKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -33,9 +33,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "0E1108A81F77B9F900A92462"
-            BuildableName = "PIATunnelHost.app"
+            BuildableName = "TunnelKitHost.app"
-            BlueprintName = "PIATunnelHost"
+            BlueprintName = "TunnelKitHost"
-            ReferencedContainer = "container:PIATunnel.xcodeproj">
+            ReferencedContainer = "container:TunnelKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -56,9 +56,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "0E1108A81F77B9F900A92462"
-            BuildableName = "PIATunnelHost.app"
+            BuildableName = "TunnelKitHost.app"
-            BlueprintName = "PIATunnelHost"
+            BlueprintName = "TunnelKitHost"
-            ReferencedContainer = "container:PIATunnel.xcodeproj">
+            ReferencedContainer = "container:TunnelKit.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
@@ -75,9 +75,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "0E1108A81F77B9F900A92462"
-            BuildableName = "PIATunnelHost.app"
+            BuildableName = "TunnelKitHost.app"
-            BlueprintName = "PIATunnelHost"
+            BlueprintName = "TunnelKitHost"
-            ReferencedContainer = "container:PIATunnel.xcodeproj">
+            ReferencedContainer = "container:TunnelKit.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

TunnelKit.xcworkspace/contents.xcworkspacedata

@@ -2,7 +2,7 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:PIATunnel.xcodeproj">
+      location = "group:TunnelKit.xcodeproj">
    </FileRef>
    <FileRef
       location = "group:Pods/Pods.xcodeproj">

TunnelKit/Sources/AppExtension/Certificate.swift

@@ -0,0 +1,32 @@
+//
+//  Certificate.swift
+//  TunnelKit
+//
+//  Created by Davide De Rosa on 22/08/2018.
+//  Copyright © 2018 Davide De Rosa. All rights reserved.
+//
+
+import Foundation
+
+/// Represents a TLS certificate in PEM format.
+public struct Certificate: Equatable {
+
+    /// The content of the certificates in PEM format (ASCII).
+    public let pem: String
+    
+    /// :nodoc:
+    public init(pem: String) {
+        self.pem = pem
+    }
+    
+    func write(to url: URL) throws {
+        try pem.write(to: url, atomically: true, encoding: .ascii)
+    }
+
+    // MARK: Equatable
+    
+    /// :nodoc:
+    public static func ==(lhs: Certificate, rhs: Certificate) -> Bool {
+        return lhs.pem == rhs.pem
+    }
+}

TunnelKit/Sources/AppExtension/ConnectionStrategy.swift

@@ -1,6 +1,6 @@
 //
 //  ConnectionStrategy.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 6/18/18.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -19,11 +19,11 @@ class ConnectionStrategy {
 
     private var resolvedAddresses: [String]?
     
-    private let endpointProtocols: [PIATunnelProvider.EndpointProtocol]
+    private let endpointProtocols: [TunnelKitProvider.EndpointProtocol]
     
     private var currentProtocolIndex = 0
 
-    init(hostname: String, configuration: PIATunnelProvider.Configuration) {
+    init(hostname: String, configuration: TunnelKitProvider.Configuration) {
         precondition(!configuration.prefersResolvedAddresses || !(configuration.resolvedAddresses?.isEmpty ?? true))
         
         self.hostname = hostname
@@ -70,7 +70,7 @@ class ConnectionStrategy {
 
             guard let targetAddress = self.resolvedAddress(from: addresses) else {
                 log.error("No resolved or fallback address available")
-                completionHandler(nil, PIATunnelProvider.ProviderError.dnsFailure)
+                completionHandler(nil, TunnelKitProvider.ProviderError.dnsFailure)
                 return
             }
 
@@ -90,7 +90,7 @@ class ConnectionStrategy {
         return true
     }
     
-    private func currentProtocol() -> PIATunnelProvider.EndpointProtocol {
+    private func currentProtocol() -> TunnelKitProvider.EndpointProtocol {
         return endpointProtocols[currentProtocolIndex]
     }
 
@@ -111,16 +111,16 @@ class ConnectionStrategy {
 }
 
 private extension NEProvider {
-    func createSocket(to address: String, protocol endpointProtocol: PIATunnelProvider.EndpointProtocol) -> GenericSocket {
+    func createSocket(to address: String, protocol endpointProtocol: TunnelKitProvider.EndpointProtocol) -> GenericSocket {
         let endpoint = NWHostEndpoint(hostname: address, port: "\(endpointProtocol.port)")
         switch endpointProtocol.socketType {
         case .udp:
             let impl = createUDPSession(to: endpoint, from: nil)
-            return NEUDPInterface(impl: impl, communicationType: endpointProtocol.communicationType)
+            return NEUDPInterface(impl: impl)
             
         case .tcp:
             let impl = createTCPConnection(to: endpoint, enableTLS: false, tlsParameters: nil, delegate: nil)
-            return NETCPInterface(impl: impl, communicationType: endpointProtocol.communicationType)
+            return NETCPInterface(impl: impl)
         }
     }
 }

TunnelKit/Sources/AppExtension/DNSResolver.swift

@@ -1,6 +1,6 @@
 //
 //  DNSResolver.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 12/15/17.
 //  Copyright © 2017 London Trust Media. All rights reserved.

TunnelKit/Sources/AppExtension/GenericSocket.swift

@@ -1,6 +1,6 @@
 //
 //  GenericSocket.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 4/16/18.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/AppExtension/InterfaceObserver.swift

@@ -1,6 +1,6 @@
 //
 //  InterfaceObserver.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 6/14/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/AppExtension/Keychain.swift

@@ -1,6 +1,6 @@
 //
 //  Keychain.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/12/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/AppExtension/MemoryDestination.swift

@@ -1,6 +1,6 @@
 //
 //  MemoryDestination.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 7/26/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/AppExtension/Transport/NETCPInterface.swift

@@ -1,6 +1,6 @@
 //
 //  NETCPInterface.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 4/15/18.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -19,9 +19,8 @@ class NETCPInterface: NSObject, GenericSocket, LinkInterface {
     
     private let maxPacketSize: Int
 
-    init(impl: NWTCPConnection, communicationType: CommunicationType, maxPacketSize: Int? = nil) {
+    init(impl: NWTCPConnection, maxPacketSize: Int? = nil) {
         self.impl = impl
-        self.communicationType = communicationType
         self.maxPacketSize = maxPacketSize ?? (512 * 1024)
         isActive = false
         isShutdown = false
@@ -77,7 +76,7 @@ class NETCPInterface: NSObject, GenericSocket, LinkInterface {
         guard impl.hasBetterPath else {
             return nil
         }
-        return NETCPInterface(impl: NWTCPConnection(upgradeFor: impl), communicationType: communicationType)
+        return NETCPInterface(impl: NWTCPConnection(upgradeFor: impl))
     }
     
     func link() -> LinkInterface {
@@ -160,8 +159,6 @@ class NETCPInterface: NSObject, GenericSocket, LinkInterface {
         return maxPacketSize
     }
     
-    let communicationType: CommunicationType
-    
     let negotiationTimeout: TimeInterval = 10.0
     
     let hardResetTimeout: TimeInterval = 5.0

TunnelKit/Sources/AppExtension/Transport/NETunnelInterface.swift

@@ -1,6 +1,6 @@
 //
 //  NETunnelInterface.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 8/27/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/AppExtension/Transport/NEUDPInterface.swift

@@ -1,6 +1,6 @@
 //
 //  NEUDPInterface.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 8/27/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -19,9 +19,8 @@ class NEUDPInterface: NSObject, GenericSocket, LinkInterface {
     
     private let maxDatagrams: Int
 
-    init(impl: NWUDPSession, communicationType: CommunicationType, maxDatagrams: Int? = nil) {
+    init(impl: NWUDPSession, maxDatagrams: Int? = nil) {
         self.impl = impl
-        self.communicationType = communicationType
         self.maxDatagrams = maxDatagrams ?? 200
 
         isActive = false
@@ -76,7 +75,7 @@ class NEUDPInterface: NSObject, GenericSocket, LinkInterface {
         guard impl.hasBetterPath else {
             return nil
         }
-        return NEUDPInterface(impl: NWUDPSession(upgradeFor: impl), communicationType: communicationType)
+        return NEUDPInterface(impl: NWUDPSession(upgradeFor: impl))
     }
     
     func link() -> LinkInterface {
@@ -162,8 +161,6 @@ class NEUDPInterface: NSObject, GenericSocket, LinkInterface {
         return maxDatagrams
     }
 
-    let communicationType: CommunicationType
-    
     let negotiationTimeout: TimeInterval = 10.0
     
     let hardResetTimeout: TimeInterval = 5.0

TunnelKit/Sources/AppExtension/Transport/NWTCPConnectionState+Description.swift

@@ -1,6 +1,6 @@
 //
 //  NWTCPConnectionState+Description.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 4/16/18.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/AppExtension/Transport/NWUDPSessionState+Description.swift

@@ -1,6 +1,6 @@
 //
 //  NWUDPSessionState+Description.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 9/24/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/AppExtension/TunnelKitProvider+Configuration.swift

@@ -1,6 +1,6 @@
 //
-//  PIATunnelProvider+Configuration.swift
+//  TunnelKitProvider+Configuration.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 10/23/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -12,7 +12,7 @@ import SwiftyBeaver
 
 private let log = SwiftyBeaver.self
 
-extension PIATunnelProvider {
+extension TunnelKitProvider {
     
     // MARK: Cryptography
     
@@ -45,67 +45,9 @@ extension PIATunnelProvider {
         /// SHA256 message digest.
         case sha256 = "SHA256"
     }
-    
-    /// The available certificates for handshake.
-    public enum Handshake: String {
-        
-        /// Certificate with RSA 2048-bit key.
-        case rsa2048 = "RSA-2048"
-        
-        /// Certificate with RSA 3072-bit key.
-        case rsa3072 = "RSA-3072"
-
-        /// Certificate with RSA 4096-bit key.
-        case rsa4096 = "RSA-4096"
-        
-        /// Certificate with ECC based on secp256r1 curve.
-        case ecc256r1 = "ECC-256r1"
-        
-        /// Certificate with ECC based on secp256k1 curve.
-        case ecc256k1 = "ECC-256k1"
-
-        /// Certificate with ECC based on secp521r1 curve.
-        case ecc521r1 = "ECC-521r1"
-        
-        /// Custom certificate.
-        ///
-        /// - Seealso:
-        case custom = "Custom"
-        
-        private static let allDigests: [Handshake: String] = [
-            .rsa2048: "e2fccccaba712ccc68449b1c56427ac1",
-            .rsa3072: "2fcdb65712df9db7dae34a1f4a84e32d",
-            .rsa4096: "ec085790314aa0ad4b01dda7b756a932",
-            .ecc256r1: "6f0f23a616479329ce54614f76b52254",
-            .ecc256k1: "80c3b0f34001e4101e34fde9eb1dfa87",
-            .ecc521r1: "82446e0c80706e33e6e793cebf1b0c59"
-        ]
-        
-        var digest: String? {
-            return Handshake.allDigests[self]
-        }
-        
-        func write(to url: URL, custom: String? = nil) throws {
-            precondition((self != .custom) || (custom != nil))
-            
-            // custom certificate?
-            if self == .custom, let content = custom {
-                try content.write(to: url, atomically: true, encoding: .ascii)
-                return
-            }
-
-            let bundle = Bundle(for: PIATunnelProvider.self)
-            let certName = "PIA-\(rawValue)"
-            guard let certUrl = bundle.url(forResource: certName, withExtension: "pem") else {
-                fatalError("Could not find \(certName) TLS certificate")
-            }
-            let content = try String(contentsOf: certUrl)
-            try content.write(to: url, atomically: true, encoding: .ascii)
-        }
-    }
 }
 
-extension PIATunnelProvider {
+extension TunnelKitProvider {
 
     // MARK: Configuration
     
@@ -128,21 +70,17 @@ extension PIATunnelProvider {
         /// The remote port.
         public let port: UInt16
         
-        /// The communication type.
-        public let communicationType: CommunicationType
-
         /// :nodoc:
-        public init(_ socketType: SocketType, _ port: UInt16, _ communicationType: CommunicationType) {
+        public init(_ socketType: SocketType, _ port: UInt16) {
             self.socketType = socketType
             self.port = port
-            self.communicationType = communicationType
         }
         
         // MARK: Equatable
         
         /// :nodoc:
         public static func ==(lhs: EndpointProtocol, rhs: EndpointProtocol) -> Bool {
-            return (lhs.socketType == rhs.socketType) && (lhs.port == rhs.port) && (lhs.communicationType == rhs.communicationType)
+            return (lhs.socketType == rhs.socketType) && (lhs.port == rhs.port)
         }
         
         // MARK: CustomStringConvertible
@@ -192,7 +130,7 @@ extension PIATunnelProvider {
         }
     }
     
-    /// The way to create a `PIATunnelProvider.Configuration` object for the tunnel profile.
+    /// The way to create a `TunnelKitProvider.Configuration` object for the tunnel profile.
     public struct ConfigurationBuilder {
         
         // MARK: App group
@@ -219,16 +157,13 @@ extension PIATunnelProvider {
         /// The message digest algorithm.
         public var digest: Digest
         
-        /// The handshake certificate.
+        /// The optional CA certificate to validate server against. Set to `nil` to disable CA validation (default).
-        public var handshake: Handshake
+        public var ca: Certificate?
-        
-        /// The custom CA certificate in PEM format in case `handshake == .custom`. Ignored otherwise.
-        public var ca: String?
         
         /// The MTU of the tunnel.
         public var mtu: NSNumber
         
-        /// The number of seconds after which a renegotiation is started. Set to `nil` to disable renegotiation.
+        /// The number of seconds after which a renegotiation is started. Set to `nil` to disable renegotiation (default).
         public var renegotiatesAfterSeconds: Int?
         
         // MARK: Debugging
@@ -253,10 +188,9 @@ extension PIATunnelProvider {
             self.appGroup = appGroup
             prefersResolvedAddresses = false
             resolvedAddresses = nil
-            endpointProtocols = [EndpointProtocol(.udp, 1194, .pia)]
+            endpointProtocols = [EndpointProtocol(.udp, 1194)]
             cipher = .aes128cbc
             digest = .sha1
-            handshake = .rsa2048
             ca = nil
             mtu = 1500
             renegotiatesAfterSeconds = nil
@@ -278,20 +212,12 @@ extension PIATunnelProvider {
                 throw ProviderError.configuration(field: "protocolConfiguration.providerConfiguration[\(S.digestAlgorithm)]")
             }
 
-            // fallback to .rsa2048 in < 0.7 configurations (ca/caDigest)
+            let ca: Certificate?
-            let fallbackHandshake: Handshake = .rsa2048
+            if let caPEM = providerConfiguration[S.ca] as? String {
-            var handshake: Handshake = fallbackHandshake
+                ca = Certificate(pem: caPEM)
-            if let handshakeCertificate = providerConfiguration[S.handshakeCertificate] as? String {
+            } else {
-                handshake = Handshake(rawValue: handshakeCertificate) ?? fallbackHandshake
+                ca = nil
             }
-            if handshake == .custom {
-                guard let ca = providerConfiguration[S.ca] as? String else {
-                    throw ProviderError.configuration(field: "protocolConfiguration.providerConfiguration[\(S.ca)]")
-                }
-                self.ca = ca
-            }
-
-            self.appGroup = appGroup
 
             prefersResolvedAddresses = providerConfiguration[S.prefersResolvedAddresses] as? Bool ?? false
             resolvedAddresses = providerConfiguration[S.resolvedAddresses] as? [String]
@@ -300,27 +226,24 @@ extension PIATunnelProvider {
             }
             endpointProtocols = try endpointProtocolsStrings.map {
                 let components = $0.components(separatedBy: ":")
-                guard components.count == 3 else {
+                guard components.count == 2 else {
-                    throw ProviderError.configuration(field: "protocolConfiguration.providerConfiguration[\(S.endpointProtocols)] entries must be in the form 'socketType:port:communicationType'")
+                    throw ProviderError.configuration(field: "protocolConfiguration.providerConfiguration[\(S.endpointProtocols)] entries must be in the form 'socketType:port'")
                 }
                 let socketTypeString = components[0]
                 let portString = components[1]
-                let communicationTypeString = components[2]
                 guard let socketType = SocketType(rawValue: socketTypeString) else {
                     throw ProviderError.configuration(field: "protocolConfiguration.providerConfiguration[\(S.endpointProtocols)] unrecognized socketType '\(socketTypeString)'")
                 }
                 guard let port = UInt16(portString) else {
                     throw ProviderError.configuration(field: "protocolConfiguration.providerConfiguration[\(S.endpointProtocols)] non-numeric port '\(portString)'")
                 }
-                guard let communicationType = CommunicationType(rawValue: communicationTypeString) else {
+                return EndpointProtocol(socketType, port)
-                    throw ProviderError.configuration(field: "protocolConfiguration.providerConfiguration[\(S.endpointProtocols)] unrecognized communicationType '\(communicationTypeString)'")
-                }
-                return EndpointProtocol(socketType, port, communicationType)
             }
             
+            self.appGroup = appGroup
             self.cipher = cipher
             self.digest = digest
-            self.handshake = handshake
+            self.ca = ca
             mtu = providerConfiguration[S.mtu] as? NSNumber ?? 1500
             renegotiatesAfterSeconds = providerConfiguration[S.renegotiatesAfter] as? Int
 
@@ -341,9 +264,9 @@ extension PIATunnelProvider {
         }
         
         /**
-         Builds a `PIATunnelProvider.Configuration` object that will connect to the provided endpoint.
+         Builds a `TunnelKitProvider.Configuration` object that will connect to the provided endpoint.
          
-         - Returns: A `PIATunnelProvider.Configuration` object with this builder and the additional method parameters.
+         - Returns: A `TunnelKitProvider.Configuration` object with this builder and the additional method parameters.
          */
         public func build() -> Configuration {
             return Configuration(
@@ -353,7 +276,6 @@ extension PIATunnelProvider {
                 endpointProtocols: endpointProtocols,
                 cipher: cipher,
                 digest: digest,
-                handshake: handshake,
                 ca: ca,
                 mtu: mtu,
                 renegotiatesAfterSeconds: renegotiatesAfterSeconds,
@@ -364,7 +286,7 @@ extension PIATunnelProvider {
         }
     }
     
-    /// Offers a bridge between the abstract `PIATunnelProvider.ConfigurationBuilder` and a concrete `NETunnelProviderProtocol` profile.
+    /// Offers a bridge between the abstract `TunnelKitProvider.ConfigurationBuilder` and a concrete `NETunnelProviderProtocol` profile.
     public struct Configuration {
         struct Keys {
             static let appGroup = "AppGroup"
@@ -379,8 +301,6 @@ extension PIATunnelProvider {
             
             static let digestAlgorithm = "DigestAlgorithm"
             
-            static let handshakeCertificate = "HandshakeCertificate"
-            
             static let ca = "CA"
             
             static let mtu = "MTU"
@@ -394,43 +314,40 @@ extension PIATunnelProvider {
             static let debugLogFormat = "DebugLogFormat"
         }
         
-        /// - Seealso: `PIATunnelProvider.ConfigurationBuilder.appGroup`
+        /// - Seealso: `TunnelKitProvider.ConfigurationBuilder.appGroup`
         public let appGroup: String
         
-        /// - Seealso: `PIATunnelProvider.ConfigurationBuilder.prefersResolvedAddresses`
+        /// - Seealso: `TunnelKitProvider.ConfigurationBuilder.prefersResolvedAddresses`
         public let prefersResolvedAddresses: Bool
         
-        /// - Seealso: `PIATunnelProvider.ConfigurationBuilder.resolvedAddresses`
+        /// - Seealso: `TunnelKitProvider.ConfigurationBuilder.resolvedAddresses`
         public let resolvedAddresses: [String]?
 
-        /// - Seealso: `PIATunnelProvider.ConfigurationBuilder.endpointProtocols`
+        /// - Seealso: `TunnelKitProvider.ConfigurationBuilder.endpointProtocols`
         public let endpointProtocols: [EndpointProtocol]
         
-        /// - Seealso: `PIATunnelProvider.ConfigurationBuilder.cipher`
+        /// - Seealso: `TunnelKitProvider.ConfigurationBuilder.cipher`
         public let cipher: Cipher
         
-        /// - Seealso: `PIATunnelProvider.ConfigurationBuilder.digest`
+        /// - Seealso: `TunnelKitProvider.ConfigurationBuilder.digest`
         public let digest: Digest
         
-        /// - Seealso: `PIATunnelProvider.ConfigurationBuilder.handshake`
+        /// - Seealso: `TunnelKitProvider.ConfigurationBuilder.ca`
-        public let handshake: Handshake
+        public let ca: Certificate?
         
-        /// - Seealso: `PIATunnelProvider.ConfigurationBuilder.ca`
+        /// - Seealso: `TunnelKitProvider.ConfigurationBuilder.mtu`
-        public let ca: String?
-        
-        /// - Seealso: `PIATunnelProvider.ConfigurationBuilder.mtu`
         public let mtu: NSNumber
         
-        /// - Seealso: `PIATunnelProvider.ConfigurationBuilder.renegotiatesAfterSeconds`
+        /// - Seealso: `TunnelKitProvider.ConfigurationBuilder.renegotiatesAfterSeconds`
         public let renegotiatesAfterSeconds: Int?
         
-        /// - Seealso: `PIATunnelProvider.ConfigurationBuilder.shouldDebug`
+        /// - Seealso: `TunnelKitProvider.ConfigurationBuilder.shouldDebug`
         public let shouldDebug: Bool
         
-        /// - Seealso: `PIATunnelProvider.ConfigurationBuilder.debugLogKey`
+        /// - Seealso: `TunnelKitProvider.ConfigurationBuilder.debugLogKey`
         public let debugLogKey: String?
         
-        /// - Seealso: `PIATunnelProvider.ConfigurationBuilder.debugLogFormat`
+        /// - Seealso: `TunnelKitProvider.ConfigurationBuilder.debugLogFormat`
         public let debugLogFormat: String?
         
         // MARK: Shortcuts
@@ -449,10 +366,10 @@ extension PIATunnelProvider {
         // MARK: API
         
         /**
-         Parses a new `PIATunnelProvider.Configuration` object from a provider configuration map.
+         Parses a new `TunnelKitProvider.Configuration` object from a provider configuration map.
          
          - Parameter from: The map to parse.
-         - Returns: The parsed `PIATunnelProvider.Configuration` object.
+         - Returns: The parsed `TunnelKitProvider.Configuration` object.
          - Throws: `ProviderError.configuration` if `providerConfiguration` is incomplete.
          */
         public static func parsed(from providerConfiguration: [String: Any]) throws -> Configuration {
@@ -472,16 +389,15 @@ extension PIATunnelProvider {
                 S.appGroup: appGroup,
                 S.prefersResolvedAddresses: prefersResolvedAddresses,
                 S.endpointProtocols: endpointProtocols.map {
-                    "\($0.socketType.rawValue):\($0.port):\($0.communicationType.rawValue)"
+                    "\($0.socketType.rawValue):\($0.port)"
                 },
                 S.cipherAlgorithm: cipher.rawValue,
                 S.digestAlgorithm: digest.rawValue,
-                S.handshakeCertificate: handshake.rawValue,
                 S.mtu: mtu,
                 S.debug: shouldDebug
             ]
             if let ca = ca {
-                dict[S.ca] = ca
+                dict[S.ca] = ca.pem
             }
             if let resolvedAddresses = resolvedAddresses {
                 dict[S.resolvedAddresses] = resolvedAddresses
@@ -502,7 +418,7 @@ extension PIATunnelProvider {
          Generates a `NETunnelProviderProtocol` from this configuration.
          
          - Parameter bundleIdentifier: The provider bundle identifier required to locate the tunnel extension.
-         - Parameter endpoint: The `PIATunnelProvider.AuthenticatedEndpoint` the tunnel will connect to.
+         - Parameter endpoint: The `TunnelKitProvider.AuthenticatedEndpoint` the tunnel will connect to.
          - Returns: The generated `NETunnelProviderProtocol` object.
          - Throws: `ProviderError.configuration` if unable to store the `endpoint.password` to the `appGroup` keychain.
          */
@@ -534,7 +450,11 @@ extension PIATunnelProvider {
             log.info("Protocols: \(endpointProtocols)")
             log.info("Cipher: \(cipher.rawValue)")
             log.info("Digest: \(digest.rawValue)")
-            log.info("Handshake: \(handshake.rawValue)")
+            if let _ = ca {
+                log.info("CA verification: enabled")
+            } else {
+                log.info("CA verification: disabled")
+            }
             log.info("MTU: \(mtu)")
             if let renegotiatesAfterSeconds = renegotiatesAfterSeconds {
                 log.info("Renegotiation: \(renegotiatesAfterSeconds) seconds")
@@ -548,19 +468,19 @@ extension PIATunnelProvider {
 
 // MARK: Modification
 
-extension PIATunnelProvider.Configuration: Equatable {
+extension TunnelKitProvider.Configuration: Equatable {
 
     /**
-     Returns a `PIATunnelProvider.ConfigurationBuilder` to use this configuration as a starting point for a new one.
+     Returns a `TunnelKitProvider.ConfigurationBuilder` to use this configuration as a starting point for a new one.
 
-     - Returns: An editable `PIATunnelProvider.ConfigurationBuilder` initialized with this configuration.
+     - Returns: An editable `TunnelKitProvider.ConfigurationBuilder` initialized with this configuration.
      */
-    public func builder() -> PIATunnelProvider.ConfigurationBuilder {
+    public func builder() -> TunnelKitProvider.ConfigurationBuilder {
-        var builder = PIATunnelProvider.ConfigurationBuilder(appGroup: appGroup)
+        var builder = TunnelKitProvider.ConfigurationBuilder(appGroup: appGroup)
         builder.endpointProtocols = endpointProtocols
         builder.cipher = cipher
         builder.digest = digest
-        builder.handshake = handshake
+        builder.ca = ca
         builder.mtu = mtu
         builder.renegotiatesAfterSeconds = renegotiatesAfterSeconds
         builder.shouldDebug = shouldDebug
@@ -569,12 +489,12 @@ extension PIATunnelProvider.Configuration: Equatable {
     }
 
     /// :nodoc:
-    public static func ==(lhs: PIATunnelProvider.Configuration, rhs: PIATunnelProvider.Configuration) -> Bool {
+    public static func ==(lhs: TunnelKitProvider.Configuration, rhs: TunnelKitProvider.Configuration) -> Bool {
         return (
             (lhs.endpointProtocols == rhs.endpointProtocols) &&
             (lhs.cipher == rhs.cipher) &&
             (lhs.digest == rhs.digest) &&
-            (lhs.handshake == rhs.handshake) &&
+            (lhs.ca == rhs.ca) &&
             (lhs.mtu == rhs.mtu) &&
             (lhs.renegotiatesAfterSeconds == rhs.renegotiatesAfterSeconds)
         )

TunnelKit/Sources/AppExtension/TunnelKitProvider+Interaction.swift

@@ -1,6 +1,6 @@
 //
-//  PIATunnelProvider+Interaction.swift
+//  TunnelKitProvider+Interaction.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 9/24/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -8,11 +8,11 @@
 
 import Foundation
 
-extension PIATunnelProvider {
+extension TunnelKitProvider {
 
     // MARK: Interaction
 
-    /// The messages accepted by `PIATunnelProvider`.
+    /// The messages accepted by `TunnelKitProvider`.
     public class Message: Equatable {
         
         /// Requests a snapshot of the latest debug log. Returns the log data decoded from UTF-8.
@@ -42,10 +42,10 @@ extension PIATunnelProvider {
         }
     }
 
-    /// The errors raised by `PIATunnelProvider`.
+    /// The errors raised by `TunnelKitProvider`.
     public enum ProviderError: Error {
 
-        /// The `PIATunnelProvider.Configuration` provided is incorrect or incomplete.
+        /// The `TunnelKitProvider.Configuration` provided is incorrect or incomplete.
         case configuration(field: String)
         
         /// Credentials are missing or protected (e.g. device locked).

TunnelKit/Sources/AppExtension/TunnelKitProvider.swift

@@ -1,6 +1,6 @@
 //
-//  PIATunnelProvider.swift
+//  TunnelKitProvider.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/1/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -15,7 +15,7 @@ private let log = SwiftyBeaver.self
  Provides an all-in-one `NEPacketTunnelProvider` implementation for use in a
  Packet Tunnel Provider extension both on iOS and macOS.
  */
-open class PIATunnelProvider: NEPacketTunnelProvider {
+open class TunnelKitProvider: NEPacketTunnelProvider {
     
     // MARK: Tweaks
     
@@ -49,7 +49,7 @@ open class PIATunnelProvider: NEPacketTunnelProvider {
 
     private let observer = InterfaceObserver()
     
-    private let tunnelQueue = DispatchQueue(label: PIATunnelProvider.description())
+    private let tunnelQueue = DispatchQueue(label: TunnelKitProvider.description())
     
     private let prngSeedLength = 64
     
@@ -139,18 +139,23 @@ open class PIATunnelProvider: NEPacketTunnelProvider {
             return
         }
         
-        do {
+        let caPath: String?
-            try cfg.handshake.write(to: tmpCaURL, custom: cfg.ca)
+        if let ca = cfg.ca {
-        } catch {
+            do {
-            completionHandler(ProviderError.certificateSerialization)
+                try ca.write(to: tmpCaURL)
-            return
+                caPath = tmpCaURL.path
+            } catch {
+                completionHandler(ProviderError.certificateSerialization)
+                return
+            }
+        } else {
+            caPath = nil
         }
 
         cfg.print(appVersion: appVersion)
         
-        let caPath = tmpCaURL.path
 //        log.info("Temporary CA is stored to: \(caPath)")
-        let encryption = SessionProxy.EncryptionParameters(cfg.cipher.rawValue, cfg.digest.rawValue, caPath, cfg.handshake.digest)
+        let encryption = SessionProxy.EncryptionParameters(cfg.cipher.rawValue, cfg.digest.rawValue, caPath)
         let credentials = SessionProxy.Credentials(endpoint.username, endpoint.password)
         
         let proxy: SessionProxy
@@ -305,7 +310,7 @@ open class PIATunnelProvider: NEPacketTunnelProvider {
     }
 }
 
-extension PIATunnelProvider: GenericSocketDelegate {
+extension TunnelKitProvider: GenericSocketDelegate {
     
     // MARK: GenericSocketDelegate (tunnel queue)
     
@@ -380,7 +385,7 @@ extension PIATunnelProvider: GenericSocketDelegate {
     }
 }
 
-extension PIATunnelProvider: SessionProxyDelegate {
+extension TunnelKitProvider: SessionProxyDelegate {
     
     // MARK: SessionProxyDelegate (tunnel queue)
     
@@ -444,7 +449,7 @@ extension PIATunnelProvider: SessionProxyDelegate {
     }
 }
 
-extension PIATunnelProvider {
+extension TunnelKitProvider {
     
     // MARK: Helpers
     

TunnelKit/Sources/AppExtension/Utils.swift

@@ -1,6 +1,6 @@
 //
 //  Utils.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 5/23/18.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/Allocation.h

@@ -1,6 +1,6 @@
 //
 //  Allocation.h
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 5/5/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/Allocation.m

@@ -1,6 +1,6 @@
 //
 //  Allocation.m
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 5/5/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/Authenticator.swift

@@ -1,6 +1,6 @@
 //
 //  Authenticator.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/9/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -8,7 +8,7 @@
 
 import Foundation
 import SwiftyBeaver
-import __PIATunnelNative
+import __TunnelKitNative
 
 private let log = SwiftyBeaver.self
 

TunnelKit/Sources/Core/CoreConfiguration.swift

@@ -1,6 +1,6 @@
 //
 //  CoreConfiguration.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 9/1/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/CryptoAEAD.h

@@ -1,6 +1,6 @@
 //
 //  CryptoAEAD.h
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 06/07/2018.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/CryptoAEAD.m

@@ -1,6 +1,6 @@
 //
 //  CryptoAEAD.m
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 06/07/2018.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -110,11 +110,11 @@ const NSInteger CryptoAEADTagLength     = 16;
     assert(self.extraLength >= PacketIdLength);
     memcpy(self.cipherIVEnc, extra + self.extraPacketIdOffset, PacketIdLength);
     
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CipherInit(self.cipherCtxEnc, NULL, NULL, self.cipherIVEnc, -1);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CipherInit(self.cipherCtxEnc, NULL, NULL, self.cipherIVEnc, -1);
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CipherUpdate(self.cipherCtxEnc, NULL, &x, extra, self.extraLength);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CipherUpdate(self.cipherCtxEnc, NULL, &x, extra, self.extraLength);
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CipherUpdate(self.cipherCtxEnc, dest + CryptoAEADTagLength, &l1, bytes, (int)length);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CipherUpdate(self.cipherCtxEnc, dest + CryptoAEADTagLength, &l1, bytes, (int)length);
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CipherFinal(self.cipherCtxEnc, dest + CryptoAEADTagLength + l1, &l2);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CipherFinal(self.cipherCtxEnc, dest + CryptoAEADTagLength + l1, &l2);
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CIPHER_CTX_ctrl(self.cipherCtxEnc, EVP_CTRL_GCM_GET_TAG, CryptoAEADTagLength, dest);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CIPHER_CTX_ctrl(self.cipherCtxEnc, EVP_CTRL_GCM_GET_TAG, CryptoAEADTagLength, dest);
 
     *destLength = CryptoAEADTagLength + l1 + l2;
 
@@ -124,7 +124,7 @@ const NSInteger CryptoAEADTagLength     = 16;
 //    NSLog(@">>> ENC tag: %@", [NSData dataWithBytes:dest length:CryptoAEADTagLength]);
 //    NSLog(@">>> ENC dest: %@", [NSData dataWithBytes:dest + CryptoAEADTagLength length:*destLength - CryptoAEADTagLength]);
 
-    PIA_CRYPTO_RETURN_STATUS(code)
+    TUNNEL_CRYPTO_RETURN_STATUS(code)
 }
 
 - (id<DataPathEncrypter>)dataPathEncrypter
@@ -173,11 +173,11 @@ const NSInteger CryptoAEADTagLength     = 16;
     assert(self.extraLength >= PacketIdLength);
     memcpy(self.cipherIVDec, extra + self.extraPacketIdOffset, PacketIdLength);
 
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CipherInit(self.cipherCtxDec, NULL, NULL, self.cipherIVDec, -1);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CipherInit(self.cipherCtxDec, NULL, NULL, self.cipherIVDec, -1);
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CIPHER_CTX_ctrl(self.cipherCtxDec, EVP_CTRL_GCM_SET_TAG, CryptoAEADTagLength, (uint8_t *)bytes);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CIPHER_CTX_ctrl(self.cipherCtxDec, EVP_CTRL_GCM_SET_TAG, CryptoAEADTagLength, (uint8_t *)bytes);
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CipherUpdate(self.cipherCtxDec, NULL, &x, extra, self.extraLength);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CipherUpdate(self.cipherCtxDec, NULL, &x, extra, self.extraLength);
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CipherUpdate(self.cipherCtxDec, dest, &l1, bytes + CryptoAEADTagLength, (int)length - CryptoAEADTagLength);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CipherUpdate(self.cipherCtxDec, dest, &l1, bytes + CryptoAEADTagLength, (int)length - CryptoAEADTagLength);
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CipherFinal(self.cipherCtxDec, dest + l1, &l2);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CipherFinal(self.cipherCtxDec, dest + l1, &l2);
 
     *destLength = l1 + l2;
     
@@ -187,7 +187,7 @@ const NSInteger CryptoAEADTagLength     = 16;
 //    NSLog(@">>> DEC tag: %@", [NSData dataWithBytes:bytes length:CryptoAEADTagLength]);
 //    NSLog(@">>> DEC dest: %@", [NSData dataWithBytes:dest length:*destLength]);
 
-    PIA_CRYPTO_RETURN_STATUS(code)
+    TUNNEL_CRYPTO_RETURN_STATUS(code)
 }
 
 - (id<DataPathDecrypter>)dataPathDecrypter
@@ -321,7 +321,7 @@ const NSInteger CryptoAEADTagLength     = 16;
     }
     if (self.checkPeerId && !self.checkPeerId(packet.bytes)) {
         if (error) {
-            *error = PIATunnelErrorWithCode(PIATunnelErrorCodeDataPathPeerIdMismatch);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeDataPathPeerIdMismatch);
         }
         return NO;
     }

TunnelKit/Sources/Core/CryptoBox.h

@@ -1,6 +1,6 @@
 //
 //  CryptoBox.h
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/4/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/CryptoBox.m

@@ -1,6 +1,6 @@
 //
 //  CryptoBox.m
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/4/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -78,7 +78,7 @@
     if ([self.cipherAlgorithm hasSuffix:@"-cbc"]) {
         if (!self.digestAlgorithm) {
             if (error) {
-                *error = PIATunnelErrorWithCode(PIATunnelErrorCodeCryptoBoxAlgorithm);
+                *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoBoxAlgorithm);
             }
             return NO;
         }
@@ -95,7 +95,7 @@
     // not supported
     else {
         if (error) {
-            *error = PIATunnelErrorWithCode(PIATunnelErrorCodeCryptoBoxAlgorithm);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoBoxAlgorithm);
         }
         return NO;
     }
@@ -123,15 +123,15 @@
     int code = 1;
 
     HMAC_CTX *ctx = HMAC_CTX_new();
-    PIA_CRYPTO_TRACK_STATUS(code) HMAC_CTX_reset(ctx);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) HMAC_CTX_reset(ctx);
-    PIA_CRYPTO_TRACK_STATUS(code) HMAC_Init_ex(ctx, secret, (int)secretLength, EVP_get_digestbyname([digestName cStringUsingEncoding:NSASCIIStringEncoding]), NULL);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) HMAC_Init_ex(ctx, secret, (int)secretLength, EVP_get_digestbyname([digestName cStringUsingEncoding:NSASCIIStringEncoding]), NULL);
-    PIA_CRYPTO_TRACK_STATUS(code) HMAC_Update(ctx, data, dataLength);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) HMAC_Update(ctx, data, dataLength);
-    PIA_CRYPTO_TRACK_STATUS(code) HMAC_Final(ctx, hmac, &l);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) HMAC_Final(ctx, hmac, &l);
     HMAC_CTX_free(ctx);
     
     *hmacLength = l;
 
-    PIA_CRYPTO_RETURN_STATUS(code)
+    TUNNEL_CRYPTO_RETURN_STATUS(code)
 }
 
 @end

TunnelKit/Sources/Core/CryptoCBC.h

@@ -1,6 +1,6 @@
 //
 //  CryptoCBC.h
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 06/07/2018.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/CryptoCBC.m

@@ -1,6 +1,6 @@
 //
 //  CryptoCBC.m
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 06/07/2018.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -120,22 +120,22 @@ const NSInteger CryptoCBCMaxHMACLength = 100;
     
     if (RAND_bytes(outIV, self.cipherIVLength) != 1) {
         if (error) {
-            *error = PIATunnelErrorWithCode(PIATunnelErrorCodeCryptoBoxRandomGenerator);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoBoxRandomGenerator);
         }
         return NO;
     }
     
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CipherInit(self.cipherCtxEnc, NULL, NULL, outIV, -1);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CipherInit(self.cipherCtxEnc, NULL, NULL, outIV, -1);
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CipherUpdate(self.cipherCtxEnc, outEncrypted, &l1, bytes, (int)length);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CipherUpdate(self.cipherCtxEnc, outEncrypted, &l1, bytes, (int)length);
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CipherFinal(self.cipherCtxEnc, outEncrypted + l1, &l2);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CipherFinal(self.cipherCtxEnc, outEncrypted + l1, &l2);
     
-    PIA_CRYPTO_TRACK_STATUS(code) HMAC_Init_ex(self.hmacCtxEnc, NULL, 0, NULL, NULL);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) HMAC_Init_ex(self.hmacCtxEnc, NULL, 0, NULL, NULL);
-    PIA_CRYPTO_TRACK_STATUS(code) HMAC_Update(self.hmacCtxEnc, outIV, l1 + l2 + self.cipherIVLength);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) HMAC_Update(self.hmacCtxEnc, outIV, l1 + l2 + self.cipherIVLength);
-    PIA_CRYPTO_TRACK_STATUS(code) HMAC_Final(self.hmacCtxEnc, dest, &l3);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) HMAC_Final(self.hmacCtxEnc, dest, &l3);
     
     *destLength = l1 + l2 + self.cipherIVLength + self.digestLength;
     
-    PIA_CRYPTO_RETURN_STATUS(code)
+    TUNNEL_CRYPTO_RETURN_STATUS(code)
 }
 
 - (id<DataPathEncrypter>)dataPathEncrypter
@@ -180,24 +180,24 @@ const NSInteger CryptoCBCMaxHMACLength = 100;
     int l1 = 0, l2 = 0;
     int code = 1;
     
-    PIA_CRYPTO_TRACK_STATUS(code) HMAC_Init_ex(self.hmacCtxDec, NULL, 0, NULL, NULL);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) HMAC_Init_ex(self.hmacCtxDec, NULL, 0, NULL, NULL);
-    PIA_CRYPTO_TRACK_STATUS(code) HMAC_Update(self.hmacCtxDec, bytes + self.digestLength, length - self.digestLength);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) HMAC_Update(self.hmacCtxDec, bytes + self.digestLength, length - self.digestLength);
-    PIA_CRYPTO_TRACK_STATUS(code) HMAC_Final(self.hmacCtxDec, self.bufferDecHMAC, (unsigned *)&l1);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) HMAC_Final(self.hmacCtxDec, self.bufferDecHMAC, (unsigned *)&l1);
     
-    if (PIA_CRYPTO_SUCCESS(code) && CRYPTO_memcmp(self.bufferDecHMAC, bytes, self.digestLength) != 0) {
+    if (TUNNEL_CRYPTO_SUCCESS(code) && CRYPTO_memcmp(self.bufferDecHMAC, bytes, self.digestLength) != 0) {
         if (error) {
-            *error = PIATunnelErrorWithCode(PIATunnelErrorCodeCryptoBoxHMAC);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoBoxHMAC);
         }
         return NO;
     }
     
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CipherInit(self.cipherCtxDec, NULL, NULL, iv, -1);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CipherInit(self.cipherCtxDec, NULL, NULL, iv, -1);
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CipherUpdate(self.cipherCtxDec, dest, &l1, encrypted, (int)length - self.digestLength - self.cipherIVLength);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CipherUpdate(self.cipherCtxDec, dest, &l1, encrypted, (int)length - self.digestLength - self.cipherIVLength);
-    PIA_CRYPTO_TRACK_STATUS(code) EVP_CipherFinal(self.cipherCtxDec, dest + l1, &l2);
+    TUNNEL_CRYPTO_TRACK_STATUS(code) EVP_CipherFinal(self.cipherCtxDec, dest + l1, &l2);
     
     *destLength = l1 + l2;
     
-    PIA_CRYPTO_RETURN_STATUS(code)
+    TUNNEL_CRYPTO_RETURN_STATUS(code)
 }
 
 - (id<DataPathDecrypter>)dataPathDecrypter
@@ -308,7 +308,7 @@ const NSInteger CryptoCBCMaxHMACLength = 100;
     }
     if (self.checkPeerId && !self.checkPeerId(packet.bytes)) {
         if (error) {
-            *error = PIATunnelErrorWithCode(PIATunnelErrorCodeDataPathPeerIdMismatch);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeDataPathPeerIdMismatch);
         }
         return NO;
     }

TunnelKit/Sources/Core/CryptoMacros.h

@@ -1,6 +1,6 @@
 //
 //  CryptoMacros.h
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 06/07/2018.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -8,12 +8,12 @@
 
 #import <Foundation/Foundation.h>
 
-#define PIA_CRYPTO_SUCCESS(ret) (ret > 0)
+#define TUNNEL_CRYPTO_SUCCESS(ret) (ret > 0)
-#define PIA_CRYPTO_TRACK_STATUS(ret) if (ret > 0) ret =
+#define TUNNEL_CRYPTO_TRACK_STATUS(ret) if (ret > 0) ret =
-#define PIA_CRYPTO_RETURN_STATUS(ret)\
+#define TUNNEL_CRYPTO_RETURN_STATUS(ret)\
 if (ret <= 0) {\
     if (error) {\
-        *error = PIATunnelErrorWithCode(PIATunnelErrorCodeCryptoBoxEncryption);\
+        *error = TunnelKitErrorWithCode(TunnelKitErrorCodeCryptoBoxEncryption);\
     }\
     return NO;\
 }\

TunnelKit/Sources/Core/Data+Manipulation.swift

@@ -1,6 +1,6 @@
 //
 //  Data+Manipulation.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/3/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/DataPath.h

@@ -1,6 +1,6 @@
 //
 //  DataPath.h
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 3/2/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/DataPath.m

@@ -1,6 +1,6 @@
 //
 //  DataPath.m
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 3/2/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -140,7 +140,7 @@
     
     if (self.outPacketId > self.maxPacketId) {
         if (error) {
-            *error = PIATunnelErrorWithCode(PIATunnelErrorCodeDataPathOverflow);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeDataPathOverflow);
         }
         return nil;
     }
@@ -202,7 +202,7 @@
         }
         if (packetId > self.maxPacketId) {
             if (error) {
-                *error = PIATunnelErrorWithCode(PIATunnelErrorCodeDataPathOverflow);
+                *error = TunnelKitErrorWithCode(TunnelKitErrorCodeDataPathOverflow);
             }
             return nil;
         }

TunnelKit/Sources/Core/DataPathEncryption.h

@@ -1,6 +1,6 @@
 //
 //  DataPathEncryption.h
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 11/07/2018.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/Encryption.h

@@ -1,6 +1,6 @@
 //
 //  Encryption.h
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 3/3/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/EncryptionProxy.swift

@@ -1,13 +1,13 @@
 //
 //  EncryptionProxy.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/8/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
 //
 
 import Foundation
-import __PIATunnelNative
+import __TunnelKitNative
 
 /// Bridges native encryption for high-level operations.
 public class EncryptionProxy {

TunnelKit/Sources/Core/Errors.h

@@ -0,0 +1,27 @@
+//
+//  Errors.h
+//  TunnelKit
+//
+//  Created by Davide De Rosa on 10/10/17.
+//  Copyright © 2018 London Trust Media. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+extern NSString *const TunnelKitErrorDomain;
+
+typedef NS_ENUM(NSInteger, TunnelKitErrorCode) {
+    TunnelKitErrorCodeCryptoBoxRandomGenerator = 101,
+    TunnelKitErrorCodeCryptoBoxHMAC,
+    TunnelKitErrorCodeCryptoBoxEncryption,
+    TunnelKitErrorCodeCryptoBoxAlgorithm,
+    TunnelKitErrorCodeTLSBoxCA = 201,
+    TunnelKitErrorCodeTLSBoxHandshake,
+    TunnelKitErrorCodeTLSBoxGeneric,
+    TunnelKitErrorCodeDataPathOverflow = 301,
+    TunnelKitErrorCodeDataPathPeerIdMismatch
+};
+
+static inline NSError *TunnelKitErrorWithCode(TunnelKitErrorCode code) {
+    return [NSError errorWithDomain:TunnelKitErrorDomain code:code userInfo:nil];
+}

TunnelKit/Sources/Core/Errors.m

@@ -1,6 +1,6 @@
 //
 //  Errors.m
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 10/10/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -8,4 +8,4 @@
 
 #import "Errors.h"
 
-NSString *const PIATunnelErrorDomain = @"PIATunnelNative";
+NSString *const TunnelKitErrorDomain = @"TunnelKitNative";

TunnelKit/Sources/Core/IOInterface.swift

@@ -1,6 +1,6 @@
 //
 //  IOInterface.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 8/27/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/LinkInterface.swift

@@ -1,6 +1,6 @@
 //
 //  LinkInterface.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 8/27/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -23,20 +23,9 @@ public protocol LinkInterface: IOInterface {
     /// The number of packets that this interface is able to bufferize.
     var packetBufferSize: Int { get }
 
-    /// The language spoken over this link.
-    var communicationType: CommunicationType { get }
-    
     /// Timeout in seconds for negotiation start.
     var negotiationTimeout: TimeInterval { get }
 
     /// Timeout in seconds for HARD_RESET response.
     var hardResetTimeout: TimeInterval { get }
-
-    /**
-     Returns an optional payload to attach to the HARD_RESET packet.
-     
-     - Parameter encryption: The `SessionProxy.EncryptionParameters` to establish for this session.
-     - Returns: The optional HARD_RESET payload.
-     */
-    func hardReset(with encryption: SessionProxy.EncryptionParameters) -> Data?
 }

TunnelKit/Sources/Core/MSS.h

@@ -1,6 +1,6 @@
 //
 //  MSS.h
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/7/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/MSS.m

@@ -1,6 +1,6 @@
 //
 //  MSS.m
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/7/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/Packet.swift

@@ -1,13 +1,13 @@
 //
 //  Packet.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/3/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
 //
 
 import Foundation
-import __PIATunnelNative
+import __TunnelKitNative
 
 class CommonPacket {
     let packetId: UInt32

TunnelKit/Sources/Core/PacketMacros.h

@@ -1,6 +1,6 @@
 //
 //  PacketMacros.h
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 11/07/2018.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/PacketMacros.m

@@ -1,6 +1,6 @@
 //
 //  PacketMacros.m
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 11/07/2018.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/ProtocolMacros.swift

@@ -1,13 +1,13 @@
 //
 //  ProtocolMacros.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/8/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
 //
 
 import Foundation
-import __PIATunnelNative
+import __TunnelKitNative
 
 class ProtocolMacros {
     static let peerIdLength = 3

TunnelKit/Sources/Core/PushReply.swift

@@ -1,6 +1,6 @@
 //
 //  PushReply.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 25/07/2018.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/ReplayProtector.h

@@ -1,6 +1,6 @@
 //
 //  ReplayProtector.h
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/17/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/ReplayProtector.m

@@ -1,6 +1,6 @@
 //
 //  ReplayProtector.m
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/17/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/SecureRandom.swift

@@ -1,6 +1,6 @@
 //
 //  SecureRandom.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/3/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -8,7 +8,7 @@
 
 import Foundation
 import Security.SecRandom
-import __PIATunnelNative
+import __TunnelKitNative
 
 enum SecureRandomError: Error {
     case randomGenerator

TunnelKit/Sources/Core/SessionKey.swift

@@ -1,13 +1,13 @@
 //
 //  SessionKey.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 4/12/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
 //
 
 import Foundation
-import __PIATunnelNative
+import __TunnelKitNative
 import SwiftyBeaver
 
 private let log = SwiftyBeaver.self

TunnelKit/Sources/Core/SessionProxy.swift

@@ -1,6 +1,6 @@
 //
 //  SessionProxy.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/3/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -8,14 +8,14 @@
 
 import Foundation
 import SwiftyBeaver
-import __PIATunnelNative
+import __TunnelKitNative
 
 private let log = SwiftyBeaver.self
 
 private extension Error {
     func isDataPathOverflow() -> Bool {
         let te = self as NSError
-        return te.domain == PIATunnelErrorDomain && te.code == PIATunnelErrorCode.dataPathOverflow.rawValue
+        return te.domain == TunnelKitErrorDomain && te.code == TunnelKitErrorCode.dataPathOverflow.rawValue
     }
 }
 
@@ -91,17 +91,13 @@ public class SessionProxy {
         public let digestName: String
 
         /// The path to the CA for TLS negotiation (PEM format).
-        public let caPath: String
+        public let caPath: String?
-
-        /// The MD5 digest of the CA (computed from DER format).
-        public let caDigest: String?
 
         /// :nodoc:
-        public init(_ cipherName: String, _ digestName: String, _ caPath: String, _ caDigest: String?) {
+        public init(_ cipherName: String, _ digestName: String, _ caPath: String?) {
             self.cipherName = cipherName
             self.digestName = digestName
             self.caPath = caPath
-            self.caDigest = caDigest
         }
     }
     
@@ -702,9 +698,8 @@ public class SessionProxy {
         keys[negotiationKeyIdx] = newKey
         log.debug("Negotiation key index is \(negotiationKeyIdx)")
 
-        let payload = link?.hardReset(with: encryption) ?? Data()
         negotiationKey.state = .hardReset
-        enqueueControlPackets(code: .hardResetClientV2, key: UInt8(negotiationKeyIdx), payload: payload)
+        enqueueControlPackets(code: .hardResetClientV2, key: UInt8(negotiationKeyIdx), payload: Data())
     }
     
     // Ruby: soft_reset
@@ -835,7 +830,7 @@ public class SessionProxy {
 
             negotiationKey.tlsOptional = TLSBox(caPath: encryption.caPath)
             do {
-                try negotiationKey.tls.start(withPeerVerification: true)
+                try negotiationKey.tls.start()
             } catch let e {
                 deferStop(.shutdown, e)
                 return

TunnelKit/Sources/Core/TLSBox.h

@@ -1,6 +1,6 @@
 //
 //  TLSBox.h
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/3/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -20,9 +20,9 @@ extern NSString *const TLSBoxPeerVerificationErrorNotification;
 //
 @interface TLSBox : NSObject
 
-- (nonnull instancetype)initWithCAPath:(NSString *)caPath;
+- (nonnull instancetype)initWithCAPath:(nullable NSString *)caPath;
 
-- (BOOL)startWithPeerVerification:(BOOL)peerVerification error:(NSError **)error;
+- (BOOL)startWithError:(NSError **)error;
 
 - (NSData *)pullCipherTextWithError:(NSError **)error;
 // WARNING: text must be able to hold plain text output

TunnelKit/Sources/Core/TLSBox.m

@@ -1,6 +1,6 @@
 //
 //  TLSBox.m
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 2/3/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
@@ -74,7 +74,7 @@ int TLSBoxVerifyPeer(int ok, X509_STORE_CTX *ctx) {
     free(self.bufferCipherText);
 }
 
-- (BOOL)startWithPeerVerification:(BOOL)peerVerification error:(NSError *__autoreleasing *)error
+- (BOOL)startWithError:(NSError *__autoreleasing *)error
 {
     if (!TLSBoxIsOpenSSLLoaded) {
 //        OPENSSL_init_ssl(0, NULL);
@@ -84,12 +84,12 @@ int TLSBoxVerifyPeer(int ok, X509_STORE_CTX *ctx) {
     
     self.ctx = SSL_CTX_new(TLS_client_method());
     SSL_CTX_set_options(self.ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_COMPRESSION);
-    if (peerVerification && self.caPath) {
+    if (self.caPath) {
         SSL_CTX_set_verify(self.ctx, SSL_VERIFY_PEER, TLSBoxVerifyPeer);
         if (!SSL_CTX_load_verify_locations(self.ctx, [self.caPath cStringUsingEncoding:NSASCIIStringEncoding], NULL)) {
             ERR_print_errors_fp(stdout);
             if (error) {
-                *error = PIATunnelErrorWithCode(PIATunnelErrorCodeTLSBoxCA);
+                *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxCA);
             }
             return NO;
         }
@@ -112,7 +112,7 @@ int TLSBoxVerifyPeer(int ok, X509_STORE_CTX *ctx) {
     
     if (!SSL_do_handshake(self.ssl)) {
         if (error) {
-            *error = PIATunnelErrorWithCode(PIATunnelErrorCodeTLSBoxHandshake);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxHandshake);
         }
         return NO;
     }
@@ -135,7 +135,7 @@ int TLSBoxVerifyPeer(int ok, X509_STORE_CTX *ctx) {
     }
     if ((ret < 0) && !BIO_should_retry(self.bioCipherTextOut)) {
         if (error) {
-            *error = PIATunnelErrorWithCode(PIATunnelErrorCodeTLSBoxGeneric);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxGeneric);
         }
     }
     return nil;
@@ -153,7 +153,7 @@ int TLSBoxVerifyPeer(int ok, X509_STORE_CTX *ctx) {
     }
     if ((ret < 0) && !BIO_should_retry(self.bioPlainText)) {
         if (error) {
-            *error = PIATunnelErrorWithCode(PIATunnelErrorCodeTLSBoxGeneric);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxGeneric);
         }
     }
     return NO;
@@ -175,7 +175,7 @@ int TLSBoxVerifyPeer(int ok, X509_STORE_CTX *ctx) {
     const int ret = BIO_write(self.bioCipherTextIn, text, (int)length);
     if (ret != length) {
         if (error) {
-            *error = PIATunnelErrorWithCode(PIATunnelErrorCodeTLSBoxGeneric);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxGeneric);
         }
         return NO;
     }
@@ -196,7 +196,7 @@ int TLSBoxVerifyPeer(int ok, X509_STORE_CTX *ctx) {
     const int ret = BIO_write(self.bioPlainText, text, (int)length);
     if (ret != length) {
         if (error) {
-            *error = PIATunnelErrorWithCode(PIATunnelErrorCodeTLSBoxGeneric);
+            *error = TunnelKitErrorWithCode(TunnelKitErrorCodeTLSBoxGeneric);
         }
         return NO;
     }

TunnelKit/Sources/Core/TunnelInterface.swift

@@ -1,6 +1,6 @@
 //
 //  TunnelInterface.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 8/27/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/ZeroingData.h

@@ -1,6 +1,6 @@
 //
 //  ZeroingData.h
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 4/28/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/ZeroingData.m

@@ -1,6 +1,6 @@
 //
 //  ZeroingData.m
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 4/28/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.

TunnelKit/Sources/Core/ZeroingData.swift

@@ -1,13 +1,13 @@
 //
 //  ZeroingData.swift
-//  PIATunnel
+//  TunnelKit
 //
 //  Created by Davide De Rosa on 4/27/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.
 //
 
 import Foundation
-import __PIATunnelNative
+import __TunnelKitNative
 
 func Z() -> ZeroingData {
     return ZeroingData()

TunnelKit/Sources/Core/module.modulemap

@@ -1,4 +1,4 @@
-module __PIATunnelNative {
+module __TunnelKitNative {
     header "Errors.h"
     header "ZeroingData.h"
     header "TLSBox.h"

TunnelKitHost/AppDelegate.swift

@@ -1,6 +1,6 @@
 //
 //  AppDelegate.swift
-//  PIATunnelHost
+//  TunnelKitHost
 //
 //  Created by Davide De Rosa on 9/24/17.
 //  Copyright © 2018 London Trust Media. All rights reserved.