Mercurial > 510Connectbot
diff src/ch/ethz/ssh2/ServerConnection.java @ 358:37f4a3b506d9
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 |
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/ServerConnection.java Fri Aug 01 13:34:58 2014 -0700 +++ b/src/ch/ethz/ssh2/ServerConnection.java Sun Aug 03 11:16:40 2014 -0700 @@ -307,16 +307,12 @@ private void fixCryptoWishList(CryptoWishList next_cryptoWishList, KeyPair next_dsa_key, KeyPair next_rsa_key, KeyPair next_ec_key) { List<String> algos = new ArrayList<String>(); + if (next_rsa_key != null) algos.add("ssh-rsa"); + if (next_dsa_key != null) algos.add("ssh-dss"); if (next_ec_key != null) algos.add("ecdsa-sha2-nistp521"); - if (next_ec_key != null) algos.add("ecdsa-sha2-nistp384"); - if (next_ec_key != null) algos.add("ecdsa-sha2-nistp256"); - if (next_dsa_key != null) algos.add("ssh-dss"); - - if (next_rsa_key != null) algos.add("ssh-rsa"); - next_cryptoWishList.serverHostKeyAlgorithms = new String[algos.size()]; algos.toArray(next_cryptoWishList.serverHostKeyAlgorithms); }