diff options
Diffstat (limited to 'sshlib/src/main/java/com/trilead/ssh2/Connection.java')
| -rw-r--r-- | sshlib/src/main/java/com/trilead/ssh2/Connection.java | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/sshlib/src/main/java/com/trilead/ssh2/Connection.java b/sshlib/src/main/java/com/trilead/ssh2/Connection.java index 6badb09..a957b2a 100644 --- a/sshlib/src/main/java/com/trilead/ssh2/Connection.java +++ b/sshlib/src/main/java/com/trilead/ssh2/Connection.java @@ -9,8 +9,6 @@ import java.net.InetSocketAddress; import java.net.SocketTimeoutException; import java.security.KeyPair; import java.security.SecureRandom; -import java.security.Security; -import java.util.Set; import java.util.Vector; import com.trilead.ssh2.auth.AuthenticationManager; @@ -105,8 +103,6 @@ public class Connection private TransportManager tm; - private boolean tcpNoDelay = false; - private ProxyData proxyData = null; private Vector<ConnectionMonitor> connectionMonitors = new Vector<ConnectionMonitor>(); @@ -141,63 +137,6 @@ public class Connection } /** - * After a successful connect, one has to authenticate oneself. This method - * is based on DSA (it uses DSA to sign a challenge sent by the server). - * <p> - * If the authentication phase is complete, <code>true</code> will be - * returned. If the server does not accept the request (or if further - * authentication steps are needed), <code>false</code> is returned and - * one can retry either by using this or any other authentication method - * (use the <code>getRemainingAuthMethods</code> method to get a list of - * the remaining possible methods). - * - * @param user - * A <code>String</code> holding the username. - * @param pem - * A <code>String</code> containing the DSA private key of the - * user in OpenSSH key format (PEM, you can't miss the - * "-----BEGIN DSA PRIVATE KEY-----" tag). The string may contain - * linefeeds. - * @param password - * If the PEM string is 3DES encrypted ("DES-EDE3-CBC"), then you - * must specify the password. Otherwise, this argument will be - * ignored and can be set to <code>null</code>. - * - * @return whether the connection is now authenticated. - * @throws IOException - * - * @deprecated You should use one of the - * {@link #authenticateWithPublicKey(String, File, String) authenticateWithPublicKey()} - * methods, this method is just a wrapper for it and will - * disappear in future builds. - * - */ - public synchronized boolean authenticateWithDSA(String user, String pem, String password) throws IOException - { - if (tm == null) - throw new IllegalStateException("Connection is not established!"); - - if (authenticated) - throw new IllegalStateException("Connection is already authenticated!"); - - if (am == null) - am = new AuthenticationManager(tm); - - if (cm == null) - cm = new ChannelManager(tm); - - if (user == null) - throw new IllegalArgumentException("user argument is null"); - - if (pem == null) - throw new IllegalArgumentException("pem argument is null"); - - authenticated = am.authenticatePublicKey(user, pem.toCharArray(), password, getOrCreateSecureRND()); - - return authenticated; - } - - /** * A wrapper that calls * {@link #authenticateWithKeyboardInteractive(String, String[], InteractiveCallback) * authenticateWithKeyboardInteractivewith} a <code>null</code> submethod @@ -813,8 +752,6 @@ public class Connection "The connect() operation on the socket timed out.").initCause(se); } - tm.setTcpNoDelay(tcpNoDelay); - /* Wait until first KEX has finished */ ConnectionInfo ci = tm.getConnectionInfo(1); @@ -1410,27 +1347,6 @@ public class Connection } /** - * Enable/disable TCP_NODELAY (disable/enable Nagle's algorithm) on the - * underlying socket. - * <p> - * Can be called at any time. If the connection has not yet been established - * then the passed value will be stored and set after the socket has been - * set up. The default value that will be used is <code>false</code>. - * - * @param enable - * the argument passed to the <code>Socket.setTCPNoDelay()</code> - * method. - * @throws IOException - */ - public synchronized void setTCPNoDelay(boolean enable) throws IOException - { - tcpNoDelay = enable; - - if (tm != null) - tm.setTcpNoDelay(enable); - } - - /** * Used to tell the library that the connection shall be established through * a proxy server. It only makes sense to call this method before calling * the {@link #connect() connect()} method. |