Mercurial > 510Connectbot

changeset 312:1442be38051b 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 16:03:21 -0700
parents fde9d6568bea
children 1d400fd78e4a
files src/ch/ethz/ssh2/crypto/dh/DhGroupExchange.java src/ch/ethz/ssh2/transport/ClientKexManager.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/crypto/dh/DhGroupExchange.java	Wed Jul 30 15:02:30 2014 -0700
+++ b/src/ch/ethz/ssh2/crypto/dh/DhGroupExchange.java	Wed Jul 30 16:03:21 2014 -0700
@@ -81,7 +81,7 @@
     }
 
     public byte[] calculateH(String hashAlgo, byte[] clientversion, byte[] serverversion,
-                             byte[] clientKexPayload, byte[] serverKexPayload, byte[] hostKey, DHGexParameters para) {
+                             byte[] clientKexPayload, byte[] serverKexPayload, byte[] hostKey, DHGexParameters para) throws IOException {
         HashForSSH2Types hash = new HashForSSH2Types(hashAlgo);
         hash.updateByteString(clientversion);
         hash.updateByteString(serverversion);
--- a/src/ch/ethz/ssh2/transport/ClientKexManager.java	Wed Jul 30 15:02:30 2014 -0700
+++ b/src/ch/ethz/ssh2/transport/ClientKexManager.java	Wed Jul 30 16:03:21 2014 -0700
@@ -257,7 +257,7 @@
                 kxs.dhgx.setF(dhgexrpl.getF());
 
                 try {
-                    kxs.H = kxs.dhgx.calculateH(kxs.hashAlgo, csh.getClientString(), csh.getServerString(),
+                    kxs.H = kxs.dhgx.calculateH(csh.getClientString(), csh.getServerString(),
                             kxs.localKEX.getPayload(), kxs.remoteKEX.getPayload(), dhgexrpl.getHostKey(),
                             kxs.dhgexParameters);
                 }