comparison src/ch/ethz/ssh2/server/ServerConnectionState.java @ 281:b4ca341c318d ganymed

start conversion from trilead to ganymed
author Carl Byington <carl@five-ten-sg.com>
date Fri, 18 Jul 2014 17:07:38 -0700
parents d7e088fa2123
children 4656869af8fe
comparison
equal deleted inserted replaced
280:51d5f434ef6b 281:b4ca341c318d
11 import ch.ethz.ssh2.ServerConnection; 11 import ch.ethz.ssh2.ServerConnection;
12 import ch.ethz.ssh2.ServerConnectionCallback; 12 import ch.ethz.ssh2.ServerConnectionCallback;
13 import ch.ethz.ssh2.auth.ServerAuthenticationManager; 13 import ch.ethz.ssh2.auth.ServerAuthenticationManager;
14 import ch.ethz.ssh2.channel.ChannelManager; 14 import ch.ethz.ssh2.channel.ChannelManager;
15 import ch.ethz.ssh2.crypto.CryptoWishList; 15 import ch.ethz.ssh2.crypto.CryptoWishList;
16 import ch.ethz.ssh2.signature.DSAPrivateKey; 16 import java.security.KeyPair;
17 import java.security.PrivateKey;
18 import java.security.interfaces.DSAPrivateKey;
19 import java.security.interfaces.ECPrivateKey;
17 import java.security.interfaces.RSAPrivateKey; 20 import java.security.interfaces.RSAPrivateKey;
18 import ch.ethz.ssh2.transport.ClientServerHello; 21 import ch.ethz.ssh2.transport.ClientServerHello;
19 import ch.ethz.ssh2.transport.ServerTransportManager; 22 import ch.ethz.ssh2.transport.ServerTransportManager;
20 23
21 public class ServerConnectionState 24 public class ServerConnectionState
22 { 25 {
23 public ServerConnection conn; 26 public ServerConnection conn;
24 27
25 public SecureRandom generator = new SecureRandom(); 28 public SecureRandom generator = new SecureRandom();
26 29
27 public String softwareversion; 30 public String softwareversion;
28 31
29 //public String auth_banner = null; 32 //public String auth_banner = null;
30 public ServerConnectionCallback cb_conn; 33 public ServerConnectionCallback cb_conn;
31 public ServerAuthenticationCallback cb_auth; 34 public ServerAuthenticationCallback cb_auth;
32 35
33 /* Settings for the next key exchange */ 36 /* Settings for the next key exchange */
34 public CryptoWishList next_cryptoWishList = CryptoWishList.forServer(); 37 public CryptoWishList next_cryptoWishList = CryptoWishList.forServer();
35 public DSAPrivateKey next_dsa_key; 38 public DSAPrivateKey next_dsa_key;
39 public ECPrivateKey next_ec_key;
36 public RSAPrivateKey next_rsa_key; 40 public RSAPrivateKey next_rsa_key;
37 41
38 public Socket s; 42 public Socket s;
39 43
40 public ClientServerHello csh; 44 public ClientServerHello csh;
41 public ServerTransportManager tm; 45 public ServerTransportManager tm;
42 public ServerAuthenticationManager am; 46 public ServerAuthenticationManager am;
43 public ChannelManager cm; 47 public ChannelManager cm;
44 48
45 public boolean flag_auth_serviceRequested = false; 49 public boolean flag_auth_serviceRequested = false;
46 public boolean flag_auth_completed = false; 50 public boolean flag_auth_completed = false;
47 51
48 public ServerConnectionState(ServerConnection conn) 52 public ServerConnectionState(ServerConnection conn)
49 { 53 {