From ddf8ade9c65d9c5961c1c3a0574025aa534bcfba Mon Sep 17 00:00:00 2001
From: Andrej Mihajlov <and@mullvad.net>
Date: Thu, 5 Nov 2020 12:41:31 +0100
Subject: [PATCH] WireGuardKit: Add WireGuardKitCTarget with private C sources

Signed-off-by: Andrej Mihajlov <and@mullvad.net>
---
 Package.swift                                              | 7 ++++++-
 .../Sources/WireGuardKit}/Data+KeyEncoding.swift           | 0
 .../WireGuardKit/PacketTunnelSettingsGenerator.swift       | 1 +
 .../WireGuardKitCTarget/include/WireGuardKitCTarget.h      | 4 ++++
 .../Sources/WireGuardKitCTarget}/key.c                     | 0
 .../Sources/WireGuardKitCTarget}/key.h                     | 0
 WireGuardKit/Sources/WireGuardKitCTarget/module.modulemap  | 4 ++++
 7 files changed, 15 insertions(+), 1 deletion(-)
 rename {WireGuard/Shared/Model => WireGuardKit/Sources/WireGuardKit}/Data+KeyEncoding.swift (100%)
 create mode 100644 WireGuardKit/Sources/WireGuardKitCTarget/include/WireGuardKitCTarget.h
 rename {WireGuard/Shared/Model => WireGuardKit/Sources/WireGuardKitCTarget}/key.c (100%)
 rename {WireGuard/Shared/Model => WireGuardKit/Sources/WireGuardKitCTarget}/key.h (100%)
 create mode 100644 WireGuardKit/Sources/WireGuardKitCTarget/module.modulemap

diff --git a/Package.swift b/Package.swift
index 430d2e3..816d924 100644
--- 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 a4ff7dd..c1cd3f7 100644
--- 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
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
index 0000000..360f6ec
--- /dev/null
+++ b/WireGuardKit/Sources/WireGuardKitCTarget/module.modulemap
@@ -0,0 +1,4 @@
+module WireGuardKitCTarget {
+    umbrella header "include/WireGuardKitCTarget.h"
+    export *
+}