comparison src/ch/ethz/ssh2/server/ServerConnectionState.java @ 308:42b15aaa7ac7 ganymed

merge
author Carl Byington <carl@five-ten-sg.com>
date Wed, 30 Jul 2014 14:21:50 -0700
parents 071eccdff8ea
children b40bc65fa09a
comparison
equal deleted inserted replaced
306:90e47d99ea54 308:42b15aaa7ac7
19 import java.security.interfaces.ECPrivateKey; 19 import java.security.interfaces.ECPrivateKey;
20 import java.security.interfaces.RSAPrivateKey; 20 import java.security.interfaces.RSAPrivateKey;
21 import ch.ethz.ssh2.transport.ClientServerHello; 21 import ch.ethz.ssh2.transport.ClientServerHello;
22 import ch.ethz.ssh2.transport.ServerTransportManager; 22 import ch.ethz.ssh2.transport.ServerTransportManager;
23 23
24 public class ServerConnectionState 24 public class ServerConnectionState {
25 { 25 public ServerConnection conn;
26 public ServerConnection conn;
27 26
28 public SecureRandom generator = new SecureRandom(); 27 public SecureRandom generator = new SecureRandom();
29 28
30 public String softwareversion; 29 public String softwareversion;
31 30
32 //public String auth_banner = null; 31 //public String auth_banner = null;
33 public ServerConnectionCallback cb_conn; 32 public ServerConnectionCallback cb_conn;
34 public ServerAuthenticationCallback cb_auth; 33 public ServerAuthenticationCallback cb_auth;
35 34
36 /* Settings for the next key exchange */ 35 /* Settings for the next key exchange */
37 public CryptoWishList next_cryptoWishList = CryptoWishList.forServer(); 36 public CryptoWishList next_cryptoWishList = CryptoWishList.forServer();
38 public KeyPair next_dsa_key; 37 public KeyPair next_dsa_key;
39 public KeyPair next_ec_key; 38 public KeyPair next_ec_key;
40 public KeyPair next_rsa_key; 39 public KeyPair next_rsa_key;
41 40
42 public Socket s; 41 public Socket s;
43 42
44 public ClientServerHello csh; 43 public ClientServerHello csh;
45 public ServerTransportManager tm; 44 public ServerTransportManager tm;
46 public ServerAuthenticationManager am; 45 public ServerAuthenticationManager am;
47 public ChannelManager cm; 46 public ChannelManager cm;
48 47
49 public boolean flag_auth_serviceRequested = false; 48 public boolean flag_auth_serviceRequested = false;
50 public boolean flag_auth_completed = false; 49 public boolean flag_auth_completed = false;
51 50
52 public ServerConnectionState(ServerConnection conn) 51 public ServerConnectionState(ServerConnection conn) {
53 { 52 this.conn = conn;
54 this.conn = conn; 53 }
55 }
56 } 54 }