Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
]
Expand All @@ -43,15 +44,17 @@ 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"),
]
),
.target(
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"),
]
Expand All @@ -60,15 +63,17 @@ 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"),
]
),
.testTarget(
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"),
]
),
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/ByteBuffer+SSH.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

extension ByteBuffer {
/// Gets an SSH boolean field from a `ByteBuffer`.
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/Child Channels/ChildChannelOptions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

/// The various channel options specific to `SSHChildChannel`s.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/Child Channels/ChildChannelUserEvents.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

/// A namespace for SSH channel request events.
public enum SSHChannelRequestEvent {
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/Child Channels/SSHChannelData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

/// `SSHChannelData` is the data type that is passed around in `SSHChildChannel` objects.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/Child Channels/SSHChannelMultiplexer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

/// An object that controls multiplexing messages to multiple child channels.
final class SSHChannelMultiplexer {
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/Child Channels/SSHChannelType.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// SPDX-License-Identifier: Apache-2.0
//
//===----------------------------------------------------------------------===//
import NIO
import NIOCore

/// `SSHChannelType` represents the type of a single SSH channel.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/Child Channels/SSHChildChannel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOConcurrencyHelpers
import NIOCore

/// A NIO `Channel` that encapsulates a single SSH `Channel`.
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

protocol SendsKeyExchangeMessages {
var keyExchangeStateMachine: SSHKeyExchangeStateMachine { get set }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

protocol SendsUserAuthMessages {
var userAuthStateMachine: UserAuthenticationStateMachine { get set }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

struct SSHConnectionStateMachine {
enum State {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

extension SSHConnectionStateMachine {
/// The state of a state machine that has sent its version header.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/GlobalRequestDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/Key Exchange/ECDHCompatibleKey.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/Key Exchange/EllipticCurveKeyExchange.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/Key Exchange/SSHKeyExchangeResult.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//===----------------------------------------------------------------------===//

import Crypto
import NIO
import NIOCore

/// The result of a round of key exchange.
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//===----------------------------------------------------------------------===//

import Crypto
import NIO
import NIOCore

struct SSHKeyExchangeStateMachine {
enum SSHKeyExchangeError: Error {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

/// A `NIOSSHClientSErverAuthenticationDelegate` is an object that can validate whether
/// a server host key is trusted.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import Crypto
import Dispatch
import NIO
import NIOCore

/// A `NIOSSHCertifiedPublicKey` is an SSH public key combined with an SSH certificate.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/Keys And Signatures/NIOSSHPrivateKey.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//===----------------------------------------------------------------------===//

import Crypto
import NIO
import NIOCore

/// An SSH private key.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/Keys And Signatures/NIOSSHPublicKey.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import Crypto
import Foundation
import NIO
import NIOCore

/// An SSH public key.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/Keys And Signatures/NIOSSHSignature.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import Crypto
import Foundation
import NIO
import NIOCore
import NIOFoundationCompat

/// A representation of an SSH signature.
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/NIOSSHHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

/// A `ChannelDuplexHandler` that implements the SSH protocol.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/SSHEncryptablePacketPayload.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

/// An SSH payload that can be encrypted.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/SSHMessages.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

// MARK: - Types

Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/SSHPacketParser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

struct SSHPacketParser {
enum State {
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/SSHPacketSerializer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//

import NIO
import NIOCore

struct SSHPacketSerializer {
enum State {
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSH/SSHTerminalModes.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// SPDX-License-Identifier: Apache-2.0
//
//===----------------------------------------------------------------------===//
import NIO
import NIOCore

/// This structure represents the SSH understanding of POSIX terminal modes.
///
Expand Down
Loading