Mercurial > 510Connectbot

comparison src/ch/ethz/ssh2/ServerConnection.java @ 301:ca5dd224a87b ganymed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add ecdsa key support everywhere
author Carl Byington <carl@five-ten-sg.com>
date Tue, 29 Jul 2014 18:50:35 -0700
parents 349847b2e318
children beaccc9df37b
comparison
equal deleted inserted replaced
300:349847b2e318 301:ca5dd224a87b
8 import java.io.CharArrayWriter; 8 import java.io.CharArrayWriter;
9 import java.io.File; 9 import java.io.File;
10 import java.io.FileReader; 10 import java.io.FileReader;
11 import java.io.IOException; 11 import java.io.IOException;
12 import java.net.Socket; 12 import java.net.Socket;
13 import java.util.List;
14 import java.util.ArrayList;
13 15
14 import ch.ethz.ssh2.crypto.CryptoWishList; 16 import ch.ethz.ssh2.crypto.CryptoWishList;
15 import ch.ethz.ssh2.crypto.PEMDecoder; 17 import ch.ethz.ssh2.crypto.PEMDecoder;
16 import ch.ethz.ssh2.server.ServerConnectionState; 18 import ch.ethz.ssh2.server.ServerConnectionState;
17 import java.security.KeyPair; 19 import java.security.KeyPair;
47 * 49 *
48 * @param s The socket 50 * @param s The socket
49 */ 51 */
50 public ServerConnection(Socket s) 52 public ServerConnection(Socket s)
51 { 53 {
52 this(s, null, null); 54 this(s, null, null, null);
53 } 55 }
54 56
55 public ServerConnection(Socket s, String softwareversion) { 57 public ServerConnection(Socket s, String softwareversion) {
56 this(s, null, null); 58 this(s, null, null, null);
57 this.softwareversion = softwareversion; 59 this.softwareversion = softwareversion;
58 } 60 }
59 61
60 /** 62 /**
61 * Creates a new <code>ServerConnection</code> that will communicate 63 * Creates a new <code>ServerConnection</code> that will communicate