Mercurial > 510Connectbot

comparison src/ch/ethz/ssh2/transport/TransportManager.java @ 301:ca5dd224a87b 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 Tue, 29 Jul 2014 18:50:35 -0700
parents 4ec87de11e71
children d2b303406d63
comparison
equal deleted inserted replaced
300:349847b2e318 301:ca5dd224a87b
294 * @param dhgex Diffie-hellman group exchange 294 * @param dhgex Diffie-hellman group exchange
295 * @param dsa may be null if this is a client connection 295 * @param dsa may be null if this is a client connection
296 * @param rsa may be null if this is a client connection 296 * @param rsa may be null if this is a client connection
297 * @throws IOException 297 * @throws IOException
298 */ 298 */
299 public void forceKeyExchange(CryptoWishList cwl, DHGexParameters dhgex, KeyPair dsa, KeyPair rsa) 299 public void forceKeyExchange(CryptoWishList cwl, DHGexParameters dhgex, KeyPair dsa, KeyPair rsa, KeyPair ec)
300 throws IOException { 300 throws IOException {
301 synchronized(connectionSemaphore) { 301 synchronized(connectionSemaphore) {
302 if(connectionClosed) { 302 if(connectionClosed) {
303 // Inform the caller that there is no point in triggering a new kex 303 // Inform the caller that there is no point in triggering a new kex
304 throw reasonClosedCause; 304 throw reasonClosedCause;
305 } 305 }
306 } 306 }
307 km.initiateKEX(cwl, dhgex, dsa, rsa); 307 km.initiateKEX(cwl, dhgex, dsa, rsa, ec);
308 } 308 }
309 309
310 public void changeRecvCipher(BlockCipher bc, MAC mac) { 310 public void changeRecvCipher(BlockCipher bc, MAC mac) {
311 tc.changeRecvCipher(bc, mac); 311 tc.changeRecvCipher(bc, mac);
312 } 312 }