# HG changeset patch # User Carl Byington # Date 1406761401 25200 # Node ID 1442be38051b0a8d9cb61e200f5abd83afde61c8 # Parent fde9d6568bea324ce4b9bd794cda963aaf6dc9bb add ecdsa key support everywhere diff -r fde9d6568bea -r 1442be38051b src/ch/ethz/ssh2/crypto/dh/DhGroupExchange.java --- 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); diff -r fde9d6568bea -r 1442be38051b src/ch/ethz/ssh2/transport/ClientKexManager.java --- 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); }