passepartoutvpn
/
tunnelkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Regroup targets 

Prefix "internal" modules with underscore.
This commit is contained in:
Davide De Rosa 2021-10-29 23:21:52 +02:00
parent 0978b973eb
commit 92fd620771
77 changed files with 66 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Package.swift
View File

@ -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: [

2
Sources/TunnelKitCore/Errors.swift
View File

@ -24,7 +24,7 @@
//
import Foundation
import TunnelKitCoreObjC
import _TunnelKitCoreObjC
extension Error {
public func isTunnelKitError() -> Bool {

4
Sources/TunnelKitCore/SecureRandom.swift
View File

@ -36,8 +36,8 @@
import Foundation
import Security.SecRandom
import TunnelKitCoreObjC
import InternalUtils
import _TunnelKitCoreObjC
import _TunnelKitUtils
/// :nodoc:
public enum SecureRandomError: Error {

2
Sources/TunnelKitCore/ZeroingData.swift
View File

@ -35,7 +35,7 @@
//
import Foundation
import TunnelKitCoreObjC
import _TunnelKitCoreObjC
public func Z() -> ZeroingData {
return ZeroingData()

0
Sources/TunnelKitNative/NativeProvider.swift → Sources/TunnelKitIKE/NativeProvider.swift
View File

2
Sources/TunnelKitLZO/include/Errors.h
View File

@ -1 +1 @@
../../TunnelKitCoreObjC/include/Errors.h
../../_TunnelKitCoreObjC/include/Errors.h

2
Sources/TunnelKitOpenVPN/AppExtension/NETCPLink.swift
View File

@ -27,7 +27,7 @@ import Foundation
import NetworkExtension
import TunnelKitCore
import TunnelKitAppExtension
import TunnelKitOpenVPNObjC
import _TunnelKitOpenVPNObjC
class NETCPLink: LinkInterface {
private let impl: NWTCPConnection

4
Sources/TunnelKitOpenVPN/AppExtension/OpenVPNTunnelProvider+Configuration.swift
View File

@ -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

2
Sources/TunnelKitOpenVPN/AppExtension/OpenVPNTunnelProvider.swift
View File

@ -42,7 +42,7 @@ import SystemConfiguration.CaptiveNetwork
import CoreWLAN
#endif
import TunnelKitCore
import TunnelKitCoreObjC
import _TunnelKitCoreObjC
import TunnelKitAppExtension
private let log = SwiftyBeaver.self

4
Sources/TunnelKitOpenVPN/Authenticator.swift
View File

@ -37,8 +37,8 @@
import Foundation
import SwiftyBeaver
import TunnelKitCore
import TunnelKitCoreObjC
import TunnelKitOpenVPNObjC
import _TunnelKitCoreObjC
import _TunnelKitOpenVPNObjC
private let log = SwiftyBeaver.self

2
Sources/TunnelKitOpenVPN/CompressionAlgorithm.swift
View File

@ -24,7 +24,7 @@
//
import Foundation
import TunnelKitOpenVPNObjC
import _TunnelKitOpenVPNObjC
extension OpenVPN {

2
Sources/TunnelKitOpenVPN/CompressionFraming.swift
View File

@ -24,7 +24,7 @@
//
import Foundation
import TunnelKitOpenVPNObjC
import _TunnelKitOpenVPNObjC
extension OpenVPN {

4
Sources/TunnelKitOpenVPN/ConfigurationParser.swift
View File

@ -26,8 +26,8 @@
import Foundation
import SwiftyBeaver
import TunnelKitCore
import TunnelKitCoreObjC
import InternalUtils
import _TunnelKitCoreObjC
import _TunnelKitUtils
private let log = SwiftyBeaver.self

4
Sources/TunnelKitOpenVPN/ControlChannel.swift
View File

@ -26,8 +26,8 @@
import Foundation
import SwiftyBeaver
import TunnelKitCore
import TunnelKitCoreObjC
import TunnelKitOpenVPNObjC
import _TunnelKitCoreObjC
import _TunnelKitOpenVPNObjC
private let log = SwiftyBeaver.self

4
Sources/TunnelKitOpenVPN/ControlChannelSerializer.swift
View File

@ -26,8 +26,8 @@
import Foundation
import SwiftyBeaver
import TunnelKitCore
import TunnelKitCoreObjC
import TunnelKitOpenVPNObjC
import _TunnelKitCoreObjC
import _TunnelKitOpenVPNObjC
private let log = SwiftyBeaver.self

4
Sources/TunnelKitOpenVPN/CoreConfiguration+OpenVPN.swift
View File

@ -36,8 +36,8 @@
import Foundation
import TunnelKitCore
import TunnelKitCoreObjC
import TunnelKitOpenVPNObjC
import _TunnelKitCoreObjC
import _TunnelKitOpenVPNObjC
extension CoreConfiguration {
struct OpenVPN {

2
Sources/TunnelKitOpenVPN/CryptoContainer.swift
View File

@ -35,7 +35,7 @@
//
import Foundation
import TunnelKitOpenVPNObjC
import _TunnelKitOpenVPNObjC
extension OpenVPN {

4
Sources/TunnelKitOpenVPN/EncryptionBridge.swift
View File

@ -36,8 +36,8 @@
import Foundation
import TunnelKitCore
import TunnelKitCoreObjC
import TunnelKitOpenVPNObjC
import _TunnelKitCoreObjC
import _TunnelKitOpenVPNObjC
extension OpenVPN {
class EncryptionBridge {

4
Sources/TunnelKitOpenVPN/OpenVPN.swift
View File

@ -25,8 +25,8 @@
import Foundation
import TunnelKitCore
import TunnelKitCoreObjC
import TunnelKitOpenVPNObjC
import _TunnelKitCoreObjC
import _TunnelKitOpenVPNObjC
/// Container for OpenVPN classes.
public class OpenVPN {

4
Sources/TunnelKitOpenVPN/OpenVPNSession.swift
View File

@ -37,8 +37,8 @@
import Foundation
import SwiftyBeaver
import TunnelKitCore
import TunnelKitCoreObjC
import TunnelKitOpenVPNObjC
import _TunnelKitCoreObjC
import _TunnelKitOpenVPNObjC
private let log = SwiftyBeaver.self

4
Sources/TunnelKitOpenVPN/Packet.swift
View File

@ -36,8 +36,8 @@
import Foundation
import TunnelKitCore
import TunnelKitCoreObjC
import TunnelKitOpenVPNObjC
import _TunnelKitCoreObjC
import _TunnelKitOpenVPNObjC
/// :nodoc:
extension ControlPacket {

4
Sources/TunnelKitOpenVPN/SessionKey.swift
View File

@ -37,8 +37,8 @@
import Foundation
import SwiftyBeaver
import TunnelKitCore
import TunnelKitCoreObjC
import TunnelKitOpenVPNObjC
import _TunnelKitCoreObjC
import _TunnelKitOpenVPNObjC
private let log = SwiftyBeaver.self

2
Sources/TunnelKitOpenVPN/StaticKey.swift
View File

@ -25,7 +25,7 @@
import Foundation
import TunnelKitCore
import TunnelKitCoreObjC
import _TunnelKitCoreObjC
extension OpenVPN {

0
Sources/TunnelKitCoreObjC/Allocation.m → Sources/_TunnelKitCoreObjC/Allocation.m
View File

0
Sources/TunnelKitCoreObjC/Errors.m → Sources/_TunnelKitCoreObjC/Errors.m
View File

0
Sources/TunnelKitCoreObjC/LZOFactory.m → Sources/_TunnelKitCoreObjC/LZOFactory.m
View File

0
Sources/TunnelKitCoreObjC/RoutingTable.m → Sources/_TunnelKitCoreObjC/RoutingTable.m
View File

0
Sources/TunnelKitCoreObjC/RoutingTableEntry.m → Sources/_TunnelKitCoreObjC/RoutingTableEntry.m
View File

0
Sources/TunnelKitCoreObjC/ZeroingData.m → Sources/_TunnelKitCoreObjC/ZeroingData.m
View File

0
Sources/TunnelKitCoreObjC/include/Allocation.h → Sources/_TunnelKitCoreObjC/include/Allocation.h
View File

0
Sources/TunnelKitCoreObjC/include/CompressionProvider.h → Sources/_TunnelKitCoreObjC/include/CompressionProvider.h
View File

0
Sources/TunnelKitCoreObjC/include/Errors.h → Sources/_TunnelKitCoreObjC/include/Errors.h
View File

0
Sources/TunnelKitCoreObjC/include/LZOFactory.h → Sources/_TunnelKitCoreObjC/include/LZOFactory.h
View File

0
Sources/TunnelKitCoreObjC/include/RoutingTable.h → Sources/_TunnelKitCoreObjC/include/RoutingTable.h
View File

0
Sources/TunnelKitCoreObjC/include/RoutingTableEntry.h → Sources/_TunnelKitCoreObjC/include/RoutingTableEntry.h
View File

0
Sources/TunnelKitCoreObjC/include/ZeroingData.h → Sources/_TunnelKitCoreObjC/include/ZeroingData.h
View File

0
Sources/TunnelKitCoreObjC/include/route.h → Sources/_TunnelKitCoreObjC/include/route.h
View File

0
Sources/TunnelKitOpenVPNObjC/ControlPacket.m → Sources/_TunnelKitOpenVPNObjC/ControlPacket.m
View File

0
Sources/TunnelKitOpenVPNObjC/CryptoAEAD.m → Sources/_TunnelKitOpenVPNObjC/CryptoAEAD.m
View File

0
Sources/TunnelKitOpenVPNObjC/CryptoBox.m → Sources/_TunnelKitOpenVPNObjC/CryptoBox.m
View File

0
Sources/TunnelKitOpenVPNObjC/CryptoCBC.m → Sources/_TunnelKitOpenVPNObjC/CryptoCBC.m
View File

0
Sources/TunnelKitOpenVPNObjC/CryptoCTR.m → Sources/_TunnelKitOpenVPNObjC/CryptoCTR.m
View File

0
Sources/TunnelKitOpenVPNObjC/DataPath.m → Sources/_TunnelKitOpenVPNObjC/DataPath.m
View File

0
Sources/TunnelKitOpenVPNObjC/MSS.m → Sources/_TunnelKitOpenVPNObjC/MSS.m
View File

0
Sources/TunnelKitOpenVPNObjC/PacketMacros.m → Sources/_TunnelKitOpenVPNObjC/PacketMacros.m
View File

0
Sources/TunnelKitOpenVPNObjC/PacketStream.m → Sources/_TunnelKitOpenVPNObjC/PacketStream.m
View File

0
Sources/TunnelKitOpenVPNObjC/ReplayProtector.m → Sources/_TunnelKitOpenVPNObjC/ReplayProtector.m
View File

0
Sources/TunnelKitOpenVPNObjC/TLSBox.m → Sources/_TunnelKitOpenVPNObjC/TLSBox.m
View File

0
Sources/TunnelKitOpenVPNObjC/include/CompressionAlgorithmNative.h → Sources/_TunnelKitOpenVPNObjC/include/CompressionAlgorithmNative.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/CompressionFramingNative.h → Sources/_TunnelKitOpenVPNObjC/include/CompressionFramingNative.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/ControlPacket.h → Sources/_TunnelKitOpenVPNObjC/include/ControlPacket.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/Crypto.h → Sources/_TunnelKitOpenVPNObjC/include/Crypto.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/CryptoAEAD.h → Sources/_TunnelKitOpenVPNObjC/include/CryptoAEAD.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/CryptoBox.h → Sources/_TunnelKitOpenVPNObjC/include/CryptoBox.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/CryptoCBC.h → Sources/_TunnelKitOpenVPNObjC/include/CryptoCBC.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/CryptoCTR.h → Sources/_TunnelKitOpenVPNObjC/include/CryptoCTR.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/CryptoMacros.h → Sources/_TunnelKitOpenVPNObjC/include/CryptoMacros.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/DataPath.h → Sources/_TunnelKitOpenVPNObjC/include/DataPath.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/DataPathCrypto.h → Sources/_TunnelKitOpenVPNObjC/include/DataPathCrypto.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/MSS.h → Sources/_TunnelKitOpenVPNObjC/include/MSS.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/PacketMacros.h → Sources/_TunnelKitOpenVPNObjC/include/PacketMacros.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/PacketStream.h → Sources/_TunnelKitOpenVPNObjC/include/PacketStream.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/ReplayProtector.h → Sources/_TunnelKitOpenVPNObjC/include/ReplayProtector.h
View File

0
Sources/TunnelKitOpenVPNObjC/include/TLSBox.h → Sources/_TunnelKitOpenVPNObjC/include/TLSBox.h
View File

0
Sources/InternalUtils/Data+Manipulation.swift → Sources/_TunnelKitUtils/Data+Manipulation.swift
View File

0
Sources/InternalUtils/NSRegularExpression+Shortcuts.swift → Sources/_TunnelKitUtils/NSRegularExpression+Shortcuts.swift
View File

0
Sources/InternalUtils/Utils.swift → Sources/_TunnelKitUtils/Utils.swift
View File

2
Tests/TunnelKitCoreTests/RoutingTests.swift
View File

@ -24,7 +24,7 @@
//
import XCTest
import TunnelKitCoreObjC
import _TunnelKitCoreObjC
class RoutingTests: XCTestCase {

2
Tests/TunnelKitLZOTests/CompressionTests.swift
View File

@ -25,7 +25,7 @@
import XCTest
@testable import TunnelKitCore
import TunnelKitCoreObjC
import _TunnelKitCoreObjC
import TunnelKitLZO
class CompressionTests: XCTestCase {

4
Tests/TunnelKitOpenVPNTests/ControlChannelTests.swift
View File

@ -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"

4
Tests/TunnelKitOpenVPNTests/DataPathEncryptionTests.swift
View File

@ -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)

2
Tests/TunnelKitOpenVPNTests/DataPathPerformanceTests.swift
View File

@ -37,7 +37,7 @@
import XCTest
@testable import TunnelKitCore
@testable import TunnelKitOpenVPN
import TunnelKitOpenVPNObjC
import _TunnelKitOpenVPNObjC
import TunnelKitCoreTests
class DataPathPerformanceTests: XCTestCase {

4
Tests/TunnelKitOpenVPNTests/EncryptionPerformanceTests.swift
View File

@ -36,8 +36,8 @@
import XCTest
@testable import TunnelKitCore
import TunnelKitCoreObjC
import TunnelKitOpenVPNObjC
import _TunnelKitCoreObjC
import _TunnelKitOpenVPNObjC
import TunnelKitCoreTests
class EncryptionPerformanceTests: XCTestCase {

4
Tests/TunnelKitOpenVPNTests/EncryptionTests.swift
View File

@ -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!

2
Tests/TunnelKitOpenVPNTests/LinkTests.swift
View File

@ -36,7 +36,7 @@
import XCTest
@testable import TunnelKitCore
@testable import TunnelKitCoreObjC
@testable import _TunnelKitCoreObjC
import TunnelKitCoreTests
class LinkTests: XCTestCase {

2
Tests/TunnelKitOpenVPNTests/PacketTests.swift
View File

@ -25,7 +25,7 @@
import XCTest
@testable import TunnelKitCore
import TunnelKitOpenVPNObjC
import _TunnelKitOpenVPNObjC
class PacketTests: XCTestCase {

4
Tests/TunnelKitOpenVPNTests/TestUtils+OpenVPN.swift
View File

@ -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<CryptoFlags>?) throws -> Data {