Minor Update

OperatorFoundation · Sep 27, 2018 · 941a511 · 941a511
1 parent 1bd99f3
commit 941a511
Show file tree

Hide file tree

Showing 13 changed files with 1,421 additions and 1,456 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Package.resolved b/Package.resolved
@@ -64,24 +64,6 @@
           "version": "0.0.6"
         }
       },
-      {
-        "package": "swift-nio",
-        "repositoryURL": "https://github.com/apple/swift-nio.git",
-        "state": {
-          "branch": null,
-          "revision": "5d8148c8b45dfb449276557f22120694567dd1d2",
-          "version": "1.9.5"
-        }
-      },
-      {
-        "package": "swift-nio-zlib-support",
-        "repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git",
-        "state": {
-          "branch": null,
-          "revision": "37760e9a52030bb9011972c5213c3350fa9d41fd",
-          "version": "1.0.0"
-        }
-      },
       {
         "package": "Sodium",
         "repositoryURL": "https://github.com/OperatorFoundation/swift-sodium",
@@ -100,22 +82,13 @@
           "version": "0.0.3"
         }
       },
-      {
-        "package": "SwiftSocket",
-        "repositoryURL": "https://github.com/OperatorFoundation/SwiftSocket.git",
-        "state": {
-          "branch": null,
-          "revision": "24232dcbd0a7bb0db35a7b96d75ceac9a88ce670",
-          "version": "2.0.3"
-        }
-      },
       {
         "package": "Transport",
         "repositoryURL": "https://github.com/OperatorFoundation/Transport.git",
         "state": {
           "branch": null,
-          "revision": "e4609715074ab941db8dd617f940ccf63107dc3c",
-          "version": "0.0.19"
+          "revision": "73d252ccabc7f9a3b7855225f8bf33a3eb762dca",
+          "version": "0.0.21"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -19,10 +19,10 @@ let package = Package(
         ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/OperatorFoundation/ProteanSwift", from: "0.0.1"),
-        .package(url: "https://github.com/OperatorFoundation/Transport.git", from: "0.0.19"),
+        .package(url: "https://github.com/OperatorFoundation/ProteanSwift", from: "0.0.6"),
+        .package(url: "https://github.com/OperatorFoundation/Transport.git", from: "0.0.21"),
         .package(url: "https://github.com/OperatorFoundation/swift-sodium", from: "0.6.8"),
-        .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "0.11.0"),
+        .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "0.12.0"),
         .package(url: "https://github.com/Bouke/HKDF.git", from: "3.0.1"),
         .package(url: "https://github.com/OperatorFoundation/Elligator.git", from: "0.1.0"),
         .package(url: "https://github.com/OperatorFoundation/SwiftQueue.git", from: "0.0.3")

diff --git a/Shapeshifter-Swift-Transports.xcodeproj/GeneratedModuleMap/celligator/module.modulemap b/Shapeshifter-Swift-Transports.xcodeproj/GeneratedModuleMap/celligator/module.modulemap
@@ -1,4 +1,4 @@
 module celligator {
-    umbrella "/Users/Lita/Documents/Documents - Adelita’s MacBook Pro/Dev/Shapeshifter-Swift-Transports/.build/checkouts/Elligator.git-1685432175989269477/Sources/celligator/include"
+    umbrella "/Users/Lita/Documents/Documents - Adelita’s MacBook Pro/Dev/Shapeshifter-Swift-Transports/.build/checkouts/Elligator.git-8008843471106168896/Sources/celligator/include"
     export *
 }
diff --git a/Shapeshifter-Swift-Transports.xcodeproj/project.pbxproj b/Shapeshifter-Swift-Transports.xcodeproj/project.pbxproj
diff --git a/...ransports.xcodeproj/xcshareddata/xcschemes/Shapeshifter-Swift-Transports-Package.xcscheme b/...ransports.xcodeproj/xcshareddata/xcschemes/Shapeshifter-Swift-Transports-Package.xcscheme
@@ -14,9 +14,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Shapeshifter-Swift-Transports::ExampleTransports"
-               BuildableName = "ExampleTransports.framework"
-               BlueprintName = "ExampleTransports"
+               BlueprintIdentifier = "Shapeshifter-Swift-Transports::Wisp"
+               BuildableName = "Wisp.framework"
+               BlueprintName = "Wisp"
                ReferencedContainer = "container:Shapeshifter-Swift-Transports.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -28,9 +28,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Shapeshifter-Swift-Transports::Protean"
-               BuildableName = "Protean.framework"
-               BlueprintName = "Protean"
+               BlueprintIdentifier = "Shapeshifter-Swift-Transports::ExampleTransports"
+               BuildableName = "ExampleTransports.framework"
+               BlueprintName = "ExampleTransports"
                ReferencedContainer = "container:Shapeshifter-Swift-Transports.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -42,9 +42,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Shapeshifter-Swift-Transports::Wisp"
-               BuildableName = "Wisp.framework"
-               BlueprintName = "Wisp"
+               BlueprintIdentifier = "Shapeshifter-Swift-Transports::Protean"
+               BuildableName = "Protean.framework"
+               BlueprintName = "Protean"
                ReferencedContainer = "container:Shapeshifter-Swift-Transports.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -60,29 +60,29 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Shapeshifter-Swift-Transports::ExampleTransportsTests"
-               BuildableName = "ExampleTransportsTests.xctest"
-               BlueprintName = "ExampleTransportsTests"
+               BlueprintIdentifier = "Shapeshifter-Swift-Transports::WispTests"
+               BuildableName = "WispTests.xctest"
+               BlueprintName = "WispTests"
                ReferencedContainer = "container:Shapeshifter-Swift-Transports.xcodeproj">
             </BuildableReference>
          </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Shapeshifter-Swift-Transports::WispTests"
-               BuildableName = "WispTests.xctest"
-               BlueprintName = "WispTests"
+               BlueprintIdentifier = "Shapeshifter-Swift-Transports::ProteanTests"
+               BuildableName = "ProteanTests.xctest"
+               BlueprintName = "ProteanTests"
                ReferencedContainer = "container:Shapeshifter-Swift-Transports.xcodeproj">
             </BuildableReference>
          </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Shapeshifter-Swift-Transports::ProteanTests"
-               BuildableName = "ProteanTests.xctest"
-               BlueprintName = "ProteanTests"
+               BlueprintIdentifier = "Shapeshifter-Swift-Transports::ExampleTransportsTests"
+               BuildableName = "ExampleTransportsTests.xctest"
+               BlueprintName = "ExampleTransportsTests"
                ReferencedContainer = "container:Shapeshifter-Swift-Transports.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -103,9 +103,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "Shapeshifter-Swift-Transports::ExampleTransports"
-            BuildableName = "ExampleTransports.framework"
-            BlueprintName = "ExampleTransports"
+            BlueprintIdentifier = "Shapeshifter-Swift-Transports::Wisp"
+            BuildableName = "Wisp.framework"
+            BlueprintName = "Wisp"
             ReferencedContainer = "container:Shapeshifter-Swift-Transports.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/Sources/ExampleTransports/PassthroughConnection.swift b/Sources/ExampleTransports/PassthroughConnection.swift
@@ -22,7 +22,7 @@ open class PassthroughConnection: Connection
                  using parameters: NWParameters)
     {
         let connectionFactory = NetworkConnectionFactory(host: host, port: port)
-        guard let newConnection = connectionFactory.connect(parameters)
+        guard let newConnection = connectionFactory.connect(using: parameters)
         else
         {
             return nil

diff --git a/Sources/ExampleTransports/Rot13Connection.swift b/Sources/ExampleTransports/Rot13Connection.swift
@@ -29,7 +29,7 @@ open class Rot13Connection: Connection
          using parameters: NWParameters)
     {
         let connectionFactory = NetworkConnectionFactory(host: host, port: port)
-        guard let newConnection = connectionFactory.connect(parameters)
+        guard let newConnection = connectionFactory.connect(using: parameters)
         else
         {
             return nil

diff --git a/Sources/Protean/ProteanConnection.swift b/Sources/Protean/ProteanConnection.swift
@@ -38,7 +38,7 @@ open class ProteanConnection: Connection
         }
 
         let connectionFactory = NetworkConnectionFactory(host: host, port: port)
-        guard let newConnection = connectionFactory.connect(.udp)
+        guard let newConnection = connectionFactory.connect(using: .udp)
         else
         {
             return nil

diff --git a/Sources/Wisp/WispConnection.swift b/Sources/Wisp/WispConnection.swift
@@ -49,7 +49,7 @@ public class WispConnection: Connection
         self.iatMode = iatMode
 
         let connectionFactory = NetworkConnectionFactory(host: host, port: port)
-        guard let newConnection = connectionFactory.connect(parameters)
+        guard let newConnection = connectionFactory.connect(using: parameters)
         else
         {
             return nil

diff --git a/Sources/Wisp/WispConnectionFactory.swift b/Sources/Wisp/WispConnectionFactory.swift
@@ -33,7 +33,7 @@ open class WispConnectionFactory: ConnectionFactory
         self.iatMode = iatMode
     }
 
-    public func connect(_ using: NWParameters) -> Connection?
+    public func connect(using: NWParameters) -> Connection?
     {
         if let currentConnection = connection
         {

diff --git a/SupportingFiles/libsodium-ios.a → Sources/libsodium-ios.a b/SupportingFiles/libsodium-ios.a → Sources/libsodium-ios.a
diff --git a/Tests/WispTests/WispTests.swift b/Tests/WispTests/WispTests.swift
@@ -179,7 +179,7 @@ class Shapeshifter_WispTests: XCTestCase
         let read = expectation(description: "Read data from the server.")
         let host = NWEndpoint.Host.ipv4(ipv4Address)
         let connectionFactory = NetworkConnectionFactory(host: host, port: port)
-        let maybeConnection = connectionFactory.connect(.udp)
+        let maybeConnection = connectionFactory.connect(using: .udp)
 
         XCTAssertNotNil(maybeConnection)
 
@@ -305,7 +305,7 @@ class Shapeshifter_WispTests: XCTestCase
         let connected = expectation(description: "Connected to server.")
         let host = NWEndpoint.Host.ipv4(ipv4Address)
         let connectionFactory = NetworkConnectionFactory(host: host, port: port)
-        var maybeConnection = connectionFactory.connect(.tcp)
+        var maybeConnection = connectionFactory.connect(using: .tcp)
         XCTAssertNotNil(maybeConnection)
 
         maybeConnection!.stateUpdateHandler =
@@ -364,7 +364,7 @@ class Shapeshifter_WispTests: XCTestCase
         let wrote = expectation(description: "Wrote data to server.")
         let host = NWEndpoint.Host.ipv4(ipv4Address)
         let connectionFactory = NetworkConnectionFactory(host: host, port: port)
-        var maybeConnection = connectionFactory.connect(.tcp)
+        var maybeConnection = connectionFactory.connect(using: .tcp)
         XCTAssertNotNil(maybeConnection)
 
         maybeConnection?.stateUpdateHandler =
@@ -446,7 +446,7 @@ class Shapeshifter_WispTests: XCTestCase
         let read = expectation(description: "Read data from the server.")
         let host = NWEndpoint.Host.ipv4(ipv4Address)
         let connectionFactory = NetworkConnectionFactory(host: host, port: port)
-        let maybeConnection = connectionFactory.connect(.tcp)
+        let maybeConnection = connectionFactory.connect(using: .tcp)
 
         XCTAssertNotNil(maybeConnection)
 
@@ -568,7 +568,7 @@ class Shapeshifter_WispTests: XCTestCase
         let wroteTwice = expectation(description: "Wrote data to the server a second time.")
         let host = NWEndpoint.Host.ipv4(ipv4Address)
         let connectionFactory = NetworkConnectionFactory(host: host, port: port)
-        let maybeConnection = connectionFactory.connect(.tcp)
+        let maybeConnection = connectionFactory.connect(using: .tcp)
 
         XCTAssertNotNil(maybeConnection)
 
@@ -679,7 +679,7 @@ class Shapeshifter_WispTests: XCTestCase
         let connected = expectation(description: "Connected to server.")
         let host = NWEndpoint.Host.ipv4(ipv4Address)
         let wispFactory = WispConnectionFactory(host: host, port: port, cert: certString, iatMode: false)
-        var maybeConnection = wispFactory.connect(.tcp)
+        var maybeConnection = wispFactory.connect(using: .tcp)
         XCTAssertNotNil(maybeConnection)
 
         maybeConnection?.stateUpdateHandler =
@@ -742,7 +742,7 @@ class Shapeshifter_WispTests: XCTestCase
         let wrote = expectation(description: "Wrote data to server.")
         let host = NWEndpoint.Host.ipv4(ipv4Address)
         let wispFactory = WispConnectionFactory(host: host, port: port, cert: certString, iatMode: false)
-        let maybeConnection = wispFactory.connect(.tcp)
+        let maybeConnection = wispFactory.connect(using: .tcp)
         XCTAssertNotNil(maybeConnection)
 
         guard var connection = maybeConnection
@@ -828,7 +828,7 @@ class Shapeshifter_WispTests: XCTestCase
         let read = expectation(description: "Read data from the server.")
         let host = NWEndpoint.Host.ipv4(ipv4Address)
         let wispFactory = WispConnectionFactory(host: host, port: port, cert: certString, iatMode: false)
-        let maybeConnection = wispFactory.connect(.tcp)
+        let maybeConnection = wispFactory.connect(using: .tcp)
         XCTAssertNotNil(maybeConnection)
 
         guard var connection = maybeConnection