Mercurial > 510Connectbot
comparison src/ch/ethz/ssh2/transport/TransportManager.java @ 284:4ec87de11e71 ganymed
start conversion from trilead to ganymed
author | Carl Byington <carl@five-ten-sg.com> |
---|---|
date | Fri, 18 Jul 2014 18:08:56 -0700 |
parents | 51d5f434ef6b |
children | ca5dd224a87b |
comparison
equal
deleted
inserted
replaced
283:3855f58ffd2b | 284:4ec87de11e71 |
---|---|
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, DSAPrivateKey dsa, RSAPrivateKey rsa) | 299 public void forceKeyExchange(CryptoWishList cwl, DHGexParameters dhgex, KeyPair dsa, KeyPair rsa) |
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; |