Updates to Wisp

OperatorFoundation · Aug 6, 2018 · 6246440 · 6246440
1 parent f852484
commit 6246440
Show file tree

Hide file tree

Showing 12 changed files with 1,599 additions and 2,187 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Package.resolved b/Package.resolved
@@ -11,11 +11,11 @@
         }
       },
       {
-        "package": "libsodium",
-        "repositoryURL": "https://github.com/OperatorFoundation/Clibsodium.git",
+        "package": "Clibsodium",
+        "repositoryURL": "https://github.com/tiwoc/Clibsodium.git",
         "state": {
           "branch": null,
-          "revision": "d2e942a7a9e2920fe144fce194381243aa1018a7",
+          "revision": "2ac72772aae26b2da0b15c253d9bb79ba452f66a",
           "version": "1.0.0"
         }
       },
@@ -33,8 +33,17 @@
         "repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift.git",
         "state": {
           "branch": null,
-          "revision": "526d5e91569b30857d8def9ea22ad7265b70d238",
-          "version": "0.9.0"
+          "revision": "3f6869c469abf3e2ebefe3b6baef4bfac3aac305",
+          "version": "0.11.0"
+        }
+      },
+      {
+        "package": "Datable",
+        "repositoryURL": "https://github.com/OperatorFoundation/Datable.git",
+        "state": {
+          "branch": null,
+          "revision": "814c6b1173f74672732d094ad0abe7e5d2eac232",
+          "version": "0.1.0"
         }
       },
       {
@@ -56,30 +65,30 @@
         }
       },
       {
-        "package": "swift-sodium",
-        "repositoryURL": "https://github.com/OperatorFoundation/swift-sodium.git",
+        "package": "Sodium",
+        "repositoryURL": "https://github.com/consuelita/swift-sodium",
         "state": {
           "branch": null,
-          "revision": "22cdbe7088ac3c009a5aff8abc6d73b0e6b31b02",
-          "version": "0.5.3"
+          "revision": "8e60308d8021cece0eb627a1a4cadc3cb78be38b",
+          "version": "0.6.2"
         }
       },
       {
         "package": "SwiftQueue",
         "repositoryURL": "https://github.com/OperatorFoundation/SwiftQueue.git",
         "state": {
           "branch": null,
-          "revision": "047666d1e4d804d090ae9588aa5bfc9b77c800c3",
-          "version": "0.0.1"
+          "revision": "0e5979acbb104516a427bb2bb09debc50ca100b4",
+          "version": "0.0.3"
         }
       },
       {
         "package": "Transport",
         "repositoryURL": "https://github.com/OperatorFoundation/Transport.git",
         "state": {
           "branch": null,
-          "revision": "1e49592a44568ffb735385575f85058394d24a65",
-          "version": "0.0.4"
+          "revision": "538b90bce4153cb79af9b1124fff6723ca76f445",
+          "version": "0.0.12"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -7,44 +7,38 @@ let package = Package(
     name: "Shapeshifter-Swift-Transports",
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
-        .library(
-            name: "Meek",
-            targets: ["Meek"]),
+//        .library(
+//            name: "Meek",
+//            targets: ["Meek"]),
         .library(
             name: "Wisp",
             targets: ["Wisp"]),
-        .library(
-            name: "ShapeshifterTesting",
-            targets: ["ShapeshifterTesting"])
         ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-         .package(url: "https://github.com/OperatorFoundation/Transport.git", from: "0.0.3"),
-         .package(url: "https://github.com/IBM-Swift/CommonCrypto.git", from: "0.1.5"),
-         .package(url: "https://github.com/OperatorFoundation/swift-sodium.git", from: "0.5.3"),
-         .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "0.7.2"),
+         .package(url: "https://github.com/OperatorFoundation/Transport.git", from: "0.0.11"),
+         //.package(url: "https://github.com/OperatorFoundation/swift-sodium.git", from: "0.5.3"),
+         .package(url: "https://github.com/consuelita/swift-sodium", from: "0.6.2"),
+         .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "0.11.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.1")
+         .package(url: "https://github.com/OperatorFoundation/SwiftQueue.git", from: "0.0.3")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
 
-        .target(
-            name: "Meek",
-            dependencies: ["CryptoSwift", "Transport", "SwiftQueue"]),
-        .testTarget(
-            name: "MeekTests",
-            dependencies: ["Meek", "ShapeshifterTesting"]),
+//        .target(
+//            name: "Meek",
+//            dependencies: ["CryptoSwift", "Transport", "SwiftQueue"]),
+//        .testTarget(
+//            name: "MeekTests",
+//            dependencies: ["Meek", "ShapeshifterTesting"]),
         .target(
             name: "Wisp",
-            dependencies: ["CommonCrypto", "Sodium", "CryptoSwift", "HKDF", "Elligator", "Transport", "SwiftQueue"]),
+            dependencies: ["Sodium", "CryptoSwift", "HKDF", "Elligator", "Transport", "SwiftQueue"]),
         .testTarget(
             name: "WispTests",
-            dependencies: ["Wisp", "ShapeshifterTesting"]),
-        .target(
-            name: "ShapeshifterTesting",
-            dependencies: ["Transport"]),
+            dependencies: ["Wisp"]),
         ]
 )