Mercurial > 510Connectbot

changeset 281:b4ca341c318d ganymed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
start conversion from trilead to ganymed
author Carl Byington <carl@five-ten-sg.com>
date Fri, 18 Jul 2014 17:07:38 -0700
parents 51d5f434ef6b
children c3019725b123
files src/ch/ethz/ssh2/ServerConnection.java src/ch/ethz/ssh2/server/ServerConnectionState.java src/ch/ethz/ssh2/transport/ClientKexManager.java src/ch/ethz/ssh2/transport/ServerKexManager.java
diffstat 4 files changed, 20 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/ServerConnection.java	Fri Jul 18 17:00:35 2014 -0700
+++ b/src/ch/ethz/ssh2/ServerConnection.java	Fri Jul 18 17:07:38 2014 -0700
@@ -14,7 +14,10 @@
 import ch.ethz.ssh2.crypto.CryptoWishList;
 import ch.ethz.ssh2.crypto.PEMDecoder;
 import ch.ethz.ssh2.server.ServerConnectionState;
-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.ServerTransportManager;
 
--- 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;
 
--- a/src/ch/ethz/ssh2/transport/ClientKexManager.java	Fri Jul 18 17:00:35 2014 -0700
+++ b/src/ch/ethz/ssh2/transport/ClientKexManager.java	Fri Jul 18 17:07:38 2014 -0700
@@ -29,11 +29,11 @@
 import ch.ethz.ssh2.packets.PacketKexInit;
 import ch.ethz.ssh2.packets.Packets;
 import java.security.interfaces.DSAPublicKey;
-import ch.ethz.ssh2.signature.DSASHA1Verify;
-import ch.ethz.ssh2.signature.DSASignature;
+import java.security.interfaces.ECPublicKey;
 import java.security.interfaces.RSAPublicKey;
+import ch.ethz.ssh2.signature.DSASHA1Verify;
+import ch.ethz.ssh2.signature.ECDSASHA2Verify.java;
 import ch.ethz.ssh2.signature.RSASHA1Verify;
-import ch.ethz.ssh2.signature.RSASignature;
 
 /**
  * @version $Id: ClientKexManager.java 160 2014-05-01 14:30:26Z dkocher@sudo.ch $
--- a/src/ch/ethz/ssh2/transport/ServerKexManager.java	Fri Jul 18 17:00:35 2014 -0700
+++ b/src/ch/ethz/ssh2/transport/ServerKexManager.java	Fri Jul 18 17:07:38 2014 -0700
@@ -20,9 +20,8 @@
 import ch.ethz.ssh2.packets.Packets;
 import ch.ethz.ssh2.server.ServerConnectionState;
 import ch.ethz.ssh2.signature.DSASHA1Verify;
-import ch.ethz.ssh2.signature.DSASignature;
+import ch.ethz.ssh2.signature.ECDSASHA2Verify.java;
 import ch.ethz.ssh2.signature.RSASHA1Verify;
-import ch.ethz.ssh2.signature.RSASignature;
 
 /**
  * @version $Id: ServerKexManager.java 160 2014-05-01 14:30:26Z dkocher@sudo.ch $