Mercurial > 510Connectbot

comparison 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
comparison
equal deleted inserted replaced
312:1442be38051b 313:1d400fd78e4a
255 } 255 }
256 256
257 kxs.dhgx.setF(dhgexrpl.getF()); 257 kxs.dhgx.setF(dhgexrpl.getF());
258 258
259 try { 259 try {
260 kxs.H = kxs.dhgx.calculateH(csh.getClientString(), csh.getServerString(), 260 kxs.H = kxs.dhgx.calculateH(kxs.hashAlgo, csh.getClientString(), csh.getServerString(),
261 kxs.localKEX.getPayload(), kxs.remoteKEX.getPayload(), dhgexrpl.getHostKey(), 261 kxs.localKEX.getPayload(), kxs.remoteKEX.getPayload(), dhgexrpl.getHostKey(),
262 kxs.dhgexParameters); 262 kxs.dhgexParameters);
263 } 263 }
264 catch(IllegalArgumentException e) { 264 catch(IllegalArgumentException e) {
265 throw new IOException("KEX error.", e); 265 throw new IOException("KEX error.", e);
293 } 293 }
294 catch(Exception e) { 294 catch(Exception e) {
295 throw new IOException("The server host key was not accepted by the verifier callback", e); 295 throw new IOException("The server host key was not accepted by the verifier callback", e);
296 } 296 }
297 } 297 }
298 kxs.dhx.setF(dhr.getF()); 298 kxs.dhx.setF(dhr.getF().toByteArray());
299 try { 299 try {
300 kxs.H = kxs.dhx.calculateH(kxs.hashAlgo, csh.getClientString(), csh.getServerString(), kxs.localKEX.getPayload(), 300 kxs.H = kxs.dhx.calculateH(kxs.hashAlgo, csh.getClientString(), csh.getServerString(), kxs.localKEX.getPayload(),
301 kxs.remoteKEX.getPayload(), dhr.getHostKey()); 301 kxs.remoteKEX.getPayload(), dhr.getHostKey());
302 } 302 }
303 catch(IllegalArgumentException e) { 303 catch(IllegalArgumentException e) {