diff src/ch/ethz/ssh2/ServerConnection.java @ 300:349847b2e318 ganymed

add ecdsa key support everywhere
author Carl Byington <carl@five-ten-sg.com>
date Tue, 29 Jul 2014 18:36:57 -0700
parents ab3a99f11a36
children ca5dd224a87b
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/ServerConnection.java	Tue Jul 29 18:08:09 2014 -0700
+++ b/src/ch/ethz/ssh2/ServerConnection.java	Tue Jul 29 18:36:57 2014 -0700
@@ -321,9 +321,11 @@
 	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_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");
-		if (next_ec_key != null)  algos.add("ssh-ec");
  	    next_cryptoWishList.serverHostKeyAlgorithms = new String[algos.size()];
         algos.toArray(next_cryptoWishList.serverHostKeyAlgorithms);
 	}