Mercurial > 510Connectbot

changeset 310:9e42082d1f93 ganymed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add ecdsa key support everywhere
author Carl Byington <carl@five-ten-sg.com>
date Wed, 30 Jul 2014 14:42:55 -0700
parents cb179051f0f2
children fde9d6568bea
files src/ch/ethz/ssh2/crypto/dh/GenericDhExchange.java src/ch/ethz/ssh2/transport/ClientKexManager.java src/ch/ethz/ssh2/transport/KexState.java
diffstat 3 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/crypto/dh/GenericDhExchange.java	Wed Jul 30 14:29:39 2014 -0700
+++ b/src/ch/ethz/ssh2/crypto/dh/GenericDhExchange.java	Wed Jul 30 14:42:55 2014 -0700
@@ -68,10 +68,8 @@
                              byte[] serverKexPayload, byte[] hostKey) throws UnsupportedEncodingException {
         HashForSSH2Types hash = new HashForSSH2Types(getHashAlgo());
 
-        if (log.isEnabled()) {
-            log.log(90, "Client: '" + new String(clientversion, "ISO-8859-1") + "'");
-            log.log(90, "Server: '" + new String(serverversion, "ISO-8859-1") + "'");
-        }
+        log.debug("Client: '" + new String(clientversion, "ISO-8859-1") + "'");
+        log.debug("Server: '" + new String(serverversion, "ISO-8859-1") + "'");
 
         hash.updateByteString(clientversion);
         hash.updateByteString(serverversion);
--- a/src/ch/ethz/ssh2/transport/ClientKexManager.java	Wed Jul 30 14:29:39 2014 -0700
+++ b/src/ch/ethz/ssh2/transport/ClientKexManager.java	Wed Jul 30 14:42:55 2014 -0700
@@ -19,7 +19,7 @@
 import ch.ethz.ssh2.crypto.CryptoWishList;
 import ch.ethz.ssh2.crypto.cipher.BlockCipher;
 import ch.ethz.ssh2.crypto.cipher.BlockCipherFactory;
-import ch.ethz.ssh2.crypto.dh.DhExchange;
+import ch.ethz.ssh2.crypto.dh.GenericDhExchange;
 import ch.ethz.ssh2.crypto.dh.DhGroupExchange;
 import ch.ethz.ssh2.crypto.digest.MAC;
 import ch.ethz.ssh2.packets.PacketKexDHInit;
--- a/src/ch/ethz/ssh2/transport/KexState.java	Wed Jul 30 14:29:39 2014 -0700
+++ b/src/ch/ethz/ssh2/transport/KexState.java	Wed Jul 30 14:42:55 2014 -0700
@@ -5,7 +5,7 @@
 package ch.ethz.ssh2.transport;
 
 import ch.ethz.ssh2.DHGexParameters;
-import ch.ethz.ssh2.crypto.dh.DhExchange;
+import ch.ethz.ssh2.crypto.dh.GenericDhExchange;
 import ch.ethz.ssh2.crypto.dh.DhGroupExchange;
 import java.math.BigInteger;
 import ch.ethz.ssh2.packets.PacketKexInit;
@@ -32,7 +32,8 @@
 
     public byte[] remote_hostkey;
 
-    public DhExchange dhx;
+    public String hashAlgo;
+    public GenericDhExchange dhx;
     public DhGroupExchange dhgx;
     public DHGexParameters dhgexParameters;