You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2013/07/17 17:02:14 UTC
[1/2] git commit: Rework imports
Updated Branches:
refs/heads/master a49dee379 -> 0bc4246a4
Rework imports
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/feb24641
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/feb24641
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/feb24641
Branch: refs/heads/master
Commit: feb24641bcc589ba2315eb687367142655ec932e
Parents: a49dee3
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Jul 17 16:42:20 2013 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Jul 17 16:42:20 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/sshd/ClientSession.java | 2 +-
.../main/java/org/apache/sshd/SshClient.java | 4 ++--
.../main/java/org/apache/sshd/SshServer.java | 19 +++++++++++++---
.../sshd/agent/common/AbstractAgentClient.java | 10 ++++++++-
.../sshd/agent/common/AbstractAgentProxy.java | 9 +++++++-
.../sshd/agent/local/AgentForwardedChannel.java | 2 +-
.../sshd/client/ClientFactoryManager.java | 2 +-
.../sshd/client/channel/ChannelDirectTcpip.java | 2 +-
.../DelegatingServerKeyVerifier.java | 1 -
.../keyverifier/RequiredServerKeyVerifier.java | 1 -
.../sshd/client/session/ClientSessionImpl.java | 4 ++--
.../org/apache/sshd/common/channel/Window.java | 1 -
.../common/forward/DefaultTcpipForwarder.java | 22 +++++++++++++------
.../sshd/common/forward/TcpipClientChannel.java | 8 +++----
.../sshd/common/forward/TcpipServerChannel.java | 14 +++++++-----
.../org/apache/sshd/server/CommandFactory.java | 6 -----
.../org/apache/sshd/server/Environment.java | 4 ++--
.../apache/sshd/server/FileSystemFactory.java | 4 ++--
.../apache/sshd/server/HandshakingUserAuth.java | 1 -
.../sshd/server/ServerFactoryManager.java | 2 +-
.../server/channel/ChannelDataReceiver.java | 6 ++---
.../sshd/server/channel/ChannelSession.java | 15 +++++++++++--
.../sshd/server/channel/PipeDataReceiver.java | 8 +++----
.../sshd/server/command/UnknownCommand.java | 1 -
.../filesystem/NativeFileSystemFactory.java | 4 ++--
.../server/filesystem/NativeFileSystemView.java | 6 ++---
.../sshd/server/filesystem/NativeSshFile.java | 2 --
.../sshd/server/session/ServerSession.java | 11 ++++++----
.../apache/sshd/server/sftp/SftpSubsystem.java | 23 +++++++++++++++++---
29 files changed, 126 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/ClientSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/ClientSession.java b/sshd-core/src/main/java/org/apache/sshd/ClientSession.java
index 806b292..a2bf574 100644
--- a/sshd-core/src/main/java/org/apache/sshd/ClientSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/ClientSession.java
@@ -23,13 +23,13 @@ import java.security.KeyPair;
import java.util.Map;
import org.apache.sshd.client.ClientFactoryManager;
-import org.apache.sshd.common.SshdSocketAddress;
import org.apache.sshd.client.channel.ChannelDirectTcpip;
import org.apache.sshd.client.channel.ChannelExec;
import org.apache.sshd.client.channel.ChannelShell;
import org.apache.sshd.client.channel.ChannelSubsystem;
import org.apache.sshd.client.future.AuthFuture;
import org.apache.sshd.common.Session;
+import org.apache.sshd.common.SshdSocketAddress;
import org.apache.sshd.common.future.CloseFuture;
/**
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/SshClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/SshClient.java b/sshd-core/src/main/java/org/apache/sshd/SshClient.java
index 336145f..9d0bfcb 100644
--- a/sshd-core/src/main/java/org/apache/sshd/SshClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/SshClient.java
@@ -48,8 +48,6 @@ import org.apache.sshd.client.kex.DHG1;
import org.apache.sshd.client.kex.DHG14;
import org.apache.sshd.client.keyverifier.AcceptAllServerKeyVerifier;
import org.apache.sshd.client.session.ClientSessionImpl;
-import org.apache.sshd.common.forward.DefaultTcpipForwarderFactory;
-import org.apache.sshd.common.TcpipForwarderFactory;
import org.apache.sshd.common.AbstractFactoryManager;
import org.apache.sshd.common.Channel;
import org.apache.sshd.common.Cipher;
@@ -59,6 +57,7 @@ import org.apache.sshd.common.KeyExchange;
import org.apache.sshd.common.Mac;
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.common.Signature;
+import org.apache.sshd.common.TcpipForwarderFactory;
import org.apache.sshd.common.cipher.AES128CBC;
import org.apache.sshd.common.cipher.AES128CTR;
import org.apache.sshd.common.cipher.AES192CBC;
@@ -70,6 +69,7 @@ import org.apache.sshd.common.cipher.BlowfishCBC;
import org.apache.sshd.common.cipher.TripleDESCBC;
import org.apache.sshd.common.compression.CompressionNone;
import org.apache.sshd.common.forward.DefaultForwardingAcceptorFactory;
+import org.apache.sshd.common.forward.DefaultTcpipForwarderFactory;
import org.apache.sshd.common.forward.TcpipServerChannel;
import org.apache.sshd.common.mac.HMACMD5;
import org.apache.sshd.common.mac.HMACMD596;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/SshServer.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/SshServer.java b/sshd-core/src/main/java/org/apache/sshd/SshServer.java
index a8b4919..dc35914 100644
--- a/sshd-core/src/main/java/org/apache/sshd/SshServer.java
+++ b/sshd-core/src/main/java/org/apache/sshd/SshServer.java
@@ -37,8 +37,19 @@ import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.session.IoSessionConfig;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
+import org.apache.sshd.common.AbstractFactoryManager;
+import org.apache.sshd.common.Channel;
+import org.apache.sshd.common.Cipher;
+import org.apache.sshd.common.Compression;
+import org.apache.sshd.common.Factory;
+import org.apache.sshd.common.ForwardingAcceptorFactory;
+import org.apache.sshd.common.ForwardingFilter;
+import org.apache.sshd.common.KeyExchange;
+import org.apache.sshd.common.Mac;
+import org.apache.sshd.common.NamedFactory;
+import org.apache.sshd.common.Session;
+import org.apache.sshd.common.Signature;
import org.apache.sshd.common.SshdSocketAddress;
-import org.apache.sshd.common.*;
import org.apache.sshd.common.cipher.AES128CBC;
import org.apache.sshd.common.cipher.AES128CTR;
import org.apache.sshd.common.cipher.AES192CBC;
@@ -49,6 +60,7 @@ import org.apache.sshd.common.cipher.ARCFOUR256;
import org.apache.sshd.common.cipher.BlowfishCBC;
import org.apache.sshd.common.cipher.TripleDESCBC;
import org.apache.sshd.common.compression.CompressionNone;
+import org.apache.sshd.common.forward.DefaultForwardingAcceptorFactory;
import org.apache.sshd.common.forward.DefaultTcpipForwarderFactory;
import org.apache.sshd.common.forward.TcpipServerChannel;
import org.apache.sshd.common.future.CloseFuture;
@@ -68,7 +80,6 @@ import org.apache.sshd.common.util.SecurityUtils;
import org.apache.sshd.server.Command;
import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.FileSystemFactory;
-import org.apache.sshd.common.ForwardingFilter;
import org.apache.sshd.server.PasswordAuthenticator;
import org.apache.sshd.server.PublickeyAuthenticator;
import org.apache.sshd.server.ServerFactoryManager;
@@ -83,7 +94,6 @@ import org.apache.sshd.server.kex.DHG1;
import org.apache.sshd.server.kex.DHG14;
import org.apache.sshd.server.keyprovider.PEMGeneratorHostKeyProvider;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
-import org.apache.sshd.common.forward.DefaultForwardingAcceptorFactory;
import org.apache.sshd.server.session.ServerSession;
import org.apache.sshd.server.session.SessionFactory;
import org.apache.sshd.server.shell.ProcessShellFactory;
@@ -579,12 +589,15 @@ public class SshServer extends AbstractFactoryManager implements ServerFactoryMa
public boolean canForwardAgent(Session session) {
return true;
}
+
public boolean canForwardX11(Session session) {
return true;
}
+
public boolean canListen(SshdSocketAddress address, Session session) {
return true;
}
+
public boolean canConnect(SshdSocketAddress address, Session session) {
return true;
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java b/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java
index a14c332..1c945af 100644
--- a/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java
@@ -27,7 +27,15 @@ import org.apache.sshd.agent.SshAgent;
import org.apache.sshd.common.KeyPairProvider;
import org.apache.sshd.common.util.Buffer;
-import static org.apache.sshd.agent.SshAgentConstants.*;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENTC_ADD_IDENTITY;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENTC_REMOVE_ALL_IDENTITIES;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENTC_REMOVE_IDENTITY;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENTC_REQUEST_IDENTITIES;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENTC_SIGN_REQUEST;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENT_FAILURE;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENT_IDENTITIES_ANSWER;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENT_SIGN_RESPONSE;
+import static org.apache.sshd.agent.SshAgentConstants.SSH_AGENT_SUCCESS;
public abstract class AbstractAgentClient {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentProxy.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentProxy.java b/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentProxy.java
index a0eb7fe..498c46f 100644
--- a/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentProxy.java
+++ b/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentProxy.java
@@ -28,7 +28,14 @@ import org.apache.sshd.agent.SshAgent;
import org.apache.sshd.common.SshException;
import org.apache.sshd.common.util.Buffer;
-import static org.apache.sshd.agent.SshAgentConstants.*;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENTC_ADD_IDENTITY;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENTC_REMOVE_ALL_IDENTITIES;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENTC_REMOVE_IDENTITY;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENTC_REQUEST_IDENTITIES;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENTC_SIGN_REQUEST;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENT_IDENTITIES_ANSWER;
+import static org.apache.sshd.agent.SshAgentConstants.SSH2_AGENT_SIGN_RESPONSE;
+import static org.apache.sshd.agent.SshAgentConstants.SSH_AGENT_SUCCESS;
public abstract class AbstractAgentProxy implements SshAgent {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/agent/local/AgentForwardedChannel.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/local/AgentForwardedChannel.java b/sshd-core/src/main/java/org/apache/sshd/agent/local/AgentForwardedChannel.java
index 33a4ee9..6d7843d 100644
--- a/sshd-core/src/main/java/org/apache/sshd/agent/local/AgentForwardedChannel.java
+++ b/sshd-core/src/main/java/org/apache/sshd/agent/local/AgentForwardedChannel.java
@@ -23,8 +23,8 @@ import java.io.InterruptedIOException;
import java.util.Queue;
import java.util.concurrent.ArrayBlockingQueue;
-import org.apache.sshd.agent.common.AbstractAgentProxy;
import org.apache.sshd.agent.SshAgent;
+import org.apache.sshd.agent.common.AbstractAgentProxy;
import org.apache.sshd.client.channel.AbstractClientChannel;
import org.apache.sshd.client.future.OpenFuture;
import org.apache.sshd.common.SshConstants;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java b/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java
index f83d618..8375ffa 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java
@@ -18,8 +18,8 @@
*/
package org.apache.sshd.client;
-import org.apache.sshd.common.TcpipForwarderFactory;
import org.apache.sshd.common.FactoryManager;
+import org.apache.sshd.common.TcpipForwarderFactory;
/**
* The <code>ClientFactoryManager</code> enable the retrieval of additional
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelDirectTcpip.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelDirectTcpip.java b/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelDirectTcpip.java
index 68a9ec1..a0438d0 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelDirectTcpip.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelDirectTcpip.java
@@ -24,11 +24,11 @@ import java.io.PipedOutputStream;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import org.apache.sshd.common.SshdSocketAddress;
import org.apache.sshd.client.future.DefaultOpenFuture;
import org.apache.sshd.client.future.OpenFuture;
import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.SshException;
+import org.apache.sshd.common.SshdSocketAddress;
import org.apache.sshd.common.channel.ChannelOutputStream;
import org.apache.sshd.common.util.Buffer;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/DelegatingServerKeyVerifier.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/DelegatingServerKeyVerifier.java b/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/DelegatingServerKeyVerifier.java
index ad26f21..81b49ec 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/DelegatingServerKeyVerifier.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/DelegatingServerKeyVerifier.java
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.sshd.ClientSession;
import org.apache.sshd.client.ServerKeyVerifier;
-import org.apache.sshd.common.util.BufferUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/RequiredServerKeyVerifier.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/RequiredServerKeyVerifier.java b/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/RequiredServerKeyVerifier.java
index 7e5b75e..c3823cd 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/RequiredServerKeyVerifier.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/RequiredServerKeyVerifier.java
@@ -20,7 +20,6 @@ package org.apache.sshd.client.keyverifier;
import java.net.SocketAddress;
import java.security.PublicKey;
-import java.util.Arrays;
import org.apache.sshd.ClientSession;
import org.apache.sshd.client.ServerKeyVerifier;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
index 2949403..04f3dd8 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
@@ -30,9 +30,8 @@ import org.apache.sshd.ClientChannel;
import org.apache.sshd.ClientSession;
import org.apache.sshd.client.ClientFactoryManager;
import org.apache.sshd.client.ServerKeyVerifier;
-import org.apache.sshd.client.UserInteraction;
-import org.apache.sshd.common.SshdSocketAddress;
import org.apache.sshd.client.UserAuth;
+import org.apache.sshd.client.UserInteraction;
import org.apache.sshd.client.auth.UserAuthAgent;
import org.apache.sshd.client.auth.UserAuthPassword;
import org.apache.sshd.client.auth.UserAuthPublicKey;
@@ -49,6 +48,7 @@ import org.apache.sshd.common.KeyPairProvider;
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.SshException;
+import org.apache.sshd.common.SshdSocketAddress;
import org.apache.sshd.common.future.CloseFuture;
import org.apache.sshd.common.future.SshFutureListener;
import org.apache.sshd.common.session.AbstractSession;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java
index 13c4056..8b4ea86 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java
@@ -20,7 +20,6 @@ package org.apache.sshd.common.channel;
import java.io.IOException;
-import org.apache.sshd.common.SshException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultTcpipForwarder.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultTcpipForwarder.java b/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultTcpipForwarder.java
index 482b218..8612744 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultTcpipForwarder.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultTcpipForwarder.java
@@ -18,6 +18,15 @@
*/
package org.apache.sshd.common.forward;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.service.IoHandlerAdapter;
@@ -26,17 +35,16 @@ import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.executor.ExecutorFilter;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.sshd.ClientChannel;
-import org.apache.sshd.common.SshdSocketAddress;
import org.apache.sshd.client.future.OpenFuture;
-import org.apache.sshd.common.*;
+import org.apache.sshd.common.ForwardingFilter;
+import org.apache.sshd.common.Session;
+import org.apache.sshd.common.SshConstants;
+import org.apache.sshd.common.SshException;
+import org.apache.sshd.common.SshdSocketAddress;
+import org.apache.sshd.common.TcpipForwarder;
import org.apache.sshd.common.future.SshFutureListener;
import org.apache.sshd.common.util.Buffer;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.util.*;
-
/**
* TODO Add javadoc
*
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java b/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java
index f1efd8e..d2fa64e 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java
@@ -18,20 +18,20 @@
*/
package org.apache.sshd.common.forward;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession;
-import org.apache.sshd.common.SshdSocketAddress;
import org.apache.sshd.client.channel.AbstractClientChannel;
import org.apache.sshd.client.future.DefaultOpenFuture;
import org.apache.sshd.client.future.OpenFuture;
import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.SshException;
+import org.apache.sshd.common.SshdSocketAddress;
import org.apache.sshd.common.channel.ChannelOutputStream;
import org.apache.sshd.common.util.Buffer;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-
/**
* TODO Add javadoc
*
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java b/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java
index 283ad17..d2d7c80 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java
@@ -18,6 +18,10 @@
*/
package org.apache.sshd.common.forward;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.ConnectException;
+
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.future.IoFutureListener;
@@ -28,7 +32,11 @@ import org.apache.mina.core.session.IoSession;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.apache.sshd.client.future.DefaultOpenFuture;
import org.apache.sshd.client.future.OpenFuture;
-import org.apache.sshd.common.*;
+import org.apache.sshd.common.Channel;
+import org.apache.sshd.common.ForwardingFilter;
+import org.apache.sshd.common.NamedFactory;
+import org.apache.sshd.common.SshConstants;
+import org.apache.sshd.common.SshdSocketAddress;
import org.apache.sshd.common.channel.ChannelOutputStream;
import org.apache.sshd.common.future.CloseFuture;
import org.apache.sshd.common.future.SshFuture;
@@ -37,10 +45,6 @@ import org.apache.sshd.common.util.Buffer;
import org.apache.sshd.server.channel.AbstractServerChannel;
import org.apache.sshd.server.channel.OpenChannelException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.ConnectException;
-
/**
* TODO Add javadoc
*
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/server/CommandFactory.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/CommandFactory.java b/sshd-core/src/main/java/org/apache/sshd/server/CommandFactory.java
index 83532cb..053cdfe 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/CommandFactory.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/CommandFactory.java
@@ -18,12 +18,6 @@
*/
package org.apache.sshd.server;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.apache.sshd.server.session.ServerSession;
-
/**
* A factory of commands.
* Commands are executed on the server side when an "exec" channel is
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/server/Environment.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/Environment.java b/sshd-core/src/main/java/org/apache/sshd/server/Environment.java
index 00421f6..729c0f8 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/Environment.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/Environment.java
@@ -18,11 +18,11 @@
*/
package org.apache.sshd.server;
-import org.apache.sshd.common.PtyMode;
-
import java.util.EnumSet;
import java.util.Map;
+import org.apache.sshd.common.PtyMode;
+
/**
* Interface providing access to the environment map and allowing the registration
* of listeners for certain signals.
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/server/FileSystemFactory.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/FileSystemFactory.java b/sshd-core/src/main/java/org/apache/sshd/server/FileSystemFactory.java
index 5ad12ec..b80c050 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/FileSystemFactory.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/FileSystemFactory.java
@@ -19,10 +19,10 @@
package org.apache.sshd.server;
-import org.apache.sshd.common.Session;
-
import java.io.IOException;
+import org.apache.sshd.common.Session;
+
/**
* Factory for file system implementations - it returns the file system view for user.
*
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/server/HandshakingUserAuth.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/HandshakingUserAuth.java b/sshd-core/src/main/java/org/apache/sshd/server/HandshakingUserAuth.java
index d0bf5d9..5a067a8 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/HandshakingUserAuth.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/HandshakingUserAuth.java
@@ -18,7 +18,6 @@
*/
package org.apache.sshd.server;
-import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.util.Buffer;
import org.apache.sshd.server.session.ServerSession;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/server/ServerFactoryManager.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/ServerFactoryManager.java b/sshd-core/src/main/java/org/apache/sshd/server/ServerFactoryManager.java
index f179a15..521a8fb 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/ServerFactoryManager.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/ServerFactoryManager.java
@@ -22,8 +22,8 @@ import java.util.List;
import org.apache.sshd.common.Factory;
import org.apache.sshd.common.FactoryManager;
-import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.common.ForwardingAcceptorFactory;
+import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.server.auth.gss.GSSAuthenticator;
/**
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelDataReceiver.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelDataReceiver.java b/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelDataReceiver.java
index 5c89d3d..d832b61 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelDataReceiver.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelDataReceiver.java
@@ -18,13 +18,13 @@
*/
package org.apache.sshd.server.channel;
-import org.apache.sshd.server.ChannelSessionAware;
-import org.apache.sshd.server.Command;
-
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
+import org.apache.sshd.server.ChannelSessionAware;
+import org.apache.sshd.server.Command;
+
/**
* Receiving end of the data stream from the client.
*
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java b/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
index 63b5408..8505862 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
@@ -30,7 +30,11 @@ import java.util.concurrent.CopyOnWriteArraySet;
import org.apache.sshd.agent.SshAgent;
import org.apache.sshd.agent.SshAgentFactory;
-import org.apache.sshd.common.*;
+import org.apache.sshd.common.Channel;
+import org.apache.sshd.common.ForwardingFilter;
+import org.apache.sshd.common.NamedFactory;
+import org.apache.sshd.common.PtyMode;
+import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.channel.ChannelOutputStream;
import org.apache.sshd.common.future.CloseFuture;
import org.apache.sshd.common.future.SshFuture;
@@ -38,8 +42,15 @@ import org.apache.sshd.common.future.SshFutureListener;
import org.apache.sshd.common.util.Buffer;
import org.apache.sshd.common.util.IoUtils;
import org.apache.sshd.common.util.LoggingFilterOutputStream;
-import org.apache.sshd.server.*;
+import org.apache.sshd.server.ChannelSessionAware;
+import org.apache.sshd.server.Command;
+import org.apache.sshd.server.Environment;
+import org.apache.sshd.server.ExitCallback;
+import org.apache.sshd.server.FileSystemAware;
import org.apache.sshd.server.FileSystemFactory;
+import org.apache.sshd.server.SessionAware;
+import org.apache.sshd.server.Signal;
+import org.apache.sshd.server.SignalListener;
import org.apache.sshd.server.session.ServerSession;
import org.apache.sshd.server.x11.X11ForwardSupport;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/server/channel/PipeDataReceiver.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/channel/PipeDataReceiver.java b/sshd-core/src/main/java/org/apache/sshd/server/channel/PipeDataReceiver.java
index 0dfcda2..a770aab 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/channel/PipeDataReceiver.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/channel/PipeDataReceiver.java
@@ -18,6 +18,10 @@
*/
package org.apache.sshd.server.channel;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
import org.apache.sshd.common.channel.ChannelPipedInputStream;
import org.apache.sshd.common.channel.ChannelPipedOutputStream;
import org.apache.sshd.common.channel.Window;
@@ -25,10 +29,6 @@ import org.apache.sshd.common.util.LoggingFilterOutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
/**
* {@link ChannelDataReceiver} that buffers the received data into byte buffer
* and provides an {@link InputStream} to consume them.
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/server/command/UnknownCommand.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/command/UnknownCommand.java b/sshd-core/src/main/java/org/apache/sshd/server/command/UnknownCommand.java
index a9e3d8f..7bcc1c3 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/command/UnknownCommand.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/command/UnknownCommand.java
@@ -23,7 +23,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import org.apache.sshd.server.Command;
-import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.Environment;
import org.apache.sshd.server.ExitCallback;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeFileSystemFactory.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeFileSystemFactory.java b/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeFileSystemFactory.java
index 43f9fbf..24ac76e 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeFileSystemFactory.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeFileSystemFactory.java
@@ -19,14 +19,14 @@
package org.apache.sshd.server.filesystem;
+import java.io.File;
+
import org.apache.sshd.common.Session;
import org.apache.sshd.server.FileSystemFactory;
import org.apache.sshd.server.FileSystemView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-
/**
* Native file system factory. It uses the OS file system.
*
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeFileSystemView.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeFileSystemView.java b/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeFileSystemView.java
index 28fe8e5..3e78c29 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeFileSystemView.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeFileSystemView.java
@@ -19,13 +19,13 @@
package org.apache.sshd.server.filesystem;
-import org.apache.sshd.server.SshFile;
+import java.io.File;
+
import org.apache.sshd.server.FileSystemView;
+import org.apache.sshd.server.SshFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-
/**
* <strong>Internal class, do not use directly.</strong>
*
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeSshFile.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeSshFile.java b/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeSshFile.java
index 630ed1e..c03b511 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeSshFile.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/filesystem/NativeSshFile.java
@@ -19,8 +19,6 @@
package org.apache.sshd.server.filesystem;
-import org.apache.sshd.server.filesystem.NameEqualsFileFilter;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
index 75f14d4..67d3be9 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java
@@ -19,14 +19,11 @@
package org.apache.sshd.server.session;
import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
import java.security.KeyPair;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import java.util.Set;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -35,7 +32,13 @@ import org.apache.mina.core.session.IoSession;
import org.apache.sshd.SshServer;
import org.apache.sshd.agent.common.AgentForwardSupport;
import org.apache.sshd.client.future.OpenFuture;
-import org.apache.sshd.common.*;
+import org.apache.sshd.common.Channel;
+import org.apache.sshd.common.FactoryManager;
+import org.apache.sshd.common.KeyExchange;
+import org.apache.sshd.common.NamedFactory;
+import org.apache.sshd.common.SshConstants;
+import org.apache.sshd.common.SshException;
+import org.apache.sshd.common.SshdSocketAddress;
import org.apache.sshd.common.future.CloseFuture;
import org.apache.sshd.common.future.SshFutureListener;
import org.apache.sshd.common.session.AbstractSession;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/feb24641/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java b/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java
index 994c17d..4758e9e 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/sftp/SftpSubsystem.java
@@ -18,15 +18,32 @@
*/
package org.apache.sshd.server.sftp;
-import java.io.*;
-import java.util.*;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.common.util.Buffer;
import org.apache.sshd.common.util.IoUtils;
import org.apache.sshd.common.util.SelectorUtils;
-import org.apache.sshd.server.*;
+import org.apache.sshd.server.Command;
+import org.apache.sshd.server.Environment;
+import org.apache.sshd.server.ExitCallback;
+import org.apache.sshd.server.FileSystemAware;
import org.apache.sshd.server.FileSystemView;
+import org.apache.sshd.server.SessionAware;
import org.apache.sshd.server.SshFile;
import org.apache.sshd.server.session.ServerSession;
import org.slf4j.Logger;
Re: [2/2] git commit: [SSHD-233] Provide better error messages
instead of "Unable to negociate key exchange for item 2"
Posted by sebb <se...@gmail.com>.
On 17 July 2013 16:02, <gn...@apache.org> wrote:
> [SSHD-233] Provide better error messages instead of "Unable to negociate key exchange for item 2"
>
> Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
> Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/0bc4246a
> Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/0bc4246a
> Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/0bc4246a
>
> Branch: refs/heads/master
> Commit: 0bc4246a4e41aa33d869e4a8ae01544eecd9bd62
> Parents: feb2464
> Author: Guillaume Nodet <gn...@apache.org>
> Authored: Wed Jul 17 16:59:02 2013 +0200
> Committer: Guillaume Nodet <gn...@apache.org>
> Committed: Wed Jul 17 16:59:02 2013 +0200
>
> ----------------------------------------------------------------------
> .../apache/sshd/common/session/AbstractSession.java | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0bc4246a/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java
> ----------------------------------------------------------------------
> diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java b/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java
> index 2ba5532..a8c26b2 100644
> --- a/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java
> +++ b/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java
> @@ -944,7 +944,18 @@ public abstract class AbstractSession implements Session {
> }
> }
> if (guess[i] == null && i != SshConstants.PROPOSAL_LANG_CTOS && i != SshConstants.PROPOSAL_LANG_STOC) {
> - throw new IllegalStateException("Unable to negociate key exchange for item " + i);
> + final String[] items = new String[] {
> + "kex algorithms",
> + "server host key algorithms",
> + "encryption algorithms (client to server)",
> + "encryption algorithms (server to client)",
> + "mac algorithms (client to server)",
> + "mac algorithms (server to client)",
> + "compression algorithms (client to server)",
> + "compression algorithms (server to client)"
> + };
Surely those could be static strings?
What determines the order of the strings?
It ought to be documented.
> + throw new IllegalStateException("Unable to negociate key exchange for " + items[i] +
Please fix this spelling mistake:
s/negociate /negotiate /
> + " (client: " + clientProposal[i] + " / server: " + serverProposal[i] + ")");
> }
> }
> negociated = guess;
>
[2/2] git commit: [SSHD-233] Provide better error messages instead of
"Unable to negociate key exchange for item 2"
Posted by gn...@apache.org.
[SSHD-233] Provide better error messages instead of "Unable to negociate key exchange for item 2"
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/0bc4246a
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/0bc4246a
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/0bc4246a
Branch: refs/heads/master
Commit: 0bc4246a4e41aa33d869e4a8ae01544eecd9bd62
Parents: feb2464
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Jul 17 16:59:02 2013 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Jul 17 16:59:02 2013 +0200
----------------------------------------------------------------------
.../apache/sshd/common/session/AbstractSession.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/0bc4246a/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java b/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java
index 2ba5532..a8c26b2 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java
@@ -944,7 +944,18 @@ public abstract class AbstractSession implements Session {
}
}
if (guess[i] == null && i != SshConstants.PROPOSAL_LANG_CTOS && i != SshConstants.PROPOSAL_LANG_STOC) {
- throw new IllegalStateException("Unable to negociate key exchange for item " + i);
+ final String[] items = new String[] {
+ "kex algorithms",
+ "server host key algorithms",
+ "encryption algorithms (client to server)",
+ "encryption algorithms (server to client)",
+ "mac algorithms (client to server)",
+ "mac algorithms (server to client)",
+ "compression algorithms (client to server)",
+ "compression algorithms (server to client)"
+ };
+ throw new IllegalStateException("Unable to negociate key exchange for " + items[i] +
+ " (client: " + clientProposal[i] + " / server: " + serverProposal[i] + ")");
}
}
negociated = guess;