Mercurial > 510Connectbot

changeset 280:51d5f434ef6b 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:00:35 -0700
parents e1c445af8e46
children b4ca341c318d
files src/ch/ethz/ssh2/auth/AuthenticationManager.java src/ch/ethz/ssh2/transport/KexManager.java src/ch/ethz/ssh2/transport/KexState.java src/ch/ethz/ssh2/transport/TransportManager.java
diffstat 4 files changed, 30 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/auth/AuthenticationManager.java	Fri Jul 18 16:47:22 2014 -0700
+++ b/src/ch/ethz/ssh2/auth/AuthenticationManager.java	Fri Jul 18 17:00:35 2014 -0700
@@ -6,7 +6,15 @@
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
+import java.security.KeyPair;
+import java.security.PrivateKey;
 import java.security.SecureRandom;
+import java.security.interfaces.DSAPrivateKey;
+import java.security.interfaces.DSAPublicKey;
+import java.security.interfaces.ECPrivateKey;
+import java.security.interfaces.ECPublicKey;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.RSAPublicKey;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -27,12 +35,9 @@
 import ch.ethz.ssh2.packets.PacketUserauthRequestPublicKey;
 import ch.ethz.ssh2.packets.Packets;
 import ch.ethz.ssh2.packets.TypesWriter;
-import ch.ethz.ssh2.signature.DSAPrivateKey;
 import ch.ethz.ssh2.signature.DSASHA1Verify;
-import ch.ethz.ssh2.signature.DSASignature;
-import java.security.interfaces.RSAPrivateKey;
+import ch.ethz.ssh2.signature.ECDSASHA2Verify;
 import ch.ethz.ssh2.signature.RSASHA1Verify;
-import ch.ethz.ssh2.signature.RSASignature;
 import ch.ethz.ssh2.transport.ClientTransportManager;
 import ch.ethz.ssh2.transport.MessageHandler;
 
--- a/src/ch/ethz/ssh2/transport/KexManager.java	Fri Jul 18 16:47:22 2014 -0700
+++ b/src/ch/ethz/ssh2/transport/KexManager.java	Fri Jul 18 17:00:35 2014 -0700
@@ -7,7 +7,12 @@
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.security.DigestException;
+import java.security.KeyPair;
+import java.security.PrivateKey;
 import java.security.SecureRandom;
+import java.security.interfaces.DSAPrivateKey;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.ECPrivateKey;
 import java.util.Arrays;
 
 import ch.ethz.ssh2.ConnectionInfo;
@@ -22,8 +27,9 @@
 import ch.ethz.ssh2.log.Logger;
 import ch.ethz.ssh2.packets.PacketKexInit;
 import ch.ethz.ssh2.packets.PacketNewKeys;
-import ch.ethz.ssh2.signature.DSAPrivateKey;
+import java.security.interfaces.DSAPrivateKey;
 import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.ECPrivateKey;
 
 /**
  * @version $Id: KexManager.java 152 2014-04-28 11:02:23Z dkocher@sudo.ch $
--- a/src/ch/ethz/ssh2/transport/KexState.java	Fri Jul 18 16:47:22 2014 -0700
+++ b/src/ch/ethz/ssh2/transport/KexState.java	Fri Jul 18 17:00:35 2014 -0700
@@ -9,12 +9,15 @@
 import ch.ethz.ssh2.crypto.dh.DhGroupExchange;
 import java.math.BigInteger;
 import ch.ethz.ssh2.packets.PacketKexInit;
-import ch.ethz.ssh2.signature.DSAPrivateKey;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.interfaces.DSAPrivateKey;
 import java.security.interfaces.RSAPrivateKey;
+import java.security.interfaces.ECPrivateKey;
 
 /**
  * KexState.
- * 
+ *
  * @author Christian Plattner
  * @version 2.50, 03/15/10
  */
@@ -27,13 +30,14 @@
 
 	public BigInteger K;
 	public byte[] H;
-	
+
 	public byte[] remote_hostkey;
-	
+
 	public DhExchange dhx;
 	public DhGroupExchange dhgx;
 	public DHGexParameters dhgexParameters;
-	
+
 	public DSAPrivateKey local_dsa_key;
 	public RSAPrivateKey local_rsa_key;
+	public ECPrivateKey  local_ec_key;
 }
--- a/src/ch/ethz/ssh2/transport/TransportManager.java	Fri Jul 18 16:47:22 2014 -0700
+++ b/src/ch/ethz/ssh2/transport/TransportManager.java	Fri Jul 18 17:00:35 2014 -0700
@@ -7,6 +7,11 @@
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.interfaces.DSAPrivateKey;
+import java.security.interfaces.ECPrivateKey;
+import java.security.interfaces.RSAPrivateKey;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.List;
@@ -23,8 +28,6 @@
 import ch.ethz.ssh2.packets.PacketDisconnect;
 import ch.ethz.ssh2.packets.Packets;
 import ch.ethz.ssh2.packets.TypesReader;
-import ch.ethz.ssh2.signature.DSAPrivateKey;
-import java.security.interfaces.RSAPrivateKey;
 
 /**
  * Yes, the "standard" is a big mess. On one side, the say that arbitrary channel