aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2020-11-05 12:41:31 +0100
committerAndrej Mihajlov <and@mullvad.net>2020-12-02 11:08:08 +0100
commitddf8ade9c65d9c5961c1c3a0574025aa534bcfba (patch)
treecfaf353519a78458cd8c8c405bafc28008ab34bc
parentWireGuardKit: Set public access level for shared structs (diff)
downloadwireguard-apple-ddf8ade9c65d9c5961c1c3a0574025aa534bcfba.tar.xz
wireguard-apple-ddf8ade9c65d9c5961c1c3a0574025aa534bcfba.zip
WireGuardKit: Add WireGuardKitCTarget with private C sources
Signed-off-by: Andrej Mihajlov <and@mullvad.net>
-rw-r--r--Package.swift7
-rw-r--r--WireGuardKit/Sources/WireGuardKit/Data+KeyEncoding.swift (renamed from WireGuard/Shared/Model/Data+KeyEncoding.swift)0
-rw-r--r--WireGuardKit/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift1
-rw-r--r--WireGuardKit/Sources/WireGuardKitCTarget/include/WireGuardKitCTarget.h4
-rw-r--r--WireGuardKit/Sources/WireGuardKitCTarget/key.c (renamed from WireGuard/Shared/Model/key.c)0
-rw-r--r--WireGuardKit/Sources/WireGuardKitCTarget/key.h (renamed from WireGuard/Shared/Model/key.h)0
-rw-r--r--WireGuardKit/Sources/WireGuardKitCTarget/module.modulemap4
7 files changed, 15 insertions, 1 deletions
diff --git a/Package.swift b/Package.swift
index 430d2e3..816d924 100644
--- a/Package.swift
+++ b/Package.swift
@@ -16,10 +16,15 @@ 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: [],
path: "WireGuardKit/Sources/libwg-go",
diff --git a/WireGuard/Shared/Model/Data+KeyEncoding.swift b/WireGuardKit/Sources/WireGuardKit/Data+KeyEncoding.swift
index 5c7aee9..5c7aee9 100644
--- a/WireGuard/Shared/Model/Data+KeyEncoding.swift
+++ b/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
index 6c64443..6c64443 100644
--- a/WireGuard/Shared/Model/key.c
+++ b/WireGuardKit/Sources/WireGuardKitCTarget/key.c
diff --git a/WireGuard/Shared/Model/key.h b/WireGuardKit/Sources/WireGuardKitCTarget/key.h
index bd22a94..bd22a94 100644
--- a/WireGuard/Shared/Model/key.h
+++ b/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 *
+}