comparison src/ch/ethz/ssh2/transport/KexManager.java @ 373:2768eb029d73

debug kex error
author Carl Byington <carl@five-ten-sg.com>
date Mon, 04 Aug 2014 13:08:22 -0700
parents b198ea5c5ffd
children 597138203c15
comparison
equal deleted inserted replaced
372:20d0a1356c43 373:2768eb029d73
38 public abstract class KexManager implements MessageHandler { 38 public abstract class KexManager implements MessageHandler {
39 protected static final Logger log = Logger.getLogger(KexManager.class); 39 protected static final Logger log = Logger.getLogger(KexManager.class);
40 40
41 private static final ArrayList<String> HOSTKEY_ALGS = new ArrayList<String>(); 41 private static final ArrayList<String> HOSTKEY_ALGS = new ArrayList<String>();
42 static { 42 static {
43 HOSTKEY_ALGS.add("ssh-rsa");
44 HOSTKEY_ALGS.add("ssh-dss");
43 HOSTKEY_ALGS.add("ecdsa-sha2-nistp256"); 45 HOSTKEY_ALGS.add("ecdsa-sha2-nistp256");
44 HOSTKEY_ALGS.add("ecdsa-sha2-nistp384"); 46 HOSTKEY_ALGS.add("ecdsa-sha2-nistp384");
45 HOSTKEY_ALGS.add("ecdsa-sha2-nistp521"); 47 HOSTKEY_ALGS.add("ecdsa-sha2-nistp521");
46 HOSTKEY_ALGS.add("ssh-rsa");
47 HOSTKEY_ALGS.add("ssh-dss");
48 } 48 }
49 49
50 private static final ArrayList<String> KEX_ALGS = new ArrayList<String>(); 50 private static final ArrayList<String> KEX_ALGS = new ArrayList<String>();
51 static { 51 static {
52 KEX_ALGS.add("ecdh-sha2-nistp256");
53 KEX_ALGS.add("ecdh-sha2-nistp384");
54 KEX_ALGS.add("ecdh-sha2-nistp521");
55 KEX_ALGS.add("diffie-hellman-group-exchange-sha256"); 52 KEX_ALGS.add("diffie-hellman-group-exchange-sha256");
56 KEX_ALGS.add("diffie-hellman-group-exchange-sha1"); 53 KEX_ALGS.add("diffie-hellman-group-exchange-sha1");
57 KEX_ALGS.add("diffie-hellman-group14-sha1"); 54 KEX_ALGS.add("diffie-hellman-group14-sha1");
58 KEX_ALGS.add("diffie-hellman-group1-sha1"); 55 KEX_ALGS.add("diffie-hellman-group1-sha1");
56 KEX_ALGS.add("ecdh-sha2-nistp256");
57 KEX_ALGS.add("ecdh-sha2-nistp384");
58 KEX_ALGS.add("ecdh-sha2-nistp521");
59 } 59 }
60 60
61 KexState kxs; 61 KexState kxs;
62 int kexCount = 0; 62 int kexCount = 0;
63 KeyMaterial km; 63 KeyMaterial km;