comparison src/ch/ethz/ssh2/ServerConnection.java @ 302:beaccc9df37b ganymed

add ecdsa key support everywhere
author Carl Byington <carl@five-ten-sg.com>
date Tue, 29 Jul 2014 20:23:00 -0700
parents ca5dd224a87b
children 071eccdff8ea
comparison
equal deleted inserted replaced
301:ca5dd224a87b 302:beaccc9df37b
320 setPEMHostKey(cw.toCharArray(), password); 320 setPEMHostKey(cw.toCharArray(), password);
321 } 321 }
322 322
323 private void fixCryptoWishList(CryptoWishList next_cryptoWishList, KeyPair next_dsa_key, KeyPair next_rsa_key, KeyPair next_ec_key) 323 private void fixCryptoWishList(CryptoWishList next_cryptoWishList, KeyPair next_dsa_key, KeyPair next_rsa_key, KeyPair next_ec_key)
324 { 324 {
325 List<String> algos = new ArrayList<string>(); 325 List<String> algos = new ArrayList<String>();
326 if (next_ec_key != null) algos.add("ecdsa-sha2-nistp521"); 326 if (next_ec_key != null) algos.add("ecdsa-sha2-nistp521");
327 if (next_ec_key != null) algos.add("ecdsa-sha2-nistp384"); 327 if (next_ec_key != null) algos.add("ecdsa-sha2-nistp384");
328 if (next_ec_key != null) algos.add("ecdsa-sha2-nistp256"); 328 if (next_ec_key != null) algos.add("ecdsa-sha2-nistp256");
329 if (next_dsa_key != null) algos.add("ssh-dss"); 329 if (next_dsa_key != null) algos.add("ssh-dss");
330 if (next_rsa_key != null) algos.add("ssh-rsa"); 330 if (next_rsa_key != null) algos.add("ssh-rsa");