diff 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
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/server/ServerConnectionState.java	Wed Jul 30 13:38:04 2014 -0700
+++ b/src/ch/ethz/ssh2/server/ServerConnectionState.java	Wed Jul 30 14:21:50 2014 -0700
@@ -21,36 +21,34 @@
 import ch.ethz.ssh2.transport.ClientServerHello;
 import ch.ethz.ssh2.transport.ServerTransportManager;
 
-public class ServerConnectionState
-{
-	public ServerConnection conn;
+public class ServerConnectionState {
+    public ServerConnection conn;
 
-	public SecureRandom generator = new SecureRandom();
+    public SecureRandom generator = new SecureRandom();
 
-	public String softwareversion;
+    public String softwareversion;
 
-	//public String auth_banner = null;
-	public ServerConnectionCallback cb_conn;
-	public ServerAuthenticationCallback cb_auth;
+    //public String auth_banner = null;
+    public ServerConnectionCallback cb_conn;
+    public ServerAuthenticationCallback cb_auth;
 
-	/* Settings for the next key exchange */
-	public CryptoWishList next_cryptoWishList = CryptoWishList.forServer();
-	public KeyPair next_dsa_key;
-	public KeyPair next_ec_key;
-	public KeyPair next_rsa_key;
+    /* Settings for the next key exchange */
+    public CryptoWishList next_cryptoWishList = CryptoWishList.forServer();
+    public KeyPair next_dsa_key;
+    public KeyPair next_ec_key;
+    public KeyPair next_rsa_key;
 
-	public Socket s;
+    public Socket s;
 
-	public ClientServerHello csh;
-	public ServerTransportManager tm;
-	public ServerAuthenticationManager am;
-	public ChannelManager cm;
+    public ClientServerHello csh;
+    public ServerTransportManager tm;
+    public ServerAuthenticationManager am;
+    public ChannelManager cm;
 
-	public boolean flag_auth_serviceRequested = false;
-	public boolean flag_auth_completed = false;
+    public boolean flag_auth_serviceRequested = false;
+    public boolean flag_auth_completed = false;
 
-	public ServerConnectionState(ServerConnection conn)
-	{
-		this.conn = conn;
-	}
+    public ServerConnectionState(ServerConnection conn) {
+        this.conn = conn;
+    }
 }