From 92fd6207719fb2b9ea0e23bd685acf867d3ca98a Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Fri, 29 Oct 2021 23:21:52 +0200 Subject: [PATCH] Regroup targets Prefix "internal" modules with underscore. --- Package.swift | 40 +++++++++---------- Sources/TunnelKitCore/Errors.swift | 2 +- Sources/TunnelKitCore/SecureRandom.swift | 4 +- Sources/TunnelKitCore/ZeroingData.swift | 2 +- .../NativeProvider.swift | 0 Sources/TunnelKitLZO/include/Errors.h | 2 +- .../AppExtension/NETCPLink.swift | 2 +- .../OpenVPNTunnelProvider+Configuration.swift | 4 +- .../AppExtension/OpenVPNTunnelProvider.swift | 2 +- Sources/TunnelKitOpenVPN/Authenticator.swift | 4 +- .../CompressionAlgorithm.swift | 2 +- .../TunnelKitOpenVPN/CompressionFraming.swift | 2 +- .../ConfigurationParser.swift | 4 +- Sources/TunnelKitOpenVPN/ControlChannel.swift | 4 +- .../ControlChannelSerializer.swift | 4 +- .../CoreConfiguration+OpenVPN.swift | 4 +- .../TunnelKitOpenVPN/CryptoContainer.swift | 2 +- .../TunnelKitOpenVPN/EncryptionBridge.swift | 4 +- Sources/TunnelKitOpenVPN/OpenVPN.swift | 4 +- Sources/TunnelKitOpenVPN/OpenVPNSession.swift | 4 +- Sources/TunnelKitOpenVPN/Packet.swift | 4 +- Sources/TunnelKitOpenVPN/SessionKey.swift | 4 +- Sources/TunnelKitOpenVPN/StaticKey.swift | 2 +- .../Allocation.m | 0 .../Errors.m | 0 .../LZOFactory.m | 0 .../RoutingTable.m | 0 .../RoutingTableEntry.m | 0 .../ZeroingData.m | 0 .../include/Allocation.h | 0 .../include/CompressionProvider.h | 0 .../include/Errors.h | 0 .../include/LZOFactory.h | 0 .../include/RoutingTable.h | 0 .../include/RoutingTableEntry.h | 0 .../include/ZeroingData.h | 0 .../include/route.h | 0 .../ControlPacket.m | 0 .../CryptoAEAD.m | 0 .../CryptoBox.m | 0 .../CryptoCBC.m | 0 .../CryptoCTR.m | 0 .../DataPath.m | 0 .../MSS.m | 0 .../PacketMacros.m | 0 .../PacketStream.m | 0 .../ReplayProtector.m | 0 .../TLSBox.m | 0 .../include/CompressionAlgorithmNative.h | 0 .../include/CompressionFramingNative.h | 0 .../include/ControlPacket.h | 0 .../include/Crypto.h | 0 .../include/CryptoAEAD.h | 0 .../include/CryptoBox.h | 0 .../include/CryptoCBC.h | 0 .../include/CryptoCTR.h | 0 .../include/CryptoMacros.h | 0 .../include/DataPath.h | 0 .../include/DataPathCrypto.h | 0 .../include/MSS.h | 0 .../include/PacketMacros.h | 0 .../include/PacketStream.h | 0 .../include/ReplayProtector.h | 0 .../include/TLSBox.h | 0 .../Data+Manipulation.swift | 0 .../NSRegularExpression+Shortcuts.swift | 0 .../Utils.swift | 0 Tests/TunnelKitCoreTests/RoutingTests.swift | 2 +- .../TunnelKitLZOTests/CompressionTests.swift | 2 +- .../ControlChannelTests.swift | 4 +- .../DataPathEncryptionTests.swift | 4 +- .../DataPathPerformanceTests.swift | 2 +- .../EncryptionPerformanceTests.swift | 4 +- .../EncryptionTests.swift | 4 +- Tests/TunnelKitOpenVPNTests/LinkTests.swift | 2 +- Tests/TunnelKitOpenVPNTests/PacketTests.swift | 2 +- .../TestUtils+OpenVPN.swift | 4 +- 77 files changed, 66 insertions(+), 70 deletions(-) rename Sources/{TunnelKitNative => TunnelKitIKE}/NativeProvider.swift (100%) rename Sources/{TunnelKitCoreObjC => _TunnelKitCoreObjC}/Allocation.m (100%) rename Sources/{TunnelKitCoreObjC => _TunnelKitCoreObjC}/Errors.m (100%) rename Sources/{TunnelKitCoreObjC => _TunnelKitCoreObjC}/LZOFactory.m (100%) rename Sources/{TunnelKitCoreObjC => _TunnelKitCoreObjC}/RoutingTable.m (100%) rename Sources/{TunnelKitCoreObjC => _TunnelKitCoreObjC}/RoutingTableEntry.m (100%) rename Sources/{TunnelKitCoreObjC => _TunnelKitCoreObjC}/ZeroingData.m (100%) rename Sources/{TunnelKitCoreObjC => _TunnelKitCoreObjC}/include/Allocation.h (100%) rename Sources/{TunnelKitCoreObjC => _TunnelKitCoreObjC}/include/CompressionProvider.h (100%) rename Sources/{TunnelKitCoreObjC => _TunnelKitCoreObjC}/include/Errors.h (100%) rename Sources/{TunnelKitCoreObjC => _TunnelKitCoreObjC}/include/LZOFactory.h (100%) rename Sources/{TunnelKitCoreObjC => _TunnelKitCoreObjC}/include/RoutingTable.h (100%) rename Sources/{TunnelKitCoreObjC => _TunnelKitCoreObjC}/include/RoutingTableEntry.h (100%) rename Sources/{TunnelKitCoreObjC => _TunnelKitCoreObjC}/include/ZeroingData.h (100%) rename Sources/{TunnelKitCoreObjC => _TunnelKitCoreObjC}/include/route.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/ControlPacket.m (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/CryptoAEAD.m (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/CryptoBox.m (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/CryptoCBC.m (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/CryptoCTR.m (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/DataPath.m (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/MSS.m (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/PacketMacros.m (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/PacketStream.m (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/ReplayProtector.m (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/TLSBox.m (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/CompressionAlgorithmNative.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/CompressionFramingNative.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/ControlPacket.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/Crypto.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/CryptoAEAD.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/CryptoBox.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/CryptoCBC.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/CryptoCTR.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/CryptoMacros.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/DataPath.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/DataPathCrypto.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/MSS.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/PacketMacros.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/PacketStream.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/ReplayProtector.h (100%) rename Sources/{TunnelKitOpenVPNObjC => _TunnelKitOpenVPNObjC}/include/TLSBox.h (100%) rename Sources/{InternalUtils => _TunnelKitUtils}/Data+Manipulation.swift (100%) rename Sources/{InternalUtils => _TunnelKitUtils}/NSRegularExpression+Shortcuts.swift (100%) rename Sources/{InternalUtils => _TunnelKitUtils}/Utils.swift (100%) diff --git a/Package.swift b/Package.swift index 3149f99..7e9b95e 100644 --- a/Package.swift +++ b/Package.swift @@ -11,20 +11,16 @@ let package = Package( products: [ // Products define the executables and libraries a package produces, and make them visible to other packages. .library( - name: "TunnelKitCore", - targets: ["TunnelKitCore"] + name: "TunnelKit", + targets: [ + "TunnelKitCore", + "TunnelKitAppExtension", + "TunnelKitManager" + ] ), .library( - name: "TunnelKitAppExtension", - targets: ["TunnelKitAppExtension"] - ), - .library( - name: "TunnelKitManager", - targets: ["TunnelKitManager"] - ), - .library( - name: "TunnelKitNative", - targets: ["TunnelKitNative"] + name: "TunnelKitIKE", + targets: ["TunnelKitIKE"] ), .library( name: "TunnelKitOpenVPN", @@ -47,11 +43,11 @@ let package = Package( .target( name: "TunnelKitCore", dependencies: [ - "InternalUtils", - "TunnelKitCoreObjC", + "_TunnelKitUtils", + "_TunnelKitCoreObjC", "SwiftyBeaver"]), .target( - name: "TunnelKitCoreObjC", + name: "_TunnelKitCoreObjC", dependencies: []), .target( name: "TunnelKitAppExtension", @@ -63,7 +59,7 @@ let package = Package( dependencies: [ "TunnelKitCore"]), .target( - name: "TunnelKitNative", + name: "TunnelKitIKE", dependencies: [ "TunnelKitCore", "TunnelKitManager"]), @@ -71,13 +67,13 @@ let package = Package( name: "TunnelKitOpenVPN", dependencies: [ "TunnelKitCore", - "TunnelKitOpenVPNObjC", + "_TunnelKitOpenVPNObjC", "TunnelKitAppExtension", "TunnelKitManager"]), .target( - name: "TunnelKitOpenVPNObjC", + name: "_TunnelKitOpenVPNObjC", dependencies: [ - "TunnelKitCoreObjC", + "_TunnelKitCoreObjC", "openssl-apple"]), .target( name: "TunnelKitLZO", @@ -88,20 +84,20 @@ let package = Package( "lib/README.LZO" ]), .target( - name: "InternalUtils", + name: "_TunnelKitUtils", dependencies: []), .testTarget( name: "TunnelKitCoreTests", dependencies: [ "TunnelKitCore", - "TunnelKitCoreObjC" + "_TunnelKitCoreObjC" ]), .testTarget( name: "TunnelKitOpenVPNTests", dependencies: [ "TunnelKitCoreTests", "TunnelKitOpenVPN", - "TunnelKitOpenVPNObjC", + "_TunnelKitOpenVPNObjC", "TunnelKitLZO" ], resources: [ diff --git a/Sources/TunnelKitCore/Errors.swift b/Sources/TunnelKitCore/Errors.swift index 80c81d2..27c3430 100644 --- a/Sources/TunnelKitCore/Errors.swift +++ b/Sources/TunnelKitCore/Errors.swift @@ -24,7 +24,7 @@ // import Foundation -import TunnelKitCoreObjC +import _TunnelKitCoreObjC extension Error { public func isTunnelKitError() -> Bool { diff --git a/Sources/TunnelKitCore/SecureRandom.swift b/Sources/TunnelKitCore/SecureRandom.swift index 6f6e57f..f343455 100644 --- a/Sources/TunnelKitCore/SecureRandom.swift +++ b/Sources/TunnelKitCore/SecureRandom.swift @@ -36,8 +36,8 @@ import Foundation import Security.SecRandom -import TunnelKitCoreObjC -import InternalUtils +import _TunnelKitCoreObjC +import _TunnelKitUtils /// :nodoc: public enum SecureRandomError: Error { diff --git a/Sources/TunnelKitCore/ZeroingData.swift b/Sources/TunnelKitCore/ZeroingData.swift index 87f2dce..bb4343d 100644 --- a/Sources/TunnelKitCore/ZeroingData.swift +++ b/Sources/TunnelKitCore/ZeroingData.swift @@ -35,7 +35,7 @@ // import Foundation -import TunnelKitCoreObjC +import _TunnelKitCoreObjC public func Z() -> ZeroingData { return ZeroingData() diff --git a/Sources/TunnelKitNative/NativeProvider.swift b/Sources/TunnelKitIKE/NativeProvider.swift similarity index 100% rename from Sources/TunnelKitNative/NativeProvider.swift rename to Sources/TunnelKitIKE/NativeProvider.swift diff --git a/Sources/TunnelKitLZO/include/Errors.h b/Sources/TunnelKitLZO/include/Errors.h index 51651c1..0a905c8 120000 --- a/Sources/TunnelKitLZO/include/Errors.h +++ b/Sources/TunnelKitLZO/include/Errors.h @@ -1 +1 @@ -../../TunnelKitCoreObjC/include/Errors.h \ No newline at end of file +../../_TunnelKitCoreObjC/include/Errors.h \ No newline at end of file diff --git a/Sources/TunnelKitOpenVPN/AppExtension/NETCPLink.swift b/Sources/TunnelKitOpenVPN/AppExtension/NETCPLink.swift index b49c172..6249f2b 100644 --- a/Sources/TunnelKitOpenVPN/AppExtension/NETCPLink.swift +++ b/Sources/TunnelKitOpenVPN/AppExtension/NETCPLink.swift @@ -27,7 +27,7 @@ import Foundation import NetworkExtension import TunnelKitCore import TunnelKitAppExtension -import TunnelKitOpenVPNObjC +import _TunnelKitOpenVPNObjC class NETCPLink: LinkInterface { private let impl: NWTCPConnection diff --git a/Sources/TunnelKitOpenVPN/AppExtension/OpenVPNTunnelProvider+Configuration.swift b/Sources/TunnelKitOpenVPN/AppExtension/OpenVPNTunnelProvider+Configuration.swift index 99f0f53..f76134f 100644 --- a/Sources/TunnelKitOpenVPN/AppExtension/OpenVPNTunnelProvider+Configuration.swift +++ b/Sources/TunnelKitOpenVPN/AppExtension/OpenVPNTunnelProvider+Configuration.swift @@ -38,9 +38,9 @@ import Foundation import NetworkExtension import SwiftyBeaver import TunnelKitCore -import TunnelKitCoreObjC +import _TunnelKitCoreObjC import TunnelKitAppExtension -import InternalUtils +import _TunnelKitUtils private let log = SwiftyBeaver.self diff --git a/Sources/TunnelKitOpenVPN/AppExtension/OpenVPNTunnelProvider.swift b/Sources/TunnelKitOpenVPN/AppExtension/OpenVPNTunnelProvider.swift index 97bad3d..9e82ca0 100644 --- a/Sources/TunnelKitOpenVPN/AppExtension/OpenVPNTunnelProvider.swift +++ b/Sources/TunnelKitOpenVPN/AppExtension/OpenVPNTunnelProvider.swift @@ -42,7 +42,7 @@ import SystemConfiguration.CaptiveNetwork import CoreWLAN #endif import TunnelKitCore -import TunnelKitCoreObjC +import _TunnelKitCoreObjC import TunnelKitAppExtension private let log = SwiftyBeaver.self diff --git a/Sources/TunnelKitOpenVPN/Authenticator.swift b/Sources/TunnelKitOpenVPN/Authenticator.swift index af42caf..4ac317b 100644 --- a/Sources/TunnelKitOpenVPN/Authenticator.swift +++ b/Sources/TunnelKitOpenVPN/Authenticator.swift @@ -37,8 +37,8 @@ import Foundation import SwiftyBeaver import TunnelKitCore -import TunnelKitCoreObjC -import TunnelKitOpenVPNObjC +import _TunnelKitCoreObjC +import _TunnelKitOpenVPNObjC private let log = SwiftyBeaver.self diff --git a/Sources/TunnelKitOpenVPN/CompressionAlgorithm.swift b/Sources/TunnelKitOpenVPN/CompressionAlgorithm.swift index ad7c2eb..faf918a 100644 --- a/Sources/TunnelKitOpenVPN/CompressionAlgorithm.swift +++ b/Sources/TunnelKitOpenVPN/CompressionAlgorithm.swift @@ -24,7 +24,7 @@ // import Foundation -import TunnelKitOpenVPNObjC +import _TunnelKitOpenVPNObjC extension OpenVPN { diff --git a/Sources/TunnelKitOpenVPN/CompressionFraming.swift b/Sources/TunnelKitOpenVPN/CompressionFraming.swift index dcca6b7..8281960 100644 --- a/Sources/TunnelKitOpenVPN/CompressionFraming.swift +++ b/Sources/TunnelKitOpenVPN/CompressionFraming.swift @@ -24,7 +24,7 @@ // import Foundation -import TunnelKitOpenVPNObjC +import _TunnelKitOpenVPNObjC extension OpenVPN { diff --git a/Sources/TunnelKitOpenVPN/ConfigurationParser.swift b/Sources/TunnelKitOpenVPN/ConfigurationParser.swift index 4b88c5f..9287dc7 100644 --- a/Sources/TunnelKitOpenVPN/ConfigurationParser.swift +++ b/Sources/TunnelKitOpenVPN/ConfigurationParser.swift @@ -26,8 +26,8 @@ import Foundation import SwiftyBeaver import TunnelKitCore -import TunnelKitCoreObjC -import InternalUtils +import _TunnelKitCoreObjC +import _TunnelKitUtils private let log = SwiftyBeaver.self diff --git a/Sources/TunnelKitOpenVPN/ControlChannel.swift b/Sources/TunnelKitOpenVPN/ControlChannel.swift index c7aca56..6360a7b 100644 --- a/Sources/TunnelKitOpenVPN/ControlChannel.swift +++ b/Sources/TunnelKitOpenVPN/ControlChannel.swift @@ -26,8 +26,8 @@ import Foundation import SwiftyBeaver import TunnelKitCore -import TunnelKitCoreObjC -import TunnelKitOpenVPNObjC +import _TunnelKitCoreObjC +import _TunnelKitOpenVPNObjC private let log = SwiftyBeaver.self diff --git a/Sources/TunnelKitOpenVPN/ControlChannelSerializer.swift b/Sources/TunnelKitOpenVPN/ControlChannelSerializer.swift index a207fdb..14f0d19 100644 --- a/Sources/TunnelKitOpenVPN/ControlChannelSerializer.swift +++ b/Sources/TunnelKitOpenVPN/ControlChannelSerializer.swift @@ -26,8 +26,8 @@ import Foundation import SwiftyBeaver import TunnelKitCore -import TunnelKitCoreObjC -import TunnelKitOpenVPNObjC +import _TunnelKitCoreObjC +import _TunnelKitOpenVPNObjC private let log = SwiftyBeaver.self diff --git a/Sources/TunnelKitOpenVPN/CoreConfiguration+OpenVPN.swift b/Sources/TunnelKitOpenVPN/CoreConfiguration+OpenVPN.swift index e6b9282..a0af610 100644 --- a/Sources/TunnelKitOpenVPN/CoreConfiguration+OpenVPN.swift +++ b/Sources/TunnelKitOpenVPN/CoreConfiguration+OpenVPN.swift @@ -36,8 +36,8 @@ import Foundation import TunnelKitCore -import TunnelKitCoreObjC -import TunnelKitOpenVPNObjC +import _TunnelKitCoreObjC +import _TunnelKitOpenVPNObjC extension CoreConfiguration { struct OpenVPN { diff --git a/Sources/TunnelKitOpenVPN/CryptoContainer.swift b/Sources/TunnelKitOpenVPN/CryptoContainer.swift index 3f36c67..2393cb5 100644 --- a/Sources/TunnelKitOpenVPN/CryptoContainer.swift +++ b/Sources/TunnelKitOpenVPN/CryptoContainer.swift @@ -35,7 +35,7 @@ // import Foundation -import TunnelKitOpenVPNObjC +import _TunnelKitOpenVPNObjC extension OpenVPN { diff --git a/Sources/TunnelKitOpenVPN/EncryptionBridge.swift b/Sources/TunnelKitOpenVPN/EncryptionBridge.swift index 1148d64..c5002e5 100644 --- a/Sources/TunnelKitOpenVPN/EncryptionBridge.swift +++ b/Sources/TunnelKitOpenVPN/EncryptionBridge.swift @@ -36,8 +36,8 @@ import Foundation import TunnelKitCore -import TunnelKitCoreObjC -import TunnelKitOpenVPNObjC +import _TunnelKitCoreObjC +import _TunnelKitOpenVPNObjC extension OpenVPN { class EncryptionBridge { diff --git a/Sources/TunnelKitOpenVPN/OpenVPN.swift b/Sources/TunnelKitOpenVPN/OpenVPN.swift index f9ece43..98619b4 100644 --- a/Sources/TunnelKitOpenVPN/OpenVPN.swift +++ b/Sources/TunnelKitOpenVPN/OpenVPN.swift @@ -25,8 +25,8 @@ import Foundation import TunnelKitCore -import TunnelKitCoreObjC -import TunnelKitOpenVPNObjC +import _TunnelKitCoreObjC +import _TunnelKitOpenVPNObjC /// Container for OpenVPN classes. public class OpenVPN { diff --git a/Sources/TunnelKitOpenVPN/OpenVPNSession.swift b/Sources/TunnelKitOpenVPN/OpenVPNSession.swift index 3928e10..aa49204 100644 --- a/Sources/TunnelKitOpenVPN/OpenVPNSession.swift +++ b/Sources/TunnelKitOpenVPN/OpenVPNSession.swift @@ -37,8 +37,8 @@ import Foundation import SwiftyBeaver import TunnelKitCore -import TunnelKitCoreObjC -import TunnelKitOpenVPNObjC +import _TunnelKitCoreObjC +import _TunnelKitOpenVPNObjC private let log = SwiftyBeaver.self diff --git a/Sources/TunnelKitOpenVPN/Packet.swift b/Sources/TunnelKitOpenVPN/Packet.swift index 05a0b81..fe39802 100644 --- a/Sources/TunnelKitOpenVPN/Packet.swift +++ b/Sources/TunnelKitOpenVPN/Packet.swift @@ -36,8 +36,8 @@ import Foundation import TunnelKitCore -import TunnelKitCoreObjC -import TunnelKitOpenVPNObjC +import _TunnelKitCoreObjC +import _TunnelKitOpenVPNObjC /// :nodoc: extension ControlPacket { diff --git a/Sources/TunnelKitOpenVPN/SessionKey.swift b/Sources/TunnelKitOpenVPN/SessionKey.swift index e8f572a..6adaa64 100644 --- a/Sources/TunnelKitOpenVPN/SessionKey.swift +++ b/Sources/TunnelKitOpenVPN/SessionKey.swift @@ -37,8 +37,8 @@ import Foundation import SwiftyBeaver import TunnelKitCore -import TunnelKitCoreObjC -import TunnelKitOpenVPNObjC +import _TunnelKitCoreObjC +import _TunnelKitOpenVPNObjC private let log = SwiftyBeaver.self diff --git a/Sources/TunnelKitOpenVPN/StaticKey.swift b/Sources/TunnelKitOpenVPN/StaticKey.swift index ee5961b..d2d2699 100644 --- a/Sources/TunnelKitOpenVPN/StaticKey.swift +++ b/Sources/TunnelKitOpenVPN/StaticKey.swift @@ -25,7 +25,7 @@ import Foundation import TunnelKitCore -import TunnelKitCoreObjC +import _TunnelKitCoreObjC extension OpenVPN { diff --git a/Sources/TunnelKitCoreObjC/Allocation.m b/Sources/_TunnelKitCoreObjC/Allocation.m similarity index 100% rename from Sources/TunnelKitCoreObjC/Allocation.m rename to Sources/_TunnelKitCoreObjC/Allocation.m diff --git a/Sources/TunnelKitCoreObjC/Errors.m b/Sources/_TunnelKitCoreObjC/Errors.m similarity index 100% rename from Sources/TunnelKitCoreObjC/Errors.m rename to Sources/_TunnelKitCoreObjC/Errors.m diff --git a/Sources/TunnelKitCoreObjC/LZOFactory.m b/Sources/_TunnelKitCoreObjC/LZOFactory.m similarity index 100% rename from Sources/TunnelKitCoreObjC/LZOFactory.m rename to Sources/_TunnelKitCoreObjC/LZOFactory.m diff --git a/Sources/TunnelKitCoreObjC/RoutingTable.m b/Sources/_TunnelKitCoreObjC/RoutingTable.m similarity index 100% rename from Sources/TunnelKitCoreObjC/RoutingTable.m rename to Sources/_TunnelKitCoreObjC/RoutingTable.m diff --git a/Sources/TunnelKitCoreObjC/RoutingTableEntry.m b/Sources/_TunnelKitCoreObjC/RoutingTableEntry.m similarity index 100% rename from Sources/TunnelKitCoreObjC/RoutingTableEntry.m rename to Sources/_TunnelKitCoreObjC/RoutingTableEntry.m diff --git a/Sources/TunnelKitCoreObjC/ZeroingData.m b/Sources/_TunnelKitCoreObjC/ZeroingData.m similarity index 100% rename from Sources/TunnelKitCoreObjC/ZeroingData.m rename to Sources/_TunnelKitCoreObjC/ZeroingData.m diff --git a/Sources/TunnelKitCoreObjC/include/Allocation.h b/Sources/_TunnelKitCoreObjC/include/Allocation.h similarity index 100% rename from Sources/TunnelKitCoreObjC/include/Allocation.h rename to Sources/_TunnelKitCoreObjC/include/Allocation.h diff --git a/Sources/TunnelKitCoreObjC/include/CompressionProvider.h b/Sources/_TunnelKitCoreObjC/include/CompressionProvider.h similarity index 100% rename from Sources/TunnelKitCoreObjC/include/CompressionProvider.h rename to Sources/_TunnelKitCoreObjC/include/CompressionProvider.h diff --git a/Sources/TunnelKitCoreObjC/include/Errors.h b/Sources/_TunnelKitCoreObjC/include/Errors.h similarity index 100% rename from Sources/TunnelKitCoreObjC/include/Errors.h rename to Sources/_TunnelKitCoreObjC/include/Errors.h diff --git a/Sources/TunnelKitCoreObjC/include/LZOFactory.h b/Sources/_TunnelKitCoreObjC/include/LZOFactory.h similarity index 100% rename from Sources/TunnelKitCoreObjC/include/LZOFactory.h rename to Sources/_TunnelKitCoreObjC/include/LZOFactory.h diff --git a/Sources/TunnelKitCoreObjC/include/RoutingTable.h b/Sources/_TunnelKitCoreObjC/include/RoutingTable.h similarity index 100% rename from Sources/TunnelKitCoreObjC/include/RoutingTable.h rename to Sources/_TunnelKitCoreObjC/include/RoutingTable.h diff --git a/Sources/TunnelKitCoreObjC/include/RoutingTableEntry.h b/Sources/_TunnelKitCoreObjC/include/RoutingTableEntry.h similarity index 100% rename from Sources/TunnelKitCoreObjC/include/RoutingTableEntry.h rename to Sources/_TunnelKitCoreObjC/include/RoutingTableEntry.h diff --git a/Sources/TunnelKitCoreObjC/include/ZeroingData.h b/Sources/_TunnelKitCoreObjC/include/ZeroingData.h similarity index 100% rename from Sources/TunnelKitCoreObjC/include/ZeroingData.h rename to Sources/_TunnelKitCoreObjC/include/ZeroingData.h diff --git a/Sources/TunnelKitCoreObjC/include/route.h b/Sources/_TunnelKitCoreObjC/include/route.h similarity index 100% rename from Sources/TunnelKitCoreObjC/include/route.h rename to Sources/_TunnelKitCoreObjC/include/route.h diff --git a/Sources/TunnelKitOpenVPNObjC/ControlPacket.m b/Sources/_TunnelKitOpenVPNObjC/ControlPacket.m similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/ControlPacket.m rename to Sources/_TunnelKitOpenVPNObjC/ControlPacket.m diff --git a/Sources/TunnelKitOpenVPNObjC/CryptoAEAD.m b/Sources/_TunnelKitOpenVPNObjC/CryptoAEAD.m similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/CryptoAEAD.m rename to Sources/_TunnelKitOpenVPNObjC/CryptoAEAD.m diff --git a/Sources/TunnelKitOpenVPNObjC/CryptoBox.m b/Sources/_TunnelKitOpenVPNObjC/CryptoBox.m similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/CryptoBox.m rename to Sources/_TunnelKitOpenVPNObjC/CryptoBox.m diff --git a/Sources/TunnelKitOpenVPNObjC/CryptoCBC.m b/Sources/_TunnelKitOpenVPNObjC/CryptoCBC.m similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/CryptoCBC.m rename to Sources/_TunnelKitOpenVPNObjC/CryptoCBC.m diff --git a/Sources/TunnelKitOpenVPNObjC/CryptoCTR.m b/Sources/_TunnelKitOpenVPNObjC/CryptoCTR.m similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/CryptoCTR.m rename to Sources/_TunnelKitOpenVPNObjC/CryptoCTR.m diff --git a/Sources/TunnelKitOpenVPNObjC/DataPath.m b/Sources/_TunnelKitOpenVPNObjC/DataPath.m similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/DataPath.m rename to Sources/_TunnelKitOpenVPNObjC/DataPath.m diff --git a/Sources/TunnelKitOpenVPNObjC/MSS.m b/Sources/_TunnelKitOpenVPNObjC/MSS.m similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/MSS.m rename to Sources/_TunnelKitOpenVPNObjC/MSS.m diff --git a/Sources/TunnelKitOpenVPNObjC/PacketMacros.m b/Sources/_TunnelKitOpenVPNObjC/PacketMacros.m similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/PacketMacros.m rename to Sources/_TunnelKitOpenVPNObjC/PacketMacros.m diff --git a/Sources/TunnelKitOpenVPNObjC/PacketStream.m b/Sources/_TunnelKitOpenVPNObjC/PacketStream.m similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/PacketStream.m rename to Sources/_TunnelKitOpenVPNObjC/PacketStream.m diff --git a/Sources/TunnelKitOpenVPNObjC/ReplayProtector.m b/Sources/_TunnelKitOpenVPNObjC/ReplayProtector.m similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/ReplayProtector.m rename to Sources/_TunnelKitOpenVPNObjC/ReplayProtector.m diff --git a/Sources/TunnelKitOpenVPNObjC/TLSBox.m b/Sources/_TunnelKitOpenVPNObjC/TLSBox.m similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/TLSBox.m rename to Sources/_TunnelKitOpenVPNObjC/TLSBox.m diff --git a/Sources/TunnelKitOpenVPNObjC/include/CompressionAlgorithmNative.h b/Sources/_TunnelKitOpenVPNObjC/include/CompressionAlgorithmNative.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/CompressionAlgorithmNative.h rename to Sources/_TunnelKitOpenVPNObjC/include/CompressionAlgorithmNative.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/CompressionFramingNative.h b/Sources/_TunnelKitOpenVPNObjC/include/CompressionFramingNative.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/CompressionFramingNative.h rename to Sources/_TunnelKitOpenVPNObjC/include/CompressionFramingNative.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/ControlPacket.h b/Sources/_TunnelKitOpenVPNObjC/include/ControlPacket.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/ControlPacket.h rename to Sources/_TunnelKitOpenVPNObjC/include/ControlPacket.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/Crypto.h b/Sources/_TunnelKitOpenVPNObjC/include/Crypto.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/Crypto.h rename to Sources/_TunnelKitOpenVPNObjC/include/Crypto.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/CryptoAEAD.h b/Sources/_TunnelKitOpenVPNObjC/include/CryptoAEAD.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/CryptoAEAD.h rename to Sources/_TunnelKitOpenVPNObjC/include/CryptoAEAD.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/CryptoBox.h b/Sources/_TunnelKitOpenVPNObjC/include/CryptoBox.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/CryptoBox.h rename to Sources/_TunnelKitOpenVPNObjC/include/CryptoBox.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/CryptoCBC.h b/Sources/_TunnelKitOpenVPNObjC/include/CryptoCBC.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/CryptoCBC.h rename to Sources/_TunnelKitOpenVPNObjC/include/CryptoCBC.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/CryptoCTR.h b/Sources/_TunnelKitOpenVPNObjC/include/CryptoCTR.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/CryptoCTR.h rename to Sources/_TunnelKitOpenVPNObjC/include/CryptoCTR.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/CryptoMacros.h b/Sources/_TunnelKitOpenVPNObjC/include/CryptoMacros.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/CryptoMacros.h rename to Sources/_TunnelKitOpenVPNObjC/include/CryptoMacros.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/DataPath.h b/Sources/_TunnelKitOpenVPNObjC/include/DataPath.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/DataPath.h rename to Sources/_TunnelKitOpenVPNObjC/include/DataPath.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/DataPathCrypto.h b/Sources/_TunnelKitOpenVPNObjC/include/DataPathCrypto.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/DataPathCrypto.h rename to Sources/_TunnelKitOpenVPNObjC/include/DataPathCrypto.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/MSS.h b/Sources/_TunnelKitOpenVPNObjC/include/MSS.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/MSS.h rename to Sources/_TunnelKitOpenVPNObjC/include/MSS.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/PacketMacros.h b/Sources/_TunnelKitOpenVPNObjC/include/PacketMacros.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/PacketMacros.h rename to Sources/_TunnelKitOpenVPNObjC/include/PacketMacros.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/PacketStream.h b/Sources/_TunnelKitOpenVPNObjC/include/PacketStream.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/PacketStream.h rename to Sources/_TunnelKitOpenVPNObjC/include/PacketStream.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/ReplayProtector.h b/Sources/_TunnelKitOpenVPNObjC/include/ReplayProtector.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/ReplayProtector.h rename to Sources/_TunnelKitOpenVPNObjC/include/ReplayProtector.h diff --git a/Sources/TunnelKitOpenVPNObjC/include/TLSBox.h b/Sources/_TunnelKitOpenVPNObjC/include/TLSBox.h similarity index 100% rename from Sources/TunnelKitOpenVPNObjC/include/TLSBox.h rename to Sources/_TunnelKitOpenVPNObjC/include/TLSBox.h diff --git a/Sources/InternalUtils/Data+Manipulation.swift b/Sources/_TunnelKitUtils/Data+Manipulation.swift similarity index 100% rename from Sources/InternalUtils/Data+Manipulation.swift rename to Sources/_TunnelKitUtils/Data+Manipulation.swift diff --git a/Sources/InternalUtils/NSRegularExpression+Shortcuts.swift b/Sources/_TunnelKitUtils/NSRegularExpression+Shortcuts.swift similarity index 100% rename from Sources/InternalUtils/NSRegularExpression+Shortcuts.swift rename to Sources/_TunnelKitUtils/NSRegularExpression+Shortcuts.swift diff --git a/Sources/InternalUtils/Utils.swift b/Sources/_TunnelKitUtils/Utils.swift similarity index 100% rename from Sources/InternalUtils/Utils.swift rename to Sources/_TunnelKitUtils/Utils.swift diff --git a/Tests/TunnelKitCoreTests/RoutingTests.swift b/Tests/TunnelKitCoreTests/RoutingTests.swift index 412893c..0ae2b88 100644 --- a/Tests/TunnelKitCoreTests/RoutingTests.swift +++ b/Tests/TunnelKitCoreTests/RoutingTests.swift @@ -24,7 +24,7 @@ // import XCTest -import TunnelKitCoreObjC +import _TunnelKitCoreObjC class RoutingTests: XCTestCase { diff --git a/Tests/TunnelKitLZOTests/CompressionTests.swift b/Tests/TunnelKitLZOTests/CompressionTests.swift index 1f6732b..c2113c9 100644 --- a/Tests/TunnelKitLZOTests/CompressionTests.swift +++ b/Tests/TunnelKitLZOTests/CompressionTests.swift @@ -25,7 +25,7 @@ import XCTest @testable import TunnelKitCore -import TunnelKitCoreObjC +import _TunnelKitCoreObjC import TunnelKitLZO class CompressionTests: XCTestCase { diff --git a/Tests/TunnelKitOpenVPNTests/ControlChannelTests.swift b/Tests/TunnelKitOpenVPNTests/ControlChannelTests.swift index 5187cb0..9f0d172 100644 --- a/Tests/TunnelKitOpenVPNTests/ControlChannelTests.swift +++ b/Tests/TunnelKitOpenVPNTests/ControlChannelTests.swift @@ -25,9 +25,9 @@ import XCTest @testable import TunnelKitCore -import TunnelKitCoreObjC +import _TunnelKitCoreObjC @testable import TunnelKitOpenVPN -import TunnelKitOpenVPNObjC +import _TunnelKitOpenVPNObjC class ControlChannelTests: XCTestCase { private let hex = "634a4d2d459d606c8e6abbec168fdcd1871462eaa2eaed84c8f403bdf8c7da737d81b5774cc35fe0a42b38aa053f1335fd4a22d721880433bbb20ae1f2d88315b2d186b3b377685506fa39d85d38da16c2ecc0d631bda64f9d8f5a8d073f18aab97ade23e49ea9e7de86784d1ed5fa356df5f7fa1d163e5537efa8d4ba61239dc301a9aa55de0e06e33a7545f7d0cc153405576464ba92942dafa5fb79c7a60663ff1e7da3122ae09d4561653bef3eeb312ad68b191e2f94cbcf4e21caff0b59f8be86567bd21787070c2dc10a8baf7e87ce2e07d7d7de25ead11bd6d6e6ec030c0a3fd50d2d0ca3c0378022bb642e954868d7b93e18a131ecbb12b0bbedb1ce" diff --git a/Tests/TunnelKitOpenVPNTests/DataPathEncryptionTests.swift b/Tests/TunnelKitOpenVPNTests/DataPathEncryptionTests.swift index ff12b0f..1809a29 100644 --- a/Tests/TunnelKitOpenVPNTests/DataPathEncryptionTests.swift +++ b/Tests/TunnelKitOpenVPNTests/DataPathEncryptionTests.swift @@ -36,8 +36,8 @@ import XCTest @testable import TunnelKitCore -import TunnelKitCoreObjC -import TunnelKitOpenVPNObjC +import _TunnelKitCoreObjC +import _TunnelKitOpenVPNObjC class DataPathEncryptionTests: XCTestCase { private let cipherKey = try! SecureRandom.safeData(length: 32) diff --git a/Tests/TunnelKitOpenVPNTests/DataPathPerformanceTests.swift b/Tests/TunnelKitOpenVPNTests/DataPathPerformanceTests.swift index acc735f..39add8d 100644 --- a/Tests/TunnelKitOpenVPNTests/DataPathPerformanceTests.swift +++ b/Tests/TunnelKitOpenVPNTests/DataPathPerformanceTests.swift @@ -37,7 +37,7 @@ import XCTest @testable import TunnelKitCore @testable import TunnelKitOpenVPN -import TunnelKitOpenVPNObjC +import _TunnelKitOpenVPNObjC import TunnelKitCoreTests class DataPathPerformanceTests: XCTestCase { diff --git a/Tests/TunnelKitOpenVPNTests/EncryptionPerformanceTests.swift b/Tests/TunnelKitOpenVPNTests/EncryptionPerformanceTests.swift index c5aa3d8..2de3553 100644 --- a/Tests/TunnelKitOpenVPNTests/EncryptionPerformanceTests.swift +++ b/Tests/TunnelKitOpenVPNTests/EncryptionPerformanceTests.swift @@ -36,8 +36,8 @@ import XCTest @testable import TunnelKitCore -import TunnelKitCoreObjC -import TunnelKitOpenVPNObjC +import _TunnelKitCoreObjC +import _TunnelKitOpenVPNObjC import TunnelKitCoreTests class EncryptionPerformanceTests: XCTestCase { diff --git a/Tests/TunnelKitOpenVPNTests/EncryptionTests.swift b/Tests/TunnelKitOpenVPNTests/EncryptionTests.swift index 7d0c173..3aadac3 100644 --- a/Tests/TunnelKitOpenVPNTests/EncryptionTests.swift +++ b/Tests/TunnelKitOpenVPNTests/EncryptionTests.swift @@ -36,9 +36,9 @@ import XCTest @testable import TunnelKitCore -import TunnelKitCoreObjC +import _TunnelKitCoreObjC import TunnelKitOpenVPN -import TunnelKitOpenVPNObjC +import _TunnelKitOpenVPNObjC class EncryptionTests: XCTestCase { private var cipherEncKey: ZeroingData! diff --git a/Tests/TunnelKitOpenVPNTests/LinkTests.swift b/Tests/TunnelKitOpenVPNTests/LinkTests.swift index 86a202c..aa4a06b 100644 --- a/Tests/TunnelKitOpenVPNTests/LinkTests.swift +++ b/Tests/TunnelKitOpenVPNTests/LinkTests.swift @@ -36,7 +36,7 @@ import XCTest @testable import TunnelKitCore -@testable import TunnelKitCoreObjC +@testable import _TunnelKitCoreObjC import TunnelKitCoreTests class LinkTests: XCTestCase { diff --git a/Tests/TunnelKitOpenVPNTests/PacketTests.swift b/Tests/TunnelKitOpenVPNTests/PacketTests.swift index 3e67f2d..fbbc9b4 100644 --- a/Tests/TunnelKitOpenVPNTests/PacketTests.swift +++ b/Tests/TunnelKitOpenVPNTests/PacketTests.swift @@ -25,7 +25,7 @@ import XCTest @testable import TunnelKitCore -import TunnelKitOpenVPNObjC +import _TunnelKitOpenVPNObjC class PacketTests: XCTestCase { diff --git a/Tests/TunnelKitOpenVPNTests/TestUtils+OpenVPN.swift b/Tests/TunnelKitOpenVPNTests/TestUtils+OpenVPN.swift index 78db63b..9873711 100644 --- a/Tests/TunnelKitOpenVPNTests/TestUtils+OpenVPN.swift +++ b/Tests/TunnelKitOpenVPNTests/TestUtils+OpenVPN.swift @@ -36,8 +36,8 @@ import Foundation @testable import TunnelKitCore -import TunnelKitCoreObjC -import TunnelKitOpenVPNObjC +import _TunnelKitCoreObjC +import _TunnelKitOpenVPNObjC extension Encrypter { func encryptData(_ data: Data, flags: UnsafePointer?) throws -> Data {