From 0ce97c2f55052e3ece74bfdbdba242108aadc463 Mon Sep 17 00:00:00 2001 From: FranzBusch Date: Tue, 29 Mar 2022 15:46:25 +0100 Subject: [PATCH 1/2] Import concrete NIO modules # Motivation We should import the correct NIO submodules instead of the umbrella. # Modification Fix up import statements # Result We are now importing the proper submodules --- Package.swift | 15 ++++++++++----- Sources/NIOSSH/ByteBuffer+SSH.swift | 2 +- .../Child Channels/ChildChannelOptions.swift | 2 +- .../Child Channels/ChildChannelUserEvents.swift | 2 +- .../NIOSSH/Child Channels/SSHChannelData.swift | 2 +- .../Child Channels/SSHChannelMultiplexer.swift | 2 +- .../NIOSSH/Child Channels/SSHChannelType.swift | 2 +- .../NIOSSH/Child Channels/SSHChildChannel.swift | 2 +- .../Operations/SendsChannelMessages.swift | 2 +- .../Operations/SendsKeyExchangeMessages.swift | 2 +- .../Operations/SendsUserAuthMessages.swift | 2 +- .../SSHConnectionStateMachine.swift | 2 +- .../States/ActiveState.swift | 2 +- .../States/KeyExchangeState.swift | 2 +- .../States/ReceivedKexInitWhenActiveState.swift | 2 +- .../States/ReceivedNewKeysState.swift | 2 +- .../States/RekeyingReceivedNewKeysState.swift | 2 +- .../States/RekeyingSentNewKeysState.swift | 2 +- .../States/RekeyingState.swift | 2 +- .../States/SentKexInitWhenActiveState.swift | 2 +- .../States/SentNewKeysState.swift | 2 +- .../States/SentVersionState.swift | 2 +- .../States/UserAuthenticationState.swift | 2 +- Sources/NIOSSH/GlobalRequestDelegate.swift | 2 +- .../NIOSSH/Key Exchange/ECDHCompatibleKey.swift | 2 +- .../Key Exchange/EllipticCurveKeyExchange.swift | 2 +- .../Key Exchange/SSHKeyExchangeResult.swift | 2 +- .../Key Exchange/SSHKeyExchangeStateMachine.swift | 2 +- .../ClientServerAuthenticationDelegate.swift | 2 +- .../NIOSSHCertifiedPublicKey.swift | 2 +- .../Keys And Signatures/NIOSSHPrivateKey.swift | 2 +- .../Keys And Signatures/NIOSSHPublicKey.swift | 2 +- .../Keys And Signatures/NIOSSHSignature.swift | 2 +- Sources/NIOSSH/NIOSSHHandler.swift | 2 +- Sources/NIOSSH/SSHEncryptablePacketPayload.swift | 2 +- Sources/NIOSSH/SSHMessages.swift | 2 +- Sources/NIOSSH/SSHPacketParser.swift | 2 +- Sources/NIOSSH/SSHPacketSerializer.swift | 2 +- Sources/NIOSSH/SSHTerminalModes.swift | 2 +- Sources/NIOSSH/TransportProtection/AESGCM.swift | 2 +- .../SSHTransportProtection.swift | 2 +- .../ClientUserAuthenticationDelegate.swift | 2 +- .../DenyAllServerAuthDelegate.swift | 2 +- .../ServerUserAuthenticationDelegate.swift | 2 +- .../SimplePasswordDelegate.swift | 2 +- .../UserAuthSignablePayload.swift | 2 +- .../UserAuthenticationMethod.swift | 2 +- .../UserAuthenticationStateMachine.swift | 2 +- Sources/NIOSSHClient/ExecHandler.swift | 3 ++- Sources/NIOSSHClient/GlueHandler.swift | 2 +- .../InteractivePasswordPromptDelegate.swift | 2 +- Sources/NIOSSHClient/PortForwardingServer.swift | 3 ++- Sources/NIOSSHClient/main.swift | 3 ++- .../BenchmarkHandshake.swift | 2 +- .../BenchmarkLinearThroughput.swift | 2 +- Sources/NIOSSHPerformanceTester/main.swift | 2 +- Sources/NIOSSHPerformanceTester/shared.swift | 3 ++- Sources/NIOSSHServer/DataToBufferCodec.swift | 3 ++- Sources/NIOSSHServer/ExecHandler.swift | 3 ++- Sources/NIOSSHServer/GlueHandler.swift | 2 +- Sources/NIOSSHServer/RemotePortForwarding.swift | 3 ++- Sources/NIOSSHServer/main.swift | 3 ++- Tests/NIOSSHTests/AESGCMTests.swift | 2 +- Tests/NIOSSHTests/ByteBuffer+SSHTests.swift | 2 +- Tests/NIOSSHTests/CertifiedKeyTests.swift | 2 +- .../ChildChannelMultiplexerTests.swift | 3 ++- Tests/NIOSSHTests/ECKeyExchangeTests.swift | 2 +- Tests/NIOSSHTests/EndToEndTests.swift | 3 ++- Tests/NIOSSHTests/FuzzResultTests.swift | 3 ++- Tests/NIOSSHTests/HostKeyTests.swift | 2 +- .../SSHConnectionStateMachineTests.swift | 3 ++- Tests/NIOSSHTests/SSHEncryptedTrafficTests.swift | 2 +- Tests/NIOSSHTests/SSHHandlerTests.swift | 3 ++- .../SSHKeyExchangeStateMachineTests.swift | 3 ++- Tests/NIOSSHTests/SSHMessagesTests.swift | 2 +- Tests/NIOSSHTests/SSHPackerSerializerTests.swift | 2 +- Tests/NIOSSHTests/SSHPacketParserTests.swift | 2 +- .../UserAuthenticationStateMachineTests.swift | 3 ++- Tests/NIOSSHTests/Utilities.swift | 2 +- 79 files changed, 103 insertions(+), 83 deletions(-) diff --git a/Package.swift b/Package.swift index 3c9c3b1..30bd66f 100644 --- a/Package.swift +++ b/Package.swift @@ -34,7 +34,8 @@ let package = Package( .target( name: "NIOSSH", dependencies: [ - .product(name: "NIO", package: "swift-nio"), + .product(name: "NIOCore", package: "swift-nio"), + .product(name: "NIOConcurrencyHelpers", package: "swift-nio"), .product(name: "NIOFoundationCompat", package: "swift-nio"), .product(name: "Crypto", package: "swift-crypto"), ] @@ -43,7 +44,8 @@ let package = Package( name: "NIOSSHClient", dependencies: [ "NIOSSH", - .product(name: "NIO", package: "swift-nio"), + .product(name: "NIOCore", package: "swift-nio"), + .product(name: "NIOPosix", package: "swift-nio"), .product(name: "NIOConcurrencyHelpers", package: "swift-nio"), ] ), @@ -51,7 +53,8 @@ let package = Package( name: "NIOSSHServer", dependencies: [ "NIOSSH", - .product(name: "NIO", package: "swift-nio"), + .product(name: "NIOCore", package: "swift-nio"), + .product(name: "NIOPosix", package: "swift-nio"), .product(name: "NIOFoundationCompat", package: "swift-nio"), .product(name: "Crypto", package: "swift-crypto"), ] @@ -60,7 +63,8 @@ let package = Package( name: "NIOSSHPerformanceTester", dependencies: [ "NIOSSH", - .product(name: "NIO", package: "swift-nio"), + .product(name: "NIOCore", package: "swift-nio"), + .product(name: "NIOEmbedded", package: "swift-nio"), .product(name: "Crypto", package: "swift-crypto"), ] ), @@ -68,7 +72,8 @@ let package = Package( name: "NIOSSHTests", dependencies: [ "NIOSSH", - .product(name: "NIO", package: "swift-nio"), + .product(name: "NIOCore", package: "swift-nio"), + .product(name: "NIOEmbedded", package: "swift-nio"), .product(name: "NIOFoundationCompat", package: "swift-nio"), ] ), diff --git a/Sources/NIOSSH/ByteBuffer+SSH.swift b/Sources/NIOSSH/ByteBuffer+SSH.swift index ba6277e..def36c5 100644 --- a/Sources/NIOSSH/ByteBuffer+SSH.swift +++ b/Sources/NIOSSH/ByteBuffer+SSH.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore extension ByteBuffer { /// Gets an SSH boolean field from a `ByteBuffer`. diff --git a/Sources/NIOSSH/Child Channels/ChildChannelOptions.swift b/Sources/NIOSSH/Child Channels/ChildChannelOptions.swift index f7ea562..ac28f8b 100644 --- a/Sources/NIOSSH/Child Channels/ChildChannelOptions.swift +++ b/Sources/NIOSSH/Child Channels/ChildChannelOptions.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// The various channel options specific to `SSHChildChannel`s. /// diff --git a/Sources/NIOSSH/Child Channels/ChildChannelUserEvents.swift b/Sources/NIOSSH/Child Channels/ChildChannelUserEvents.swift index ae3bc07..ed1559f 100644 --- a/Sources/NIOSSH/Child Channels/ChildChannelUserEvents.swift +++ b/Sources/NIOSSH/Child Channels/ChildChannelUserEvents.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// A namespace for SSH channel request events. public enum SSHChannelRequestEvent { diff --git a/Sources/NIOSSH/Child Channels/SSHChannelData.swift b/Sources/NIOSSH/Child Channels/SSHChannelData.swift index 91273c8..16ec0cd 100644 --- a/Sources/NIOSSH/Child Channels/SSHChannelData.swift +++ b/Sources/NIOSSH/Child Channels/SSHChannelData.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// `SSHChannelData` is the data type that is passed around in `SSHChildChannel` objects. /// diff --git a/Sources/NIOSSH/Child Channels/SSHChannelMultiplexer.swift b/Sources/NIOSSH/Child Channels/SSHChannelMultiplexer.swift index 1638460..ff03346 100644 --- a/Sources/NIOSSH/Child Channels/SSHChannelMultiplexer.swift +++ b/Sources/NIOSSH/Child Channels/SSHChannelMultiplexer.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// An object that controls multiplexing messages to multiple child channels. final class SSHChannelMultiplexer { diff --git a/Sources/NIOSSH/Child Channels/SSHChannelType.swift b/Sources/NIOSSH/Child Channels/SSHChannelType.swift index fbc25f5..a156353 100644 --- a/Sources/NIOSSH/Child Channels/SSHChannelType.swift +++ b/Sources/NIOSSH/Child Channels/SSHChannelType.swift @@ -11,7 +11,7 @@ // SPDX-License-Identifier: Apache-2.0 // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// `SSHChannelType` represents the type of a single SSH channel. /// diff --git a/Sources/NIOSSH/Child Channels/SSHChildChannel.swift b/Sources/NIOSSH/Child Channels/SSHChildChannel.swift index 32d2fec..0d59034 100644 --- a/Sources/NIOSSH/Child Channels/SSHChildChannel.swift +++ b/Sources/NIOSSH/Child Channels/SSHChildChannel.swift @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -import NIO import NIOConcurrencyHelpers +import NIOCore /// A NIO `Channel` that encapsulates a single SSH `Channel`. /// diff --git a/Sources/NIOSSH/Connection State Machine/Operations/SendsChannelMessages.swift b/Sources/NIOSSH/Connection State Machine/Operations/SendsChannelMessages.swift index c577d8e..4a3521a 100644 --- a/Sources/NIOSSH/Connection State Machine/Operations/SendsChannelMessages.swift +++ b/Sources/NIOSSH/Connection State Machine/Operations/SendsChannelMessages.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore // Right now this doesn't do that much, but we may use it in future for supporting re-keying. protocol SendsChannelMessages { diff --git a/Sources/NIOSSH/Connection State Machine/Operations/SendsKeyExchangeMessages.swift b/Sources/NIOSSH/Connection State Machine/Operations/SendsKeyExchangeMessages.swift index e654477..21c13f1 100644 --- a/Sources/NIOSSH/Connection State Machine/Operations/SendsKeyExchangeMessages.swift +++ b/Sources/NIOSSH/Connection State Machine/Operations/SendsKeyExchangeMessages.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore protocol SendsKeyExchangeMessages { var keyExchangeStateMachine: SSHKeyExchangeStateMachine { get set } diff --git a/Sources/NIOSSH/Connection State Machine/Operations/SendsUserAuthMessages.swift b/Sources/NIOSSH/Connection State Machine/Operations/SendsUserAuthMessages.swift index c92f180..5ff59ec 100644 --- a/Sources/NIOSSH/Connection State Machine/Operations/SendsUserAuthMessages.swift +++ b/Sources/NIOSSH/Connection State Machine/Operations/SendsUserAuthMessages.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore protocol SendsUserAuthMessages { var userAuthStateMachine: UserAuthenticationStateMachine { get set } diff --git a/Sources/NIOSSH/Connection State Machine/SSHConnectionStateMachine.swift b/Sources/NIOSSH/Connection State Machine/SSHConnectionStateMachine.swift index 5502556..56d473b 100644 --- a/Sources/NIOSSH/Connection State Machine/SSHConnectionStateMachine.swift +++ b/Sources/NIOSSH/Connection State Machine/SSHConnectionStateMachine.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore struct SSHConnectionStateMachine { enum State { diff --git a/Sources/NIOSSH/Connection State Machine/States/ActiveState.swift b/Sources/NIOSSH/Connection State Machine/States/ActiveState.swift index c243fac..70ee709 100644 --- a/Sources/NIOSSH/Connection State Machine/States/ActiveState.swift +++ b/Sources/NIOSSH/Connection State Machine/States/ActiveState.swift @@ -11,7 +11,7 @@ // SPDX-License-Identifier: Apache-2.0 // //===----------------------------------------------------------------------===// -import NIO +import NIOCore extension SSHConnectionStateMachine { /// The state of a state machine that has completed user auth and key exchange and is diff --git a/Sources/NIOSSH/Connection State Machine/States/KeyExchangeState.swift b/Sources/NIOSSH/Connection State Machine/States/KeyExchangeState.swift index 983326a..50f13ae 100644 --- a/Sources/NIOSSH/Connection State Machine/States/KeyExchangeState.swift +++ b/Sources/NIOSSH/Connection State Machine/States/KeyExchangeState.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore extension SSHConnectionStateMachine { /// The state of a state machine that is actively engaged in a key exchange operation. diff --git a/Sources/NIOSSH/Connection State Machine/States/ReceivedKexInitWhenActiveState.swift b/Sources/NIOSSH/Connection State Machine/States/ReceivedKexInitWhenActiveState.swift index 751b078..c8f53e4 100644 --- a/Sources/NIOSSH/Connection State Machine/States/ReceivedKexInitWhenActiveState.swift +++ b/Sources/NIOSSH/Connection State Machine/States/ReceivedKexInitWhenActiveState.swift @@ -11,7 +11,7 @@ // SPDX-License-Identifier: Apache-2.0 // //===----------------------------------------------------------------------===// -import NIO +import NIOCore extension SSHConnectionStateMachine { /// The state of a state machine that has received a KeyExchangeInit message after diff --git a/Sources/NIOSSH/Connection State Machine/States/ReceivedNewKeysState.swift b/Sources/NIOSSH/Connection State Machine/States/ReceivedNewKeysState.swift index e7ac34a..f183d3d 100644 --- a/Sources/NIOSSH/Connection State Machine/States/ReceivedNewKeysState.swift +++ b/Sources/NIOSSH/Connection State Machine/States/ReceivedNewKeysState.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore extension SSHConnectionStateMachine { /// The state of a state machine that has receoved new keys after a key exchange operation, diff --git a/Sources/NIOSSH/Connection State Machine/States/RekeyingReceivedNewKeysState.swift b/Sources/NIOSSH/Connection State Machine/States/RekeyingReceivedNewKeysState.swift index 37a9c5b..7caa796 100644 --- a/Sources/NIOSSH/Connection State Machine/States/RekeyingReceivedNewKeysState.swift +++ b/Sources/NIOSSH/Connection State Machine/States/RekeyingReceivedNewKeysState.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore extension SSHConnectionStateMachine { /// The state of a state machine that has received new keys after a key exchange operation from active, diff --git a/Sources/NIOSSH/Connection State Machine/States/RekeyingSentNewKeysState.swift b/Sources/NIOSSH/Connection State Machine/States/RekeyingSentNewKeysState.swift index 9e6af70..95c0865 100644 --- a/Sources/NIOSSH/Connection State Machine/States/RekeyingSentNewKeysState.swift +++ b/Sources/NIOSSH/Connection State Machine/States/RekeyingSentNewKeysState.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore extension SSHConnectionStateMachine { /// The state of a state machine that has sent new keys after a key exchange operation from an active channel, diff --git a/Sources/NIOSSH/Connection State Machine/States/RekeyingState.swift b/Sources/NIOSSH/Connection State Machine/States/RekeyingState.swift index 000e415..cbeea56 100644 --- a/Sources/NIOSSH/Connection State Machine/States/RekeyingState.swift +++ b/Sources/NIOSSH/Connection State Machine/States/RekeyingState.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore extension SSHConnectionStateMachine { /// The state of a state machine that is actively engaged in a key exchange operation having been active before. diff --git a/Sources/NIOSSH/Connection State Machine/States/SentKexInitWhenActiveState.swift b/Sources/NIOSSH/Connection State Machine/States/SentKexInitWhenActiveState.swift index df89697..5af0890 100644 --- a/Sources/NIOSSH/Connection State Machine/States/SentKexInitWhenActiveState.swift +++ b/Sources/NIOSSH/Connection State Machine/States/SentKexInitWhenActiveState.swift @@ -11,7 +11,7 @@ // SPDX-License-Identifier: Apache-2.0 // //===----------------------------------------------------------------------===// -import NIO +import NIOCore extension SSHConnectionStateMachine { /// The state of a state machine that has sent a KeyExchangeInit message after diff --git a/Sources/NIOSSH/Connection State Machine/States/SentNewKeysState.swift b/Sources/NIOSSH/Connection State Machine/States/SentNewKeysState.swift index 5452fb5..53b637f 100644 --- a/Sources/NIOSSH/Connection State Machine/States/SentNewKeysState.swift +++ b/Sources/NIOSSH/Connection State Machine/States/SentNewKeysState.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore extension SSHConnectionStateMachine { /// The state of a state machine that has sent new keys after a key exchange operation, diff --git a/Sources/NIOSSH/Connection State Machine/States/SentVersionState.swift b/Sources/NIOSSH/Connection State Machine/States/SentVersionState.swift index a7a83fb..4c85b83 100644 --- a/Sources/NIOSSH/Connection State Machine/States/SentVersionState.swift +++ b/Sources/NIOSSH/Connection State Machine/States/SentVersionState.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore extension SSHConnectionStateMachine { /// The state of a state machine that has sent its version header. diff --git a/Sources/NIOSSH/Connection State Machine/States/UserAuthenticationState.swift b/Sources/NIOSSH/Connection State Machine/States/UserAuthenticationState.swift index 7b6d2b7..847e53d 100644 --- a/Sources/NIOSSH/Connection State Machine/States/UserAuthenticationState.swift +++ b/Sources/NIOSSH/Connection State Machine/States/UserAuthenticationState.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore extension SSHConnectionStateMachine { /// The state of a state machine that is actively engaged in a user authentication operation. diff --git a/Sources/NIOSSH/GlobalRequestDelegate.swift b/Sources/NIOSSH/GlobalRequestDelegate.swift index 8fdbd5c..19347bf 100644 --- a/Sources/NIOSSH/GlobalRequestDelegate.swift +++ b/Sources/NIOSSH/GlobalRequestDelegate.swift @@ -11,7 +11,7 @@ // SPDX-License-Identifier: Apache-2.0 // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// A `GlobalRequestDelegate` is used by an SSH server to handle SSH global requests. /// diff --git a/Sources/NIOSSH/Key Exchange/ECDHCompatibleKey.swift b/Sources/NIOSSH/Key Exchange/ECDHCompatibleKey.swift index 5528597..4b8e981 100644 --- a/Sources/NIOSSH/Key Exchange/ECDHCompatibleKey.swift +++ b/Sources/NIOSSH/Key Exchange/ECDHCompatibleKey.swift @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore import NIOFoundationCompat /// This protocol represents a public key that is capable of performing an ECDH key exchange in SSH. diff --git a/Sources/NIOSSH/Key Exchange/EllipticCurveKeyExchange.swift b/Sources/NIOSSH/Key Exchange/EllipticCurveKeyExchange.swift index 566a27e..548c2e1 100644 --- a/Sources/NIOSSH/Key Exchange/EllipticCurveKeyExchange.swift +++ b/Sources/NIOSSH/Key Exchange/EllipticCurveKeyExchange.swift @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore import NIOFoundationCompat /// This protocol defines a container used by the key exchange state machine to manage key exchange. diff --git a/Sources/NIOSSH/Key Exchange/SSHKeyExchangeResult.swift b/Sources/NIOSSH/Key Exchange/SSHKeyExchangeResult.swift index c93e14b..8c9e394 100644 --- a/Sources/NIOSSH/Key Exchange/SSHKeyExchangeResult.swift +++ b/Sources/NIOSSH/Key Exchange/SSHKeyExchangeResult.swift @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore /// The result of a round of key exchange. /// diff --git a/Sources/NIOSSH/Key Exchange/SSHKeyExchangeStateMachine.swift b/Sources/NIOSSH/Key Exchange/SSHKeyExchangeStateMachine.swift index 4326efe..350baaa 100644 --- a/Sources/NIOSSH/Key Exchange/SSHKeyExchangeStateMachine.swift +++ b/Sources/NIOSSH/Key Exchange/SSHKeyExchangeStateMachine.swift @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore struct SSHKeyExchangeStateMachine { enum SSHKeyExchangeError: Error { diff --git a/Sources/NIOSSH/Keys And Signatures/ClientServerAuthenticationDelegate.swift b/Sources/NIOSSH/Keys And Signatures/ClientServerAuthenticationDelegate.swift index b68525c..401f9e6 100644 --- a/Sources/NIOSSH/Keys And Signatures/ClientServerAuthenticationDelegate.swift +++ b/Sources/NIOSSH/Keys And Signatures/ClientServerAuthenticationDelegate.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// A `NIOSSHClientSErverAuthenticationDelegate` is an object that can validate whether /// a server host key is trusted. diff --git a/Sources/NIOSSH/Keys And Signatures/NIOSSHCertifiedPublicKey.swift b/Sources/NIOSSH/Keys And Signatures/NIOSSHCertifiedPublicKey.swift index 0d50e14..41deb06 100644 --- a/Sources/NIOSSH/Keys And Signatures/NIOSSHCertifiedPublicKey.swift +++ b/Sources/NIOSSH/Keys And Signatures/NIOSSHCertifiedPublicKey.swift @@ -14,7 +14,7 @@ import Crypto import Dispatch -import NIO +import NIOCore /// A `NIOSSHCertifiedPublicKey` is an SSH public key combined with an SSH certificate. /// diff --git a/Sources/NIOSSH/Keys And Signatures/NIOSSHPrivateKey.swift b/Sources/NIOSSH/Keys And Signatures/NIOSSHPrivateKey.swift index 32f0529..2b16dbc 100644 --- a/Sources/NIOSSH/Keys And Signatures/NIOSSHPrivateKey.swift +++ b/Sources/NIOSSH/Keys And Signatures/NIOSSHPrivateKey.swift @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore /// An SSH private key. /// diff --git a/Sources/NIOSSH/Keys And Signatures/NIOSSHPublicKey.swift b/Sources/NIOSSH/Keys And Signatures/NIOSSHPublicKey.swift index aea810d..efa6206 100644 --- a/Sources/NIOSSH/Keys And Signatures/NIOSSHPublicKey.swift +++ b/Sources/NIOSSH/Keys And Signatures/NIOSSHPublicKey.swift @@ -14,7 +14,7 @@ import Crypto import Foundation -import NIO +import NIOCore /// An SSH public key. /// diff --git a/Sources/NIOSSH/Keys And Signatures/NIOSSHSignature.swift b/Sources/NIOSSH/Keys And Signatures/NIOSSHSignature.swift index 9e9cf0f..8872507 100644 --- a/Sources/NIOSSH/Keys And Signatures/NIOSSHSignature.swift +++ b/Sources/NIOSSH/Keys And Signatures/NIOSSHSignature.swift @@ -14,7 +14,7 @@ import Crypto import Foundation -import NIO +import NIOCore import NIOFoundationCompat /// A representation of an SSH signature. diff --git a/Sources/NIOSSH/NIOSSHHandler.swift b/Sources/NIOSSH/NIOSSHHandler.swift index ca00b15..0428851 100644 --- a/Sources/NIOSSH/NIOSSHHandler.swift +++ b/Sources/NIOSSH/NIOSSHHandler.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// A `ChannelDuplexHandler` that implements the SSH protocol. /// diff --git a/Sources/NIOSSH/SSHEncryptablePacketPayload.swift b/Sources/NIOSSH/SSHEncryptablePacketPayload.swift index c1af81e..4e987e5 100644 --- a/Sources/NIOSSH/SSHEncryptablePacketPayload.swift +++ b/Sources/NIOSSH/SSHEncryptablePacketPayload.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// An SSH payload that can be encrypted. /// diff --git a/Sources/NIOSSH/SSHMessages.swift b/Sources/NIOSSH/SSHMessages.swift index 45a0011..1720216 100644 --- a/Sources/NIOSSH/SSHMessages.swift +++ b/Sources/NIOSSH/SSHMessages.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore // MARK: - Types diff --git a/Sources/NIOSSH/SSHPacketParser.swift b/Sources/NIOSSH/SSHPacketParser.swift index 68f3727..787dbe6 100644 --- a/Sources/NIOSSH/SSHPacketParser.swift +++ b/Sources/NIOSSH/SSHPacketParser.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore struct SSHPacketParser { enum State { diff --git a/Sources/NIOSSH/SSHPacketSerializer.swift b/Sources/NIOSSH/SSHPacketSerializer.swift index 825408c..1ab96b7 100644 --- a/Sources/NIOSSH/SSHPacketSerializer.swift +++ b/Sources/NIOSSH/SSHPacketSerializer.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore struct SSHPacketSerializer { enum State { diff --git a/Sources/NIOSSH/SSHTerminalModes.swift b/Sources/NIOSSH/SSHTerminalModes.swift index 9061cc9..73b3e91 100644 --- a/Sources/NIOSSH/SSHTerminalModes.swift +++ b/Sources/NIOSSH/SSHTerminalModes.swift @@ -11,7 +11,7 @@ // SPDX-License-Identifier: Apache-2.0 // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// This structure represents the SSH understanding of POSIX terminal modes. /// diff --git a/Sources/NIOSSH/TransportProtection/AESGCM.swift b/Sources/NIOSSH/TransportProtection/AESGCM.swift index 1ed945b..3cc1503 100644 --- a/Sources/NIOSSH/TransportProtection/AESGCM.swift +++ b/Sources/NIOSSH/TransportProtection/AESGCM.swift @@ -14,7 +14,7 @@ import Crypto import Foundation -import NIO +import NIOCore import NIOFoundationCompat /// A base class for the AES GCM transport protection implementations. diff --git a/Sources/NIOSSH/TransportProtection/SSHTransportProtection.swift b/Sources/NIOSSH/TransportProtection/SSHTransportProtection.swift index 991169a..5b7ba97 100644 --- a/Sources/NIOSSH/TransportProtection/SSHTransportProtection.swift +++ b/Sources/NIOSSH/TransportProtection/SSHTransportProtection.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// A scheme that protects an SSH transport. /// diff --git a/Sources/NIOSSH/User Authentication/ClientUserAuthenticationDelegate.swift b/Sources/NIOSSH/User Authentication/ClientUserAuthenticationDelegate.swift index ce1dd6b..53070ec 100644 --- a/Sources/NIOSSH/User Authentication/ClientUserAuthenticationDelegate.swift +++ b/Sources/NIOSSH/User Authentication/ClientUserAuthenticationDelegate.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// A `NIOSSHClientUserAuthenticationDelegate` is an object that can provide a sequence of /// SSH user authentication methods based on the the acceptable list from the server. diff --git a/Sources/NIOSSH/User Authentication/DenyAllServerAuthDelegate.swift b/Sources/NIOSSH/User Authentication/DenyAllServerAuthDelegate.swift index 8de2114..13e49c9 100644 --- a/Sources/NIOSSH/User Authentication/DenyAllServerAuthDelegate.swift +++ b/Sources/NIOSSH/User Authentication/DenyAllServerAuthDelegate.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// A server user authentication delegate that denies all authentication attempts. /// diff --git a/Sources/NIOSSH/User Authentication/ServerUserAuthenticationDelegate.swift b/Sources/NIOSSH/User Authentication/ServerUserAuthenticationDelegate.swift index de71b80..5512273 100644 --- a/Sources/NIOSSH/User Authentication/ServerUserAuthenticationDelegate.swift +++ b/Sources/NIOSSH/User Authentication/ServerUserAuthenticationDelegate.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// A `NIOSSHServerUserAuthenticationDelegate` is an object that can authorize users. /// diff --git a/Sources/NIOSSH/User Authentication/SimplePasswordDelegate.swift b/Sources/NIOSSH/User Authentication/SimplePasswordDelegate.swift index ca96460..7e8be80 100644 --- a/Sources/NIOSSH/User Authentication/SimplePasswordDelegate.swift +++ b/Sources/NIOSSH/User Authentication/SimplePasswordDelegate.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// A straightforward `NIOSSHUserAuthenticationDelegate` that makes one attempt to sign in with a single username and password combination. public final class SimplePasswordDelegate { diff --git a/Sources/NIOSSH/User Authentication/UserAuthSignablePayload.swift b/Sources/NIOSSH/User Authentication/UserAuthSignablePayload.swift index bcd162e..fce8834 100644 --- a/Sources/NIOSSH/User Authentication/UserAuthSignablePayload.swift +++ b/Sources/NIOSSH/User Authentication/UserAuthSignablePayload.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// A `UserAuthSignablePayload` represents the data that needs to be signed as part /// of key-based user authentication. diff --git a/Sources/NIOSSH/User Authentication/UserAuthenticationMethod.swift b/Sources/NIOSSH/User Authentication/UserAuthenticationMethod.swift index e2371ac..c8f28e3 100644 --- a/Sources/NIOSSH/User Authentication/UserAuthenticationMethod.swift +++ b/Sources/NIOSSH/User Authentication/UserAuthenticationMethod.swift @@ -11,7 +11,7 @@ // SPDX-License-Identifier: Apache-2.0 // //===----------------------------------------------------------------------===// -import NIO +import NIOCore /// The user authentication modes available at this point in time. public struct NIOSSHAvailableUserAuthenticationMethods: OptionSet { diff --git a/Sources/NIOSSH/User Authentication/UserAuthenticationStateMachine.swift b/Sources/NIOSSH/User Authentication/UserAuthenticationStateMachine.swift index 879548b..df4fd3f 100644 --- a/Sources/NIOSSH/User Authentication/UserAuthenticationStateMachine.swift +++ b/Sources/NIOSSH/User Authentication/UserAuthenticationStateMachine.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore struct UserAuthenticationStateMachine { private var state: State diff --git a/Sources/NIOSSHClient/ExecHandler.swift b/Sources/NIOSSHClient/ExecHandler.swift index 43ed149..2bca12d 100644 --- a/Sources/NIOSSHClient/ExecHandler.swift +++ b/Sources/NIOSSHClient/ExecHandler.swift @@ -13,7 +13,8 @@ //===----------------------------------------------------------------------===// import Dispatch -import NIO +import NIOCore +import NIOPosix import NIOSSH final class ExampleExecHandler: ChannelDuplexHandler { diff --git a/Sources/NIOSSHClient/GlueHandler.swift b/Sources/NIOSSHClient/GlueHandler.swift index d48b7b7..a0dc72e 100644 --- a/Sources/NIOSSHClient/GlueHandler.swift +++ b/Sources/NIOSSHClient/GlueHandler.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore final class GlueHandler { private var partner: GlueHandler? diff --git a/Sources/NIOSSHClient/InteractivePasswordPromptDelegate.swift b/Sources/NIOSSHClient/InteractivePasswordPromptDelegate.swift index f615cc1..26642e9 100644 --- a/Sources/NIOSSHClient/InteractivePasswordPromptDelegate.swift +++ b/Sources/NIOSSHClient/InteractivePasswordPromptDelegate.swift @@ -14,7 +14,7 @@ import Dispatch import Foundation -import NIO +import NIOCore import NIOSSH /// A client user auth delegate that provides an interactive prompt for password-based user auth. diff --git a/Sources/NIOSSHClient/PortForwardingServer.swift b/Sources/NIOSSHClient/PortForwardingServer.swift index caa7767..efe0605 100644 --- a/Sources/NIOSSHClient/PortForwardingServer.swift +++ b/Sources/NIOSSHClient/PortForwardingServer.swift @@ -11,7 +11,8 @@ // SPDX-License-Identifier: Apache-2.0 // //===----------------------------------------------------------------------===// -import NIO +import NIOCore +import NIOPosix import NIOSSH final class PortForwardingServer { diff --git a/Sources/NIOSSHClient/main.swift b/Sources/NIOSSHClient/main.swift index 652c9b7..ef2e46f 100644 --- a/Sources/NIOSSHClient/main.swift +++ b/Sources/NIOSSHClient/main.swift @@ -13,7 +13,8 @@ //===----------------------------------------------------------------------===// import Dispatch -import NIO +import NIOCore +import NIOPosix import NIOSSH // This file contains an example NIO SSH client. As NIO SSH is currently under active diff --git a/Sources/NIOSSHPerformanceTester/BenchmarkHandshake.swift b/Sources/NIOSSHPerformanceTester/BenchmarkHandshake.swift index 05723cf..5d9cf57 100644 --- a/Sources/NIOSSHPerformanceTester/BenchmarkHandshake.swift +++ b/Sources/NIOSSHPerformanceTester/BenchmarkHandshake.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore import NIOSSH final class BenchmarkHandshake: Benchmark { diff --git a/Sources/NIOSSHPerformanceTester/BenchmarkLinearThroughput.swift b/Sources/NIOSSHPerformanceTester/BenchmarkLinearThroughput.swift index 69bb1a5..5ff9b90 100644 --- a/Sources/NIOSSHPerformanceTester/BenchmarkLinearThroughput.swift +++ b/Sources/NIOSSHPerformanceTester/BenchmarkLinearThroughput.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore import NIOSSH final class BenchmarkLinearThroughput: Benchmark { diff --git a/Sources/NIOSSHPerformanceTester/main.swift b/Sources/NIOSSHPerformanceTester/main.swift index 9f0a7bf..f73972f 100644 --- a/Sources/NIOSSHPerformanceTester/main.swift +++ b/Sources/NIOSSHPerformanceTester/main.swift @@ -15,7 +15,7 @@ import Crypto import Dispatch import Foundation -import NIO +import NIOCore import NIOSSH // MARK: Test Harness diff --git a/Sources/NIOSSHPerformanceTester/shared.swift b/Sources/NIOSSHPerformanceTester/shared.swift index 14fbb88..54c6314 100644 --- a/Sources/NIOSSHPerformanceTester/shared.swift +++ b/Sources/NIOSSHPerformanceTester/shared.swift @@ -12,7 +12,8 @@ // //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore +import NIOEmbedded import NIOSSH class BackToBackEmbeddedChannel { diff --git a/Sources/NIOSSHServer/DataToBufferCodec.swift b/Sources/NIOSSHServer/DataToBufferCodec.swift index 93addb3..32f455f 100644 --- a/Sources/NIOSSHServer/DataToBufferCodec.swift +++ b/Sources/NIOSSHServer/DataToBufferCodec.swift @@ -14,8 +14,9 @@ import Dispatch import Foundation -import NIO +import NIOCore import NIOFoundationCompat +import NIOPosix import NIOSSH final class DataToBufferCodec: ChannelDuplexHandler { diff --git a/Sources/NIOSSHServer/ExecHandler.swift b/Sources/NIOSSHServer/ExecHandler.swift index 7e3c20d..9867483 100644 --- a/Sources/NIOSSHServer/ExecHandler.swift +++ b/Sources/NIOSSHServer/ExecHandler.swift @@ -14,8 +14,9 @@ import Dispatch import Foundation -import NIO +import NIOCore import NIOFoundationCompat +import NIOPosix import NIOSSH enum SSHServerError: Error { diff --git a/Sources/NIOSSHServer/GlueHandler.swift b/Sources/NIOSSHServer/GlueHandler.swift index d48b7b7..a0dc72e 100644 --- a/Sources/NIOSSHServer/GlueHandler.swift +++ b/Sources/NIOSSHServer/GlueHandler.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore final class GlueHandler { private var partner: GlueHandler? diff --git a/Sources/NIOSSHServer/RemotePortForwarding.swift b/Sources/NIOSSHServer/RemotePortForwarding.swift index 41ebc17..35ab8f3 100644 --- a/Sources/NIOSSHServer/RemotePortForwarding.swift +++ b/Sources/NIOSSHServer/RemotePortForwarding.swift @@ -14,8 +14,9 @@ import Dispatch import Foundation -import NIO +import NIOCore import NIOFoundationCompat +import NIOPosix import NIOSSH // Remote port forwarding is a fun feature of SSH where a client can ask an SSH server to listen on a local diff --git a/Sources/NIOSSHServer/main.swift b/Sources/NIOSSHServer/main.swift index fdb924e..d4b2a31 100644 --- a/Sources/NIOSSHServer/main.swift +++ b/Sources/NIOSSHServer/main.swift @@ -14,7 +14,8 @@ import Crypto import Dispatch -import NIO +import NIOCore +import NIOPosix import NIOSSH // This file contains an example NIO SSH server. It's not intended for production use, it's not secure, diff --git a/Tests/NIOSSHTests/AESGCMTests.swift b/Tests/NIOSSHTests/AESGCMTests.swift index 5c56514..2b46fbc 100644 --- a/Tests/NIOSSHTests/AESGCMTests.swift +++ b/Tests/NIOSSHTests/AESGCMTests.swift @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore import NIOFoundationCompat @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/ByteBuffer+SSHTests.swift b/Tests/NIOSSHTests/ByteBuffer+SSHTests.swift index 6519c76..792352a 100644 --- a/Tests/NIOSSHTests/ByteBuffer+SSHTests.swift +++ b/Tests/NIOSSHTests/ByteBuffer+SSHTests.swift @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/CertifiedKeyTests.swift b/Tests/NIOSSHTests/CertifiedKeyTests.swift index 7db514b..f9610d5 100644 --- a/Tests/NIOSSHTests/CertifiedKeyTests.swift +++ b/Tests/NIOSSHTests/CertifiedKeyTests.swift @@ -14,7 +14,7 @@ import Crypto import Foundation -import NIO +import NIOCore @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/ChildChannelMultiplexerTests.swift b/Tests/NIOSSHTests/ChildChannelMultiplexerTests.swift index 0f816c2..284bba9 100644 --- a/Tests/NIOSSHTests/ChildChannelMultiplexerTests.swift +++ b/Tests/NIOSSHTests/ChildChannelMultiplexerTests.swift @@ -12,7 +12,8 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore +import NIOEmbedded @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/ECKeyExchangeTests.swift b/Tests/NIOSSHTests/ECKeyExchangeTests.swift index 3c29b94..76fd012 100644 --- a/Tests/NIOSSHTests/ECKeyExchangeTests.swift +++ b/Tests/NIOSSHTests/ECKeyExchangeTests.swift @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/EndToEndTests.swift b/Tests/NIOSSHTests/EndToEndTests.swift index e921eb8..3e5c3a8 100644 --- a/Tests/NIOSSHTests/EndToEndTests.swift +++ b/Tests/NIOSSHTests/EndToEndTests.swift @@ -13,7 +13,8 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore +import NIOEmbedded @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/FuzzResultTests.swift b/Tests/NIOSSHTests/FuzzResultTests.swift index b3dfd1b..2d9d7dc 100644 --- a/Tests/NIOSSHTests/FuzzResultTests.swift +++ b/Tests/NIOSSHTests/FuzzResultTests.swift @@ -14,7 +14,8 @@ import Crypto import Foundation -import NIO +import NIOCore +import NIOEmbedded import NIOFoundationCompat import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/HostKeyTests.swift b/Tests/NIOSSHTests/HostKeyTests.swift index 7cc9bde..5ca1b3b 100644 --- a/Tests/NIOSSHTests/HostKeyTests.swift +++ b/Tests/NIOSSHTests/HostKeyTests.swift @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/SSHConnectionStateMachineTests.swift b/Tests/NIOSSHTests/SSHConnectionStateMachineTests.swift index 80fb7bf..55bac3b 100644 --- a/Tests/NIOSSHTests/SSHConnectionStateMachineTests.swift +++ b/Tests/NIOSSHTests/SSHConnectionStateMachineTests.swift @@ -13,8 +13,9 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO import NIOConcurrencyHelpers +import NIOCore +import NIOEmbedded @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/SSHEncryptedTrafficTests.swift b/Tests/NIOSSHTests/SSHEncryptedTrafficTests.swift index 00b9491..6aa0ae5 100644 --- a/Tests/NIOSSHTests/SSHEncryptedTrafficTests.swift +++ b/Tests/NIOSSHTests/SSHEncryptedTrafficTests.swift @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/SSHHandlerTests.swift b/Tests/NIOSSHTests/SSHHandlerTests.swift index 27ecd7a..9c60125 100644 --- a/Tests/NIOSSHTests/SSHHandlerTests.swift +++ b/Tests/NIOSSHTests/SSHHandlerTests.swift @@ -13,7 +13,8 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore +import NIOEmbedded @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/SSHKeyExchangeStateMachineTests.swift b/Tests/NIOSSHTests/SSHKeyExchangeStateMachineTests.swift index 60f8601..dbc4ab7 100644 --- a/Tests/NIOSSHTests/SSHKeyExchangeStateMachineTests.swift +++ b/Tests/NIOSSHTests/SSHKeyExchangeStateMachineTests.swift @@ -13,7 +13,8 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore +import NIOEmbedded @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/SSHMessagesTests.swift b/Tests/NIOSSHTests/SSHMessagesTests.swift index 35f56c3..b58e322 100644 --- a/Tests/NIOSSHTests/SSHMessagesTests.swift +++ b/Tests/NIOSSHTests/SSHMessagesTests.swift @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/SSHPackerSerializerTests.swift b/Tests/NIOSSHTests/SSHPackerSerializerTests.swift index b00141c..312f014 100644 --- a/Tests/NIOSSHTests/SSHPackerSerializerTests.swift +++ b/Tests/NIOSSHTests/SSHPackerSerializerTests.swift @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/SSHPacketParserTests.swift b/Tests/NIOSSHTests/SSHPacketParserTests.swift index 0a727dd..65fe814 100644 --- a/Tests/NIOSSHTests/SSHPacketParserTests.swift +++ b/Tests/NIOSSHTests/SSHPacketParserTests.swift @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -import NIO +import NIOCore @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/UserAuthenticationStateMachineTests.swift b/Tests/NIOSSHTests/UserAuthenticationStateMachineTests.swift index 00af845..00d3079 100644 --- a/Tests/NIOSSHTests/UserAuthenticationStateMachineTests.swift +++ b/Tests/NIOSSHTests/UserAuthenticationStateMachineTests.swift @@ -13,7 +13,8 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore +import NIOEmbedded @testable import NIOSSH import XCTest diff --git a/Tests/NIOSSHTests/Utilities.swift b/Tests/NIOSSHTests/Utilities.swift index 1072e2f..a2c9299 100644 --- a/Tests/NIOSSHTests/Utilities.swift +++ b/Tests/NIOSSHTests/Utilities.swift @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// import Crypto -import NIO +import NIOCore @testable import NIOSSH import XCTest From d7e1abe7a7f53e04625995ad930c93d0969af6b4 Mon Sep 17 00:00:00 2001 From: FranzBusch Date: Wed, 30 Mar 2022 10:22:18 +0100 Subject: [PATCH 2/2] Fix the timespec import --- .../Keys And Signatures/NIOSSHCertifiedPublicKey.swift | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Sources/NIOSSH/Keys And Signatures/NIOSSHCertifiedPublicKey.swift b/Sources/NIOSSH/Keys And Signatures/NIOSSHCertifiedPublicKey.swift index 41deb06..6e91f5d 100644 --- a/Sources/NIOSSH/Keys And Signatures/NIOSSHCertifiedPublicKey.swift +++ b/Sources/NIOSSH/Keys And Signatures/NIOSSHCertifiedPublicKey.swift @@ -15,6 +15,11 @@ import Crypto import Dispatch import NIOCore +#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) +import Darwin +#else +import Glibc +#endif /// A `NIOSSHCertifiedPublicKey` is an SSH public key combined with an SSH certificate. ///