Mercurial > 510Connectbot

diff src/ch/ethz/ssh2/transport/ClientKexManager.java @ 313:1d400fd78e4a 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:19:33 -0700
parents 1442be38051b
children d85bc45139f2
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/transport/ClientKexManager.java	Wed Jul 30 16:03:21 2014 -0700
+++ b/src/ch/ethz/ssh2/transport/ClientKexManager.java	Wed Jul 30 16:19:33 2014 -0700
@@ -257,7 +257,7 @@
                 kxs.dhgx.setF(dhgexrpl.getF());
 
                 try {
-                    kxs.H = kxs.dhgx.calculateH(csh.getClientString(), csh.getServerString(),
+                    kxs.H = kxs.dhgx.calculateH(kxs.hashAlgo, csh.getClientString(), csh.getServerString(),
                             kxs.localKEX.getPayload(), kxs.remoteKEX.getPayload(), dhgexrpl.getHostKey(),
                             kxs.dhgexParameters);
                 }
@@ -295,7 +295,7 @@
                         throw new IOException("The server host key was not accepted by the verifier callback", e);
                     }
                 }
-                kxs.dhx.setF(dhr.getF());
+                kxs.dhx.setF(dhr.getF().toByteArray());
                 try {
                     kxs.H = kxs.dhx.calculateH(kxs.hashAlgo, csh.getClientString(), csh.getServerString(), kxs.localKEX.getPayload(),
                             kxs.remoteKEX.getPayload(), dhr.getHostKey());