WireGuardKit: Add WireGuardKitCTarget with private C sources

Signed-off-by: Andrej Mihajlov <and@mullvad.net>

diff --git a/Package.swift b/Package.swift
index 430d2e3965e7bf292eb247042c0ed562e136d6ff..816d924a7e6482512e51ffd49ddcf331fdb6dbd2 100644 (file)
--- a/Package.swift
+++ b/Package.swift
@@ -16,9 +16,14 @@ let package = Package(
     targets: [
         .target(
             name: "WireGuardKit",
-            dependencies: ["libwg-go"],
+            dependencies: ["libwg-go", "WireGuardKitCTarget"],
             path: "WireGuardKit/Sources/WireGuardKit"
         ),
+        .target(
+            name: "WireGuardKitCTarget",
+            dependencies: [],
+            path: "WireGuardKit/Sources/WireGuardKitCTarget"
+        ),
         .target(
             name: "libwg-go",
             dependencies: [],

diff --git a/WireGuard/Shared/Model/Data+KeyEncoding.swift b/WireGuardKit/Sources/WireGuardKit/Data+KeyEncoding.swift
similarity index 100%
rename from WireGuard/Shared/Model/Data+KeyEncoding.swift
rename to WireGuardKit/Sources/WireGuardKit/Data+KeyEncoding.swift

diff --git a/WireGuardKit/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift b/WireGuardKit/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift
index a4ff7dd2505bf05482bfe2bbaaf2227e98fd169a..c1cd3f7197e02b2ee3fc7fd729afc86fe1a3b1ba 100644 (file)
--- a/WireGuardKit/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift
+++ b/WireGuardKit/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift
@@ -4,6 +4,7 @@
 import Foundation
 import Network
 import NetworkExtension
+import WireGuardKitCTarget
 
 class PacketTunnelSettingsGenerator {
     let tunnelConfiguration: TunnelConfiguration

diff --git a/WireGuardKit/Sources/WireGuardKitCTarget/include/WireGuardKitCTarget.h b/WireGuardKit/Sources/WireGuardKitCTarget/include/WireGuardKitCTarget.h
new file mode 100644 (file)
index 0000000..f079501
--- /dev/null
+++ b/WireGuardKit/Sources/WireGuardKitCTarget/include/WireGuardKitCTarget.h
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: MIT
+// Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
+
+#include "../key.h"

diff --git a/WireGuard/Shared/Model/key.c b/WireGuardKit/Sources/WireGuardKitCTarget/key.c
similarity index 100%
rename from WireGuard/Shared/Model/key.c
rename to WireGuardKit/Sources/WireGuardKitCTarget/key.c

diff --git a/WireGuard/Shared/Model/key.h b/WireGuardKit/Sources/WireGuardKitCTarget/key.h
similarity index 100%
rename from WireGuard/Shared/Model/key.h
rename to WireGuardKit/Sources/WireGuardKitCTarget/key.h

diff --git a/WireGuardKit/Sources/WireGuardKitCTarget/module.modulemap b/WireGuardKit/Sources/WireGuardKitCTarget/module.modulemap
new file mode 100644 (file)
index 0000000..360f6ec
--- /dev/null
+++ b/WireGuardKit/Sources/WireGuardKitCTarget/module.modulemap
@@ -0,0 +1,4 @@
+module WireGuardKitCTarget {
+    umbrella header "include/WireGuardKitCTarget.h"
+    export *
+}