Mercurial > 510Connectbot

comparison src/ch/ethz/ssh2/Connection.java @ 305:d2b303406d63 ganymed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove extra override annotations that generate eclipse compiler errors
author Carl Byington <carl@five-ten-sg.com>
date Wed, 30 Jul 2014 12:09:51 -0700
parents beaccc9df37b
children 071eccdff8ea
comparison
equal deleted inserted replaced
304:abad243cb341 305:d2b303406d63
10 import java.io.FileReader; 10 import java.io.FileReader;
11 import java.io.IOException; 11 import java.io.IOException;
12 import java.net.InetSocketAddress; 12 import java.net.InetSocketAddress;
13 import java.net.Socket; 13 import java.net.Socket;
14 import java.net.SocketTimeoutException; 14 import java.net.SocketTimeoutException;
15 import java.security.KeyPair;
15 import java.security.SecureRandom; 16 import java.security.SecureRandom;
16 import java.security.KeyPair;
17 import java.security.PrivateKey;
18 import java.util.ArrayList; 17 import java.util.ArrayList;
19 import java.util.List; 18 import java.util.List;
20 import java.util.Set; 19 import java.util.Set;
21 20
22 import ch.ethz.ssh2.auth.AgentProxy; 21 import ch.ethz.ssh2.auth.AgentProxy;
194 * @throws IOException 193 * @throws IOException
195 * @deprecated You should use one of the {@link #authenticateWithPublicKey(String, File, String) authenticateWithPublicKey()} 194 * @deprecated You should use one of the {@link #authenticateWithPublicKey(String, File, String) authenticateWithPublicKey()}
196 * methods, this method is just a wrapper for it and will 195 * methods, this method is just a wrapper for it and will
197 * disappear in future builds. 196 * disappear in future builds.
198 */ 197 */
199 public synchronized boolean authenticateWithDSA(String user, String pem, String password) throws IOException { 198 @Deprecated
199 public synchronized boolean authenticateWithDSA(String user, String pem, String password) throws IOException {
200 if(tm == null) { 200 if(tm == null) {
201 throw new IllegalStateException("Connection is not established!"); 201 throw new IllegalStateException("Connection is not established!");
202 } 202 }
203 203
204 if(authenticated) { 204 if(authenticated) {
802 try { 802 try {
803 TimeoutToken token = null; 803 TimeoutToken token = null;
804 804
805 if(kexTimeout > 0) { 805 if(kexTimeout > 0) {
806 final Runnable timeoutHandler = new Runnable() { 806 final Runnable timeoutHandler = new Runnable() {
807 @Override 807 public void run() {
808 public void run() {
809 synchronized(state) { 808 synchronized(state) {
810 if(state.isCancelled) { 809 if(state.isCancelled) {
811 return; 810 return;
812 } 811 }
813 state.timeoutSocketClosed = true; 812 state.timeoutSocketClosed = true;