Mercurial > 510Connectbot

comparison src/ch/ethz/ssh2/ServerConnection.java @ 358:37f4a3b506d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move nist ec curves to lower priority
author Carl Byington <carl@five-ten-sg.com>
date Sun, 03 Aug 2014 11:16:40 -0700
parents c19b24adf6c9
children
comparison
equal deleted inserted replaced
357:46c2115ae1c8 358:37f4a3b506d9
305 } 305 }
306 306
307 private void fixCryptoWishList(CryptoWishList next_cryptoWishList, KeyPair next_dsa_key, KeyPair next_rsa_key, KeyPair next_ec_key) { 307 private void fixCryptoWishList(CryptoWishList next_cryptoWishList, KeyPair next_dsa_key, KeyPair next_rsa_key, KeyPair next_ec_key) {
308 List<String> algos = new ArrayList<String>(); 308 List<String> algos = new ArrayList<String>();
309 309
310 if (next_rsa_key != null) algos.add("ssh-rsa");
311 if (next_dsa_key != null) algos.add("ssh-dss");
310 if (next_ec_key != null) algos.add("ecdsa-sha2-nistp521"); 312 if (next_ec_key != null) algos.add("ecdsa-sha2-nistp521");
311
312 if (next_ec_key != null) algos.add("ecdsa-sha2-nistp384"); 313 if (next_ec_key != null) algos.add("ecdsa-sha2-nistp384");
313
314 if (next_ec_key != null) algos.add("ecdsa-sha2-nistp256"); 314 if (next_ec_key != null) algos.add("ecdsa-sha2-nistp256");
315
316 if (next_dsa_key != null) algos.add("ssh-dss");
317
318 if (next_rsa_key != null) algos.add("ssh-rsa");
319 315
320 next_cryptoWishList.serverHostKeyAlgorithms = new String[algos.size()]; 316 next_cryptoWishList.serverHostKeyAlgorithms = new String[algos.size()];
321 algos.toArray(next_cryptoWishList.serverHostKeyAlgorithms); 317 algos.toArray(next_cryptoWishList.serverHostKeyAlgorithms);
322 } 318 }
323 319