diff 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
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/server/ServerConnectionState.java	Fri Jul 18 17:00:35 2014 -0700
+++ b/src/ch/ethz/ssh2/server/ServerConnectionState.java	Fri Jul 18 17:07:38 2014 -0700
@@ -13,7 +13,10 @@
 import ch.ethz.ssh2.auth.ServerAuthenticationManager;
 import ch.ethz.ssh2.channel.ChannelManager;
 import ch.ethz.ssh2.crypto.CryptoWishList;
-import ch.ethz.ssh2.signature.DSAPrivateKey;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.interfaces.DSAPrivateKey;
+import java.security.interfaces.ECPrivateKey;
 import java.security.interfaces.RSAPrivateKey;
 import ch.ethz.ssh2.transport.ClientServerHello;
 import ch.ethz.ssh2.transport.ServerTransportManager;
@@ -21,27 +24,28 @@
 public class ServerConnectionState
 {
 	public ServerConnection conn;
-	
+
 	public SecureRandom generator = new SecureRandom();
-	
+
 	public String softwareversion;
-	
+
 	//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 DSAPrivateKey next_dsa_key;
+	public ECPrivateKey  next_ec_key;
 	public RSAPrivateKey next_rsa_key;
-	
+
 	public Socket s;
-	
+
 	public ClientServerHello csh;
 	public ServerTransportManager tm;
 	public ServerAuthenticationManager am;
 	public ChannelManager cm;
-	
+
 	public boolean flag_auth_serviceRequested = false;
 	public boolean flag_auth_completed = false;