aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-04-05 16:04:46 -0700
committerKenny Root <kenny@the-b.org>2015-04-05 16:04:46 -0700
commit9689224a9e0c26b64fdbf7515a4dc9ae20454f3b (patch)
tree75cb603a0b28d831a361cb4a5de0bb173025cd10 /app/src/main/java/com
parentc3dc0d11c3b84f45fd609b602f6fceec452923f7 (diff)
parentbe562fe3c5c6f47d78724de8221974acec389a4f (diff)
downloadconnectbot-9689224a9e0c26b64fdbf7515a4dc9ae20454f3b.tar.gz
connectbot-9689224a9e0c26b64fdbf7515a4dc9ae20454f3b.tar.bz2
connectbot-9689224a9e0c26b64fdbf7515a4dc9ae20454f3b.zip
Merge branch 'master' into gradle-conversion
Diffstat (limited to 'app/src/main/java/com')
-rw-r--r--app/src/main/java/com/trilead/ssh2/transport/KexManager.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/src/main/java/com/trilead/ssh2/transport/KexManager.java b/app/src/main/java/com/trilead/ssh2/transport/KexManager.java
index 2476b76..acf2812 100644
--- a/app/src/main/java/com/trilead/ssh2/transport/KexManager.java
+++ b/app/src/main/java/com/trilead/ssh2/transport/KexManager.java
@@ -8,6 +8,7 @@ import java.security.SecureRandom;
import java.security.interfaces.DSAPublicKey;
import java.security.interfaces.ECPublicKey;
import java.security.interfaces.RSAPublicKey;
+import java.util.LinkedHashSet;
import java.util.Set;
import java.util.TreeSet;
@@ -61,7 +62,7 @@ public class KexManager
supportsEc = keyFact != null;
}
- private static final Set<String> HOSTKEY_ALGS = new TreeSet<String>();
+ private static final Set<String> HOSTKEY_ALGS = new LinkedHashSet<String>();
static {
if (supportsEc) {
HOSTKEY_ALGS.add("ecdsa-sha2-nistp256");
@@ -72,7 +73,7 @@ public class KexManager
HOSTKEY_ALGS.add("ssh-dsa");
}
- private static final Set<String> KEX_ALGS = new TreeSet<String>();
+ private static final Set<String> KEX_ALGS = new LinkedHashSet<String>();
static {
if (supportsEc) {
KEX_ALGS.add("ecdh-sha2-nistp256");